量表字段更新

src/main/java/com/diagbot/entity/KlConceptScale.java

@@ -9,11 +9,11 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ * 量表明细表
  * </p>
  *
  * @author wangfeng
- * @since 2021-05-10
+ * @since 2021-05-24
  */
 public class KlConceptScale implements Serializable {
 
@@ -76,7 +76,17 @@ public class KlConceptScale implements Serializable {
     private BigDecimal score;
 
     /**
-     * 0表格1有分数2无分数
+     * 系数
+     */
+    private BigDecimal factor;
+
+    /**
+     * 常数
+     */
+    private BigDecimal constant;
+
+    /**
+     * 11表格;12文本;21标题;31算分;32显示选择结果
      */
     private Integer textType;
 
@@ -90,6 +100,26 @@ public class KlConceptScale implements Serializable {
      */
     private Integer orderNo;
 
+    /**
+     * 1：显示，0：不显示，2隐藏
+     */
+    private Integer status;
+
+    /**
+     * 组别互斥（同组互斥）
+     */
+    private Integer group;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 推送信息
+     */
+    private String pushInfo;
+
     private String remark;
 
     public Long getId() {
@@ -169,6 +199,20 @@ public class KlConceptScale implements Serializable {
     public void setScore(BigDecimal score) {
         this.score = score;
     }
+    public BigDecimal getFactor() {
+        return factor;
+    }
+
+    public void setFactor(BigDecimal factor) {
+        this.factor = factor;
+    }
+    public BigDecimal getConstant() {
+        return constant;
+    }
+
+    public void setConstant(BigDecimal constant) {
+        this.constant = constant;
+    }
     public Integer getTextType() {
         return textType;
     }
@@ -190,7 +234,34 @@ public class KlConceptScale implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+    public Integer getStatus() {
+        return status;
+    }
 
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public Integer getGroup() {
+        return group;
+    }
+
+    public void setGroup(Integer group) {
+        this.group = group;
+    }
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+    public String getPushInfo() {
+        return pushInfo;
+    }
+
+    public void setPushInfo(String pushInfo) {
+        this.pushInfo = pushInfo;
+    }
     public String getRemark() {
         return remark;
     }
@@ -213,9 +284,15 @@ public class KlConceptScale implements Serializable {
             ", content=" + content +
             ", ruleCode=" + ruleCode +
             ", score=" + score +
+            ", factor=" + factor +
+            ", constant=" + constant +
             ", textType=" + textType +
             ", selectType=" + selectType +
             ", orderNo=" + orderNo +
+            ", status=" + status +
+            ", group=" + group +
+            ", result=" + result +
+            ", pushInfo=" + pushInfo +
             ", remark=" + remark +
         "}";
     }

src/main/java/com/diagbot/facade/KlScaleFacade.java

@@ -19,6 +19,7 @@ import com.diagbot.vo.KlScaleClearVO;
 import com.diagbot.vo.KlScaleDetailMenuVO;
 import com.diagbot.vo.KlScaleInfoVO;
 import com.diagbot.vo.KlScaleSatartOrdisaVO;
+import com.diagbot.vo.KlScaleSaveGroupVO;
 import com.diagbot.vo.KlScaleSaveUpDetailVO;
 import com.diagbot.vo.KlScaleSaveUpParentVO;
 import com.diagbot.vo.KlScaleSaveUpVO;
@@ -92,6 +93,7 @@ public class KlScaleFacade {
         UpdateWrapper<KlConceptScale> KlConceptScaleUp = new UpdateWrapper<>();
         KlConceptScaleUp.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("concept_id", klScaleSaveUpVO.getConceptId());
         res = klConceptScaleFacade.remove(KlConceptScaleUp);
+        //更新主表或者保存
         if (null == klScaleSaveUpVO.getId()) {
             KlConceptStatic klScale = new KlConceptStatic();
             klScale.setConceptId(klScaleSaveUpVO.getConceptId());
@@ -105,11 +107,11 @@ public class KlScaleFacade {
                     .set("concept_id", klScaleSaveUpVO.getConceptId())
                     .set("modifier", klScaleSaveUpVO.getModifier())
                     .set("gmt_modified", now);
-            ;
             res = klConceptStaticFacade.update(klScaleUp);
         }
+        //保存问题明细
         if (res) {
-            List<KlScaleSaveUpParentVO> klScaleParent = klScaleSaveUpVO.getKlScaleParent();
+            List<KlScaleSaveUpParentVO> klScaleParent = klScaleSaveUpVO.getKlScaleParent();//标题
             if (ListUtil.isNotEmpty(klScaleParent)) {
                 for (KlScaleSaveUpParentVO data : klScaleParent) {
                     KlConceptScale klConceptScale = new KlConceptScale();
@@ -119,26 +121,33 @@ public class KlScaleFacade {
                     klConceptScale.setParentId(-1L);
                     klConceptScale.setConceptId(klScaleSaveUpVO.getConceptId());
                     res = klConceptScaleFacade.save(klConceptScale);
-                    List<KlScaleSaveUpDetailVO> klScaleSub = data.getKlScaleSub();
-                    if (ListUtil.isNotEmpty(klScaleSub)) {
-                        for (KlScaleSaveUpDetailVO data1 : klScaleSub) {
-                            KlConceptScale klConceptScaleSub = new KlConceptScale();
-                            BeanUtil.copyProperties(data1, klConceptScaleSub);
-                            klConceptScaleSub.setGmtModified(now);
-                            klConceptScaleSub.setModifier(klScaleSaveUpVO.getModifier());
-                            klConceptScaleSub.setParentId(klConceptScale.getId());
-                            klConceptScaleSub.setConceptId(klScaleSaveUpVO.getConceptId());
-                            res = klConceptScaleFacade.save(klConceptScaleSub);
-                            List<KlScaleSubDetailVO> klScaleDetail = data1.getKlScaleDetail();
-                            if (ListUtil.isNotEmpty(klScaleDetail)) {
-                                for (KlScaleSubDetailVO data2 : klScaleDetail) {
-                                    KlConceptScale klConceptScaleDetail = new KlConceptScale();
-                                    BeanUtil.copyProperties(data2, klConceptScaleDetail);
-                                    klConceptScaleDetail.setGmtModified(now);
-                                    klConceptScaleDetail.setModifier(klScaleSaveUpVO.getModifier());
-                                    klConceptScaleDetail.setParentId(klConceptScaleSub.getId());
-                                    klConceptScaleDetail.setConceptId(klScaleSaveUpVO.getConceptId());
-                                    res = klConceptScaleFacade.save(klConceptScaleDetail);
+                    List<KlScaleSaveGroupVO> klScaleSaveGroup = data.getKlScaleSaveGroup();
+                    //组别默认从1开始
+                    int baseGroup = 0;
+                    for (KlScaleSaveGroupVO groupData : klScaleSaveGroup) {//组别
+                        baseGroup = baseGroup + 1;
+                        List<KlScaleSaveUpDetailVO> klScaleSub = groupData.getKlScaleSub();
+                        if (ListUtil.isNotEmpty(klScaleSub)) {
+                            for (KlScaleSaveUpDetailVO data1 : klScaleSub) {//问题
+                                KlConceptScale klConceptScaleSub = new KlConceptScale();
+                                BeanUtil.copyProperties(data1, klConceptScaleSub);
+                                klConceptScaleSub.setGmtModified(now);
+                                klConceptScaleSub.setGroup(baseGroup);
+                                klConceptScaleSub.setModifier(klScaleSaveUpVO.getModifier());
+                                klConceptScaleSub.setParentId(klConceptScale.getId());
+                                klConceptScaleSub.setConceptId(klScaleSaveUpVO.getConceptId());
+                                res = klConceptScaleFacade.save(klConceptScaleSub);
+                                List<KlScaleSubDetailVO> klScaleDetail = data1.getKlScaleDetail();
+                                if (ListUtil.isNotEmpty(klScaleDetail)) {
+                                    for (KlScaleSubDetailVO data2 : klScaleDetail) {//答案
+                                        KlConceptScale klConceptScaleDetail = new KlConceptScale();
+                                        BeanUtil.copyProperties(data2, klConceptScaleDetail);
+                                        klConceptScaleDetail.setGmtModified(now);
+                                        klConceptScaleDetail.setModifier(klScaleSaveUpVO.getModifier());
+                                        klConceptScaleDetail.setParentId(klConceptScaleSub.getId());
+                                        klConceptScaleDetail.setConceptId(klScaleSaveUpVO.getConceptId());
+                                        res = klConceptScaleFacade.save(klConceptScaleDetail);
+                                    }
                                 }
                             }
                         }

src/main/java/com/diagbot/vo/KlScaleSaveGroupVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: 组
+ * @date 2021-05-25 9:20
+ */
+@Setter
+@Getter
+public class KlScaleSaveGroupVO {
+    private Integer groupNum;
+    private List<KlScaleSaveUpDetailVO> klScaleSub;
+}

src/main/java/com/diagbot/vo/KlScaleSaveUpParentVO.java

@@ -47,6 +47,6 @@ public class KlScaleSaveUpParentVO {
 
     private String remark;
 
-    List<KlScaleSaveUpDetailVO> klScaleSub;
+    private List<KlScaleSaveGroupVO> klScaleSaveGroup;
 
 }

src/main/java/com/diagbot/vo/KlScaleSaveUpVO.java

@@ -38,5 +38,6 @@ public class KlScaleSaveUpVO {
      */
     private String remark;
 
+
     private List<KlScaleSaveUpParentVO> KlScaleParent;
 }

src/main/resources/mapper/KlConceptScaleMapper.xml

@@ -15,9 +15,15 @@
         <result column="content" property="content" />
         <result column="rule_code" property="ruleCode" />
         <result column="score" property="score" />
+        <result column="factor" property="factor" />
+        <result column="constant" property="constant" />
         <result column="text_type" property="textType" />
         <result column="select_type" property="selectType" />
         <result column="order_no" property="orderNo" />
+        <result column="status" property="status" />
+        <result column="group" property="group" />
+        <result column="result" property="result" />
+        <result column="push_info" property="pushInfo" />
         <result column="remark" property="remark" />
     </resultMap>
     <select id="getKlScaleDetailMenu" resultMap="BaseResultMap">