优化病例入录4.0

mrman-service/src/main/java/com/diagbot/facade/QcInputcasesFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.QcInputMappingSaveVO;
+import com.diagbot.vo.QcInputcasesByIdVO;
 import com.diagbot.vo.QcInputcasesSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -95,6 +96,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("id", qcInputcasesSaveVO.getId())
                     .set("gmt_modified", DateUtil.now())
+                    .set("creator", qcInputcasesSaveVO.getCreator())
                     .set("text", qcInputcasesSaveVO.getText());
             res = update(qcInputcasesQuery);
             UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
@@ -110,6 +112,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
             for (QcInputMappingSaveVO t : inputMapping) {
                 QcInputcasesMapping qcList = new QcInputcasesMapping();
                 qcList.setCasesEntryId(t.getCasesEntryId());
+                qcList.setCreator(qcInputcasesSaveVO.getCreator());
                 qcList.setCasesId(t.getCasesId());
                 qcList.setPass(t.getPass());
                 qcList.setTextId(qcInputcasesSaveVO.getId());
@@ -130,6 +133,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
             }
             QcInputcases qcInputcases = new QcInputcases();
             qcInputcases.setText(qcInputcasesSaveVO.getText());
+            qcInputcases.setCreator(qcInputcasesSaveVO.getCreator());
             qcInputcases.setGmtModified(DateUtil.now());
             res = save(qcInputcases);
             List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
@@ -138,6 +142,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
                 for (QcInputMappingSaveVO t : inputMapping) {
                     QcInputcasesMapping qcList = new QcInputcasesMapping();
                     qcList.setCasesEntryId(t.getCasesEntryId());
+                    qcList.setCreator(qcInputcasesSaveVO.getCreator());
                     qcList.setCasesId(t.getCasesId());
                     qcList.setPass(t.getPass());
                     qcList.setTextId(qcInputcases.getId());
@@ -152,22 +157,24 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
     }
 
     /**
-     * @param id
+     * @param qcInputcasesByIdVO
      * @return
      */
-    public boolean cancelByIds(Long id) {
+    public boolean cancelByIds(QcInputcasesByIdVO qcInputcasesByIdVO) {
         boolean res = false;
         UpdateWrapper<QcInputcases> qcInputcasesQuery = new UpdateWrapper<>();
         qcInputcasesQuery
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", id)
+                .eq("id", qcInputcasesByIdVO.getTextId())
+                .set("modifier", qcInputcasesByIdVO.getCreator())
                 .set("is_deleted", IsDeleteEnum.Y.getKey());
         res = update(qcInputcasesQuery);
         if (res) {
             UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
             qcMappingQuery
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("text_id", id)
+                    .eq("text_id", qcInputcasesByIdVO.getTextId())
+                    .set("modifier", qcInputcasesByIdVO.getCreator())
                     .set("is_deleted", IsDeleteEnum.Y.getKey());
             res = qcInputcasesMappingService.update(qcMappingQuery);
         }

mrman-service/src/main/java/com/diagbot/vo/QcInputcasesByIdVO.java

@@ -11,5 +11,6 @@ import lombok.Setter;
 @Setter
 @Getter
 public class QcInputcasesByIdVO {
+    private  String creator;
     private  Long textId;
 }

mrman-service/src/main/java/com/diagbot/vo/QcInputcasesSaveVO.java

@@ -23,6 +23,8 @@ public class QcInputcasesSaveVO {
      */
     private String text;
 
+    private String creator;;
+
     private List<QcInputMappingSaveVO> qcInputMappingSaveVO;
 
 }

mrman-service/src/main/java/com/diagbot/web/QcInputcasesController.java

@@ -58,7 +58,7 @@ public class QcInputcasesController{
     @PostMapping("/cancelById")
     @SysLogger("cancelById")
     public RespDTO<Boolean> cancelById(@Valid @RequestBody QcInputcasesByIdVO qcInputcasesByIdVO) {
-        boolean res = qcInputcasesFacade.cancelByIds(qcInputcasesByIdVO.getTextId());
+        boolean res = qcInputcasesFacade.cancelByIds(qcInputcasesByIdVO);
         return RespDTO.onSuc(res);
     }
 }