瀏覽代碼

添加独占一行字段

zhoutg 5 年之前
父節點
當前提交
38e7616716

+ 2 - 1
doc/002.20200426第二版/qc_init.sql

@@ -34,7 +34,8 @@ CREATE TABLE `qc_question_info` (
   `tag_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '标签标识(1:单标签 4:组合标签)',
   `control_type` tinyint(4) DEFAULT '0' COMMENT '控件类型(0:无类型)',
   `retract` tinyint(4) DEFAULT '0' COMMENT '缩进(0:不缩进 1:缩进)',
-  `add_line` tinyint(4) DEFAULT '0' COMMENT '换行(0:不换行,1:换行)',
+  `add_line` tinyint(4) DEFAULT '0' COMMENT '内容换行(0:不换行,1:换行)',
+  `mono_line` tinyint(4) DEFAULT '0' COMMENT '独占一行(0:不换行,1:换行)',
   `bold` tinyint(4) DEFAULT '0' COMMENT '换行(0:不换行,1:加粗)',
   `position` tinyint(4) DEFAULT '0' COMMENT '显示位置(1:靠右显示)',
   `remark` varchar(300) DEFAULT NULL COMMENT '备注',

+ 2 - 1
src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -24,7 +24,8 @@ public class QuestionDTO {
     private Long hospitalId; //医院ID
     private Long modeId; //数据模块ID
     private Integer retract; //缩进(0:不缩进 1:缩进)
-    private Integer addLine; //换行(0:不换行,1:换行)
+    private Integer addLine; //内容换行(0:不换行,1:换行)
+    private Integer monoLine; //独占一行(0:不换行,1:换行)
     private Integer bold;//换行(0:不换行,1:加粗)
     private Integer position; //显示位置(1:靠右显示)
     private String casesEntryIds;//质控条目id列表

+ 6 - 1
src/main/java/com/diagbot/entity/QcQuestionInfo.java

@@ -92,10 +92,15 @@ public class QcQuestionInfo implements Serializable {
     private Integer retract;
 
     /**
-     * 换行(0:不换行,1:换行)
+     * 内容换行(0:不换行,1:换行)
      */
     private Integer addLine;
 
+    /**
+     * 独占一行(0:不换行,1:换行)
+     */
+    private Integer monoLine;
+
     /**
      * 换行(0:不换行,1:加粗)
      */

+ 1 - 0
src/main/resources/mapper/QcQuestionInfoMapper.xml

@@ -19,6 +19,7 @@
         <result column="control_type" property="controlType" />
         <result column="retract" property="retract" />
         <result column="add_line" property="addLine" />
+        <result column="mono_line" property="monoLine" />
         <result column="bold" property="bold" />
         <result column="cases_entry_ids" property="casesEntryIds" />
         <result column="remark" property="remark" />