Merge remote-tracking branch 'lis8.0/master'

liswork/src/main/resources/mapper/RcvBarcodeRefusedMapper.xml

@@ -41,7 +41,7 @@
                lab_reqmain.bbsjbl,
                 <!--登记模式-->
                '2' as mode,
-               lab_reqmain.jymd as cp_item,
+               lab_reqmain.jymd as item,
                <!--不合格类别-->
                '' as refuseText,
                 <!--补充描述-->

zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java

@@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.lis.LabReqmain;
 import com.czlis.common.core.domain.entity.lis.LabReqpack;
 import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.interfaceCommon.utils.PackBarcodeUtil;
+import com.czlis.zycx.pojo.ExecSQDDTO;
 import com.czlis.zycx.pojo.QuerySqdVO;
 import com.czlis.zycx.pojo.Web_getBarcode;
 import com.czlis.zycx.service.ZycxService;
@@ -131,4 +132,11 @@ public class ZycxController extends BaseController {
         return zycxService.printcheck();
     }
 
+    @Anonymous
+    @ApiOperation("取消执行")
+    @PostMapping("/cancelExecSQD")
+    public Result cancelExecSQD(@RequestBody List<ExecSQDDTO> execSQDDTOList) {
+        return zycxService.cancelExecSQD(execSQDDTOList);
+    }
+
 }

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

@@ -0,0 +1,18 @@
+package com.czlis.zycx.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExecSQDDTO {
+    @ApiModelProperty("状态")
+    private String status;
+    @ApiModelProperty("条码号")
+    private String sqh;
+    @ApiModelProperty("登录人代码")
+    private String userId;
+}

zycx/src/main/java/com/czlis/zycx/service/ZycxService.java

@@ -2,6 +2,7 @@ package com.czlis.zycx.service;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.zycx.pojo.ExecSQDDTO;
 import com.czlis.zycx.pojo.QuerySqdVO;
 import com.czlis.zycx.pojo.Web_getBarcode;
 
@@ -22,4 +23,6 @@ public interface ZycxService {
     Result printsetup();
     Result printcheck();
     Result printSendSample(String[] sqhList);
+
+    Result cancelExecSQD(List<ExecSQDDTO> execSQDDTOList);
 }

zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java

@@ -24,6 +24,7 @@ import com.czlis.interfaceCommon.websocket.WebSocketMessage;
 import com.czlis.interfaceCommon.websocket.WebSocketUser;
 import com.czlis.zycx.mapper.LabIntersendListMapper;
 import com.czlis.zycx.mapper.ZycxMapper;
+import com.czlis.zycx.pojo.ExecSQDDTO;
 import com.czlis.zycx.pojo.QuerySqdVO;
 import com.czlis.zycx.pojo.Web_getBarcode;
 import com.czlis.zycx.service.ZycxService;
@@ -231,6 +232,38 @@ public class ZycxServiceImpl implements ZycxService {
         return reportUtil.printToPdf("sendSample",reportParam,"",true);
     }
 
+    /**
+     * 取消执行接口
+     * @param execSQDDTOList
+     * @return
+     */
+    @Override
+    public Result cancelExecSQD(List<ExecSQDDTO> execSQDDTOList) {
+        for (ExecSQDDTO execSQDDTO : execSQDDTOList) {
+            String status = execSQDDTO.getStatus();
+            String sqh = execSQDDTO.getSqh();
+            if(status == null || status.equals("")) return new Result("-1","入参状态不能为空！");
+            if(sqh == null || sqh.equals("")) return new Result("-1","条码号不能为空！");
+            LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh);
+            if(labReqmainOne == null) return new Result("-1","没有获取到申请单数据！条码号："+sqh);
+            String zt = labReqmainOne.getZt();
+            switch (status){
+                case "12":  //取消采样
+                    if(zt.equals("12")){
+                        LabReqmain labReqmain = new LabReqmain();
+                        labReqmain.setZt("11");
+                        labReqmain.setSqh(sqh);
+                        commonUtil.updateLabReqmain(labReqmain);
+                    }else{
+                        return new Result("-1","不是已采样状态，不能取消采样状态！");
+                    }
+                    break;
+            }
+
+        }
+        return new Result("0","执行取消状态成功！");
+    }
+
 
     @Transactional
     public Result createSQDExecSP(String dept, String userid, String st, String et, String yljg){