修复问题

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java

@@ -39,12 +39,14 @@ public class TSampleLaboratorysheetController {
      */
     @ApiOperation(value = "获取送验单列表 可分页模糊查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "search", value = "搜索关键字", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "searchYh", value = "搜索关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "searchSysj", value = "搜索关键字", paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(Query query, String search) {
+    public R getPage(Query query, String searchYh,String searchSysj) {
         TSampleLaboratorysheetQuery param = new TSampleLaboratorysheetQuery();
-        param.setSearch(search);
+        param.setSearchYh(searchYh);
+        param.setSearchSysj(searchSysj);
         return itSampleLaboratorysheetService.getPage(param, query);
     }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java

@@ -40,12 +40,14 @@ public class TSampleListController {
      */
     @ApiOperation(value = "获取送验单列表 可分页模糊查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "search", value = "搜索关键字", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "searchYh", value = "搜索关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "searcSyrq", value = "搜索关键字", paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(Query query, String search) {
+    public R getPage(Query query, String searchYh,String searchSyrq) {
         TSampleListQuery param = new TSampleListQuery();
-        param.setSearch(search);
+        param.setSearchYh(searchYh);
+        param.setSearchSyrq(searchSyrq);
         return itSampleListService.getPage(param, query);
     }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.java

@@ -3,8 +3,11 @@ package cn.wise.sc.acquisition.business.mapper;
 import cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +20,6 @@ import java.util.List;
 public interface TSampleLaboratorysheetMapper extends BaseMapper<TSampleLaboratorysheet> {
 
     List<TSampleLaboratorysheet> getList();
+
+    Page<TSampleLaboratorysheet> pageByYhOrSysj(Page<TSampleLaboratorysheet> page,@Param("param") Map<String, Object> param);
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleListMapper.java

@@ -2,8 +2,10 @@ package cn.wise.sc.acquisition.business.mapper;
 
 import cn.wise.sc.acquisition.business.entity.TSampleList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import java.util.List;
  */
 public interface TSampleListMapper extends BaseMapper<TSampleList> {
 
+    Page<TSampleList> pageByYhOrSyrq(Page<TSampleList> page, @Param("param")Map<String, Object> param);
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleLaboratorysheetMapper.xml

@@ -5,4 +5,10 @@
     <select id="getList" resultType="cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet">
         select * from T_Sample_LaboratorySheet
     </select>
+    <select id="pageByYhOrSysj" resultType="cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet">
+        select a.* from T_Sample_LaboratorySheet a
+        where
+            a.Yh=#{param.Yh}
+            or a.Sysj= #{param.Sysj}
+    </select>
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleListMapper.xml

@@ -20,5 +20,12 @@
 
     <sql id="TSampleListJoins">
     </sql>
+    <select id="pageByYhOrSyrq" resultType="cn.wise.sc.acquisition.business.entity.TSampleList">
+        select a.* from T_Sample_List a
+        where
+            a.Yh=#{param.Yh}
+            or a.Syrq= #{param.Syrq}
+
+    </select>
 
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TSampleLaboratorysheetQuery.java

@@ -126,7 +126,11 @@ public class TSampleLaboratorysheetQuery {
      * 搜索字段
      */
     @ApiModelProperty("搜索字段")
-    private String search;
-
+    private String searchYh;
+    /**
+     * 搜索字段
+     */
+    @ApiModelProperty("搜索字段")
+    private String searchSysj;
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TSampleListQuery.java

@@ -22,8 +22,13 @@ public class TSampleListQuery  {
     /**
      * 搜索字段
      */
-    @ApiModelProperty("搜索字段")
-    private String search;
+    @ApiModelProperty("搜索字段Yh")
+    private String searchYh;
+    /**
+     * 搜索字段
+     */
+    @ApiModelProperty("搜索字段Yh")
+    private String searchSyrq;
 
     /**
      * 样号

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java

@@ -25,7 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -209,12 +211,15 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         log.info(JSON.toJSONString(tSampleLaboratorysheetQuery));
         //分页
         Page<TSampleLaboratorysheet> page = new Page<>();
-        LambdaQueryWrapper<TSampleLaboratorysheet> queryWrapper = new LambdaQueryWrapper<>();
-        //TODO 根据收样时间筛选
-        queryWrapper.select(TSampleLaboratorysheet::getYh);
-        queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
+        Map<String, Object> param = new HashMap<>();
+        if (StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearchYh())){
+            param.put("Yh",tSampleLaboratorysheetQuery.getSearchYh());
+        }
+        if (StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearchSysj())){
+            param.put("Sysj",tSampleLaboratorysheetQuery.getSearchSysj());
+        }
         //查询
-        Page<TSampleLaboratorysheet> tSampleLaboratorysheetPage = baseMapper.selectPage(page, queryWrapper);
+        Page<TSampleLaboratorysheet> tSampleLaboratorysheetPage = baseMapper.pageByYhOrSysj(page, param);
         return R.ok(tSampleLaboratorysheetPage);
     }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java

@@ -27,6 +27,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -54,29 +56,15 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //分页
         Page<TSampleList> page = new Page<>(query.getPageNum(), query.getPageSize());
         //条件封装 因为图片字节太长，排除QR_CODE,RECORD_CODE
-        QueryWrapper<TSampleList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select(
-                ProjectEnum.TSampleListType.HOLES_ID.getLabel(),
-                ProjectEnum.TSampleListType.START.getLabel(),
-                ProjectEnum.TSampleListType.END_TO.getLabel(),
-                ProjectEnum.TSampleListType.YH.getLabel(),
-                ProjectEnum.TSampleListType.SYR.getLabel(),
-                ProjectEnum.TSampleListType.SYRQ.getLabel()
-        );
-//        String startDate = tSampleListQuery.getSearch() + "00:00:00";
-//        String endDate = tSampleListQuery.getSearch() + "23:59:59";
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TSampleListType.SYRQ.getLabel());
-        queryWrapper
-                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.YH.getLabel(), tSampleListQuery.getSearch())
-                .or()
-                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch());
-//TODO 根据时间筛选
-    //                .or()
-//                .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(DateUtil.strToTime(startDate)))
-//                .le(stringBuilder.toString(), DateUtil.getEndTimeStr(DateUtil.strToTime(endDate)));
+        Map<String, Object> param = new HashMap<>();
+        if (StringUtils.isNotBlank(tSampleListQuery.getSearchYh())){
+            param.put("Yh",tSampleListQuery.getSearchYh());
+        }
+        if (StringUtils.isNotEmpty(tSampleListQuery.getSearchSyrq())){
+            param.put("Syrq",tSampleListQuery.getSearchSyrq());
+        }
         //查询
-        Page<TSampleList> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
+        Page<TSampleList> tSampleListPage = baseMapper.pageByYhOrSyrq(page,param);
         return R.ok(tSampleListPage);
     }