版本添加状态字段

ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml

@@ -19,10 +19,10 @@
             <property name="suppressAllComments" value="true"/>
         </commentGenerator>
 
-        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
                         connectionURL="jdbc:mysql://localhost:3306/ruisi_cga_yf1?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=GMT%2B8&amp;tinyInt1isBit=false"
                         userId="root"
-                        password="q7510327">
+                        password="123456">
             <!--仅仅查询当前库的表，不查询其他库-->
             <property name="nullCatalogMeansCurrent" value="true"/>
         </jdbcConnection>
@@ -106,8 +106,8 @@
 <!--        <table tableName="tzbs_qms_scale_cognitive" domainObjectName="TzbsQmsScaleCognitive"/>-->
 <!--        <table tableName="tzbs_qms_scale_consti_ref_score" domainObjectName="TzbsQmsScaleConstiRefScore"/>-->
 <!--        <table tableName="tzbs_qms_scale_consti_ysfa" domainObjectName="TzbsQmsScaleConstiYsfa"/>-->
-        <table tableName="tzbs_rms_report_result" domainObjectName="TzbsRmsReportResult"/>
+<!--        <table tableName="tzbs_rms_report_result" domainObjectName="TzbsRmsReportResult"/>-->
-        <table tableName="tzbs_rms_report_ysjy" domainObjectName="TzbsRmsReportYsjy"/>
+<!--        <table tableName="tzbs_rms_report_ysjy" domainObjectName="TzbsRmsReportYsjy"/>-->
 <!--        <table tableName="ams_patient_answer_score" domainObjectName="AmsPatientAnswerScore"/>-->
 <!--        <table tableName="ams_patient_canvas" domainObjectName="AmsPatientCanvas"/>-->
 <!--        <table tableName="ams_patient_canvas_line" domainObjectName="AmsPatientCanvasLine"/>-->
@@ -122,7 +122,7 @@
 <!--        <table tableName="kms_knowledge_type" domainObjectName="KmsKnowledgeType"/>-->
 <!--        <table tableName="qms_scale_ass_conf" domainObjectName="QmsScaleAssConf"/>-->
 <!--        <table tableName="kms_knowledge" domainObjectName="KmsKnowledge"/>-->
-<!--        <table tableName="hms_version" domainObjectName="HmsVersion"/>-->
+        <table tableName="hms_version" domainObjectName="HmsVersion"/>
 <!--        <table tableName="qms_scale_ass_conf" domainObjectName="QmsScaleAssConf"/>-->
 <!--        <table tableName="kms_knowledge_detail" domainObjectName="KmsKnowledgeDetail"/>-->
 
@@ -132,7 +132,7 @@
 <!--        <table tableName="ams_report_template" domainObjectName="AmsReportTemplate"/>-->
 <!--        <table tableName="tb_options" domainObjectName="TbOptions"/>-->
 <!--        <table tableName="tb_question_conf" domainObjectName="TbQuestionConf"/>-->
-        <table tableName="tb_scale_ass_conf" domainObjectName="TbScaleAssConf"/>
+<!--        <table tableName="tb_scale_ass_conf" domainObjectName="TbScaleAssConf"/>-->
 <!--        <table tableName="tb_scale_conf" domainObjectName="TbScaleConf"/>-->
 <!--        <table tableName="tb_icd" domainObjectName="TbIcd"/>-->
 <!--        <table tableName="tb_drug" domainObjectName="TbDrug"/>-->

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/HmsVersionDto.java

@@ -27,6 +27,8 @@ public class HmsVersionDto {
         private String code;
 
         private Integer sort;
+        @ApiModelProperty("状态")
+        private String status;
     }
 
     @Data

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersion.java

@@ -22,6 +22,8 @@ public class HmsVersion implements Serializable {
 
     private Byte delFlag;
 
+    private String status;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -96,6 +98,14 @@ public class HmsVersion implements Serializable {
         this.delFlag = delFlag;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -111,6 +121,7 @@ public class HmsVersion implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", delFlag=").append(delFlag);
+        sb.append(", status=").append(status);
         sb.append("]");
         return sb.toString();
     }

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersionExample.java

@@ -684,6 +684,76 @@ public class HmsVersionExample {
             addCriterion("del_flag not between", value1, value2, "delFlag");
             return (Criteria) this;
         }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/HmsVersionVo.java

@@ -20,6 +20,7 @@ public class HmsVersionVo {
         private String version;
 
         private String code;
+        private String status;
 
         private Integer sort;
         private String createBy;

ruisi_java/ruisi-system/src/main/resources/mapper/dao/SysVersionDao.xml

@@ -27,6 +27,7 @@
             version,
             code,
             sort,
+            status,
             create_by as createBy,
             create_time as createTime
         from hms_version

ruisi_java/ruisi-system/src/main/resources/mapper/system/HmsVersionMapper.xml

@@ -11,6 +11,7 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, version, code, sort, create_by, create_time, update_by, update_time, del_flag
+    id, version, code, sort, create_by, create_time, update_by, update_time, del_flag, 
+    status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.system.domain.po.HmsVersionExample" resultMap="BaseResultMap">
     select
@@ -106,12 +108,12 @@
   <insert id="insert" parameterType="com.ccsens.system.domain.po.HmsVersion">
     insert into hms_version (id, version, code, 
       sort, create_by, create_time, 
-      update_by, update_time, del_flag
+      update_by, update_time, del_flag, 
-      )
+      status)
     values (#{id,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{sort,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, 
-      )
+      #{status,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.system.domain.po.HmsVersion">
     insert into hms_version
@@ -143,6 +145,9 @@
       <if test="delFlag != null">
         del_flag,
       </if>
+      <if test="status != null">
+        status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -172,6 +177,9 @@
       <if test="delFlag != null">
         #{delFlag,jdbcType=TINYINT},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.system.domain.po.HmsVersionExample" resultType="java.lang.Long">
@@ -210,6 +218,9 @@
       <if test="record.delFlag != null">
         del_flag = #{record.delFlag,jdbcType=TINYINT},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -225,7 +236,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      del_flag = #{record.delFlag,jdbcType=TINYINT}
+      del_flag = #{record.delFlag,jdbcType=TINYINT},
+      status = #{record.status,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -257,6 +269,9 @@
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=TINYINT},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -269,7 +284,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      del_flag = #{delFlag,jdbcType=TINYINT}
+      del_flag = #{delFlag,jdbcType=TINYINT},
+      status = #{status,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IHmsVersionServiceImpl.java

@@ -25,7 +25,7 @@ public class IHmsVersionServiceImpl implements IHmsVersionService {
     public List<HmsVersion> query() {
         HmsVersionExample hmsVersionExample = new HmsVersionExample();
         hmsVersionExample.setOrderByClause("sort asc");
-        hmsVersionExample.createCriteria().andDelFlagEqualTo((byte) 0);
+        hmsVersionExample.createCriteria().andDelFlagEqualTo((byte) 0).andStatusEqualTo("0");
         return hmsVersionMapper.selectByExample(hmsVersionExample);
     }
 }

sql/添加bmi和问题code字段20260127.sql

@@ -3,3 +3,6 @@ ADD COLUMN `bmi` varchar(255) NULL COMMENT 'BMI';
 
 ALTER TABLE `qms_question`
 ADD COLUMN `question_code` varchar(255) NULL COMMENT '问题CODE（关联tzbs_qms_scale_cognitive的ques_code）';
+
+ALTER TABLE `hms_version`
+ADD COLUMN `status` varchar(2) DEFAULT 0 COMMENT '状态 0正常 1禁用';