From c141d1da6bc8b22f308fb6caf694d05a4eadf4c2 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 27 Jan 2026 13:51:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B7=BB=E5=8A=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mbg.xml | 12 ++-- .../system/domain/dto/HmsVersionDto.java | 2 + .../ccsens/system/domain/po/HmsVersion.java | 11 +++ .../system/domain/po/HmsVersionExample.java | 70 +++++++++++++++++++ .../ccsens/system/domain/vo/HmsVersionVo.java | 1 + .../resources/mapper/dao/SysVersionDao.xml | 1 + .../mapper/system/HmsVersionMapper.xml | 30 ++++++-- .../service/impl/IHmsVersionServiceImpl.java | 2 +- sql/添加bmi和问题code字段20260127.sql | 3 + 9 files changed, 118 insertions(+), 14 deletions(-) diff --git a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml index f92f44f..f73c053 100644 --- a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml +++ b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml @@ -19,10 +19,10 @@ - + password="123456"> @@ -106,8 +106,8 @@ - -
+ + @@ -122,7 +122,7 @@ - +
@@ -132,7 +132,7 @@ -
+ diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/HmsVersionDto.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/HmsVersionDto.java index 1308893..17ee069 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/HmsVersionDto.java +++ b/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 diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersion.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersion.java index cd6048f..b6572a0 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersion.java +++ b/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(); } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersionExample.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersionExample.java index 5f5684b..a878431 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/HmsVersionExample.java +++ b/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 values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List 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 { diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/HmsVersionVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/HmsVersionVo.java index fc28094..2890ee1 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/HmsVersionVo.java +++ b/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; diff --git a/ruisi_java/ruisi-system/src/main/resources/mapper/dao/SysVersionDao.xml b/ruisi_java/ruisi-system/src/main/resources/mapper/dao/SysVersionDao.xml index 7c57c59..3876cbd 100644 --- a/ruisi_java/ruisi-system/src/main/resources/mapper/dao/SysVersionDao.xml +++ b/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 diff --git a/ruisi_java/ruisi-system/src/main/resources/mapper/system/HmsVersionMapper.xml b/ruisi_java/ruisi-system/src/main/resources/mapper/system/HmsVersionMapper.xml index a6c6d12..272e516 100644 --- a/ruisi_java/ruisi-system/src/main/resources/mapper/system/HmsVersionMapper.xml +++ b/ruisi_java/ruisi-system/src/main/resources/mapper/system/HmsVersionMapper.xml @@ -11,6 +11,7 @@ + @@ -71,7 +72,8 @@ - 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 @@ -210,6 +218,9 @@ del_flag = #{record.delFlag,jdbcType=TINYINT}, + + status = #{record.status,jdbcType=VARCHAR}, + @@ -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} @@ -257,6 +269,9 @@ del_flag = #{delFlag,jdbcType=TINYINT}, + + status = #{status,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -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} \ No newline at end of file diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IHmsVersionServiceImpl.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IHmsVersionServiceImpl.java index fb23beb..2ced64f 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IHmsVersionServiceImpl.java +++ b/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 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); } } diff --git a/sql/添加bmi和问题code字段20260127.sql b/sql/添加bmi和问题code字段20260127.sql index 6addc3d..ed9056d 100644 --- a/sql/添加bmi和问题code字段20260127.sql +++ b/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禁用';