批量审核

liswork/src/main/java/com/czlis/liswork/controller/work/BatchCheckController.java

@@ -0,0 +1,31 @@
+package com.czlis.liswork.controller.work;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
+import com.czlis.liswork.service.BatchCheckService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 批量审核
+ */
+@RestController
+@RequestMapping("/batchCheck")
+@Slf4j
+@Api(tags = "批量审核")
+public class BatchCheckController {
+
+    @Autowired
+    BatchCheckService batchCheckService;
+
+
+    @GetMapping("/query")
+    public Result queryData(BatchCheckDTO batchCheckDTO){
+        return batchCheckService.queryData(batchCheckDTO);
+    }
+
+}

liswork/src/main/java/com/czlis/liswork/mapper/work/BatchCheckMapper.java

@@ -0,0 +1,10 @@
+package com.czlis.liswork.mapper.work;
+
+import com.czlis.common.core.domain.entity.lis.LabPat;
+import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
+
+import java.util.List;
+
+public interface BatchCheckMapper {
+    List<LabPat> queryData(BatchCheckDTO batchCheckDTO);
+}

liswork/src/main/java/com/czlis/liswork/pojo/DTO/BatchCheckDTO.java

@@ -0,0 +1,25 @@
+package com.czlis.liswork.pojo.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BatchCheckDTO {
+    private Date jyrq1;
+    private Date jyrq2;
+    private String ybh1;
+    private String ybh2;
+    private String ksdh;
+    private String yhdh;
+    private String brly;
+    private String yq;
+    private String jgbz;
+    private String lisgroup;
+    private String yljg;
+    private String jzbz;
+}

liswork/src/main/java/com/czlis/liswork/service/BatchCheckService.java

@@ -0,0 +1,8 @@
+package com.czlis.liswork.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
+
+public interface BatchCheckService {
+    Result queryData(BatchCheckDTO batchCheckDTO);
+}

liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchCheckServiceImpl.java

@@ -0,0 +1,29 @@
+package com.czlis.liswork.service.impl.work;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.LabPat;
+import com.czlis.interfaceCommon.utils.CommonUtil;
+import com.czlis.liswork.mapper.work.BatchCheckMapper;
+import com.czlis.liswork.pojo.DTO.BatchCheckDTO;
+import com.czlis.liswork.service.BatchCheckService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class BatchCheckServiceImpl implements BatchCheckService {
+
+    @Autowired
+    BatchCheckMapper batchCheckMapper;
+    @Autowired
+    private CommonUtil commonUtil;
+
+    @Override
+    public Result queryData(BatchCheckDTO batchCheckDTO) {
+        List<LabPat> labPatList = batchCheckMapper.queryData(batchCheckDTO);
+        return new Result("0","获取数据成功！",labPatList);
+    }
+}

liswork/src/main/java/com/czlis/liswork/service/impl/work/RcvBarcodeRefusedServiceImpl.java

@@ -1,9 +1,8 @@
-package com.czlis.liswork.service.impl;
+package com.czlis.liswork.service.impl.work;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabRefused;
 import com.czlis.common.core.domain.entity.lis.LabReqmain;
-import com.czlis.common.core.domain.entity.lis.LabReqsteplog;
 import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
 import com.czlis.interfaceCommon.mapper.LabRefusedMapper;
 import com.czlis.interfaceCommon.pojo.inter.DayMessage;

liswork/src/main/resources/mapper/work/BatchCheckMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.czlis.liswork.mapper.work.BatchCheckMapper">
+    <select id="queryData" resultType="com.czlis.common.core.domain.entity.lis.LabPat">
+        <![CDATA[
+        select * from lab_pat where jyrq >= #{jyrq1} and jyrq <= #{jyrq2} and yq = #{yq}
+        and ( CASE WHEN ybh NOT LIKE '%[^0-9]%' THEN CAST(ybh AS INT)  ELSE 0 END) between #{ybh1} and #{ybh2}
+        ]]>
+        <if test="ksdh != null and ksdh != ''">and ksdh = #{ksdh}</if>
+        <if test="yhdh != null and yhdh != ''">and yhdh = #{yhdh}</if>
+        <if test="brly != null and brly != ''">and brly = #{brly}</if>
+        <if test="jgbz != null and jgbz != ''">and jgbz = #{jgbz}</if>
+        <if test="lisgroup != null and lisgroup != ''">and yq in (select yq from lab_instr where lisgroup=#{lisgroup})</if>
+        <if test="yljg != null and yljg != ''">and yljg = #{yljg}</if>
+        <if test="jzbz != null and jzbz != ''">and jzbz = #{jzbz}</if>
+    </select>
+
+</mapper>

zycx/src/main/java/com/czlis/zycx/pojo/ExecSQDDTO.java

@@ -13,6 +13,6 @@ public class ExecSQDDTO {
     private String status;
     @ApiModelProperty("条码号")
     private String sqh;
-    @ApiModelProperty("登录人代码")
+    @ApiModelProperty(value = "登录人代码")
     private String userId;
 }