Merge remote-tracking branch 'origin/dev/mrman20200117_init' into dev/mrman20200117_init

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.GetAllByHospitalDTO;
 import com.diagbot.dto.GetAllByHospitalDetialDTO;
 import com.diagbot.dto.QcCasesEntryDTO;
@@ -149,7 +150,18 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
             BeanUtil.copyProperties(insertByHospitalVO,qcCasesEntry);
             qcCasesEntry.setGmtCreate(date);
             qcCasesEntry.setGmtModified(date);
-            qcCacesEntryFacade.save(qcCasesEntry);
+            boolean res= qcCacesEntryFacade.save(qcCasesEntry);
+            //先保存， 在更新Coed
+            if(res){
+                Long id = qcCasesEntry.getId();
+                String code = qcCasesEntry.getCode()+id;
+                UpdateWrapper<QcCasesEntry> qcCasesEntryQueryUpdate = new UpdateWrapper<>();
+                qcCasesEntryQueryUpdate
+                        .eq("is_deleted",IsDeleteEnum.N.getKey())
+                        .eq("id",id)
+                        .set("code",code);
+                qcCacesEntryFacade.update(qcCasesEntryQueryUpdate);
+            }
         }
         //添加分值明细
         List<CasesEntryHospital> casesEntryHospitals = new ArrayList<>();

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

@@ -21,7 +21,7 @@ public class QcCasesEntryAllVO extends Page {
     /**
      * 用于层级定义，由操作人控制录入，需按该列排序
      */
-    private String modeId;
+    private Long modeId;
 
     /**
      * 条目

mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -28,7 +28,7 @@
             AND a.cases_id = #{casesId}
         </if>
         <if test="modeId != null and modeId != ''">
-            AND b.modeId = #{modeId}
+            AND b.id = #{modeId}
         </if>
         <if test="name != null and name != ''">
             AND a.name LIKE CONCAT('%',#{name},'%')