Prechádzať zdrojové kódy

优化量表维护代码

wangfeng 4 rokov pred
rodič
commit
f6ecb91704

+ 6 - 6
src/main/java/com/diagbot/facade/KlScaleFacade.java

@@ -96,14 +96,14 @@ public class KlScaleFacade {
             KlConceptStatic klScale = new KlConceptStatic();
             klScale.setConceptId(klScaleSaveUpVO.getConceptId());
             klScale.setGmtModified(now);
-            klScale.setModifier("");
+            klScale.setModifier(klScaleSaveUpVO.getModifier());
             klScale.setStatus(1);
             res = klConceptStaticFacade.save(klScale);
         } else {
             UpdateWrapper<KlConceptStatic> klScaleUp = new UpdateWrapper<>();
             klScaleUp.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", klScaleSaveUpVO.getId())
                     .set("concept_id", klScaleSaveUpVO.getConceptId())
-                    .set("modifier", "")
+                    .set("modifier", klScaleSaveUpVO.getModifier())
                     .set("gmt_modified", now);
             ;
             res = klConceptStaticFacade.update(klScaleUp);
@@ -115,7 +115,7 @@ public class KlScaleFacade {
                     KlConceptScale klConceptScale = new KlConceptScale();
                     BeanUtil.copyProperties(data, klConceptScale);
                     klConceptScale.setGmtModified(now);
-                    klConceptScale.setModifier("");
+                    klConceptScale.setModifier(klScaleSaveUpVO.getModifier());
                     klConceptScale.setParentId(-1L);
                     klConceptScale.setConceptId(klScaleSaveUpVO.getConceptId());
                     res = klConceptScaleFacade.save(klConceptScale);
@@ -125,7 +125,7 @@ public class KlScaleFacade {
                             KlConceptScale klConceptScaleSub = new KlConceptScale();
                             BeanUtil.copyProperties(data1, klConceptScaleSub);
                             klConceptScaleSub.setGmtModified(now);
-                            klConceptScaleSub.setModifier("");
+                            klConceptScaleSub.setModifier(klScaleSaveUpVO.getModifier());
                             klConceptScaleSub.setParentId(klConceptScale.getId());
                             klConceptScaleSub.setConceptId(klScaleSaveUpVO.getConceptId());
                             res = klConceptScaleFacade.save(klConceptScaleSub);
@@ -135,7 +135,7 @@ public class KlScaleFacade {
                                     KlConceptScale klConceptScaleDetail = new KlConceptScale();
                                     BeanUtil.copyProperties(data2, klConceptScaleDetail);
                                     klConceptScaleDetail.setGmtModified(now);
-                                    klConceptScaleDetail.setModifier("");
+                                    klConceptScaleDetail.setModifier(klScaleSaveUpVO.getModifier());
                                     klConceptScaleDetail.setParentId(klConceptScaleSub.getId());
                                     klConceptScaleDetail.setConceptId(klScaleSaveUpVO.getConceptId());
                                     res = klConceptScaleFacade.save(klConceptScaleDetail);
@@ -173,7 +173,7 @@ public class KlScaleFacade {
         klScaleUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", klScaleSatartOrdisaVO.getId())
                 .set("status", start)
-                .set("modifier", "")
+                .set("modifier", klScaleSatartOrdisaVO.getModifier())
                 .set("gmt_modified", now);
         return klConceptStaticFacade.update(klScaleUpdate);
     }

+ 0 - 2
src/main/java/com/diagbot/vo/KlScaleInfoVO.java

@@ -12,8 +12,6 @@ import lombok.Setter;
 @Setter
 @Getter
 public class KlScaleInfoVO extends Page {
-    private Long conceptId;
     private Integer status;
     private String conceptName;
-    private String description;
 }

+ 1 - 0
src/main/java/com/diagbot/vo/KlScaleSatartOrdisaVO.java

@@ -12,4 +12,5 @@ import lombok.Setter;
 @Getter
 public class KlScaleSatartOrdisaVO {
     private Long id;
+    private String modifier;
 }

+ 1 - 1
src/main/java/com/diagbot/vo/KlScaleSaveUpVO.java

@@ -22,7 +22,7 @@ public class KlScaleSaveUpVO {
     private Long conceptId;
 
     private String conceptName;
-
+    private String modifier;
    /* *//**
      * 量表描述
      *//*

+ 0 - 3
src/main/resources/mapper/KlConceptStaticMapper.xml

@@ -460,9 +460,6 @@
         WHERE a.`is_deleted` = "N"
         AND b.`is_deleted` = "N"
         AND b.`lib_type` = 124
-        <if test="conceptId != null">
-            AND a.concept_id = #{conceptId}
-        </if>
         <if test="conceptName!=null and conceptName!=''">
             AND UPPER(b.lib_name) LIKE CONCAT('%', UPPER(trim(#{conceptName})), '%')
         </if>