Browse Source

添加独占一行字段

zhoutg 5 years ago
parent
commit
1c07c24969

+ 1 - 0
mrman-service/src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -25,6 +25,7 @@ public class QuestionDTO {
     private Long modeId; //数据模块ID
     private Integer retract; //缩进(0:不缩进 1:缩进)
     private Integer addLine; //换行(0:不换行,1:换行)
+    private Integer monoLine; //独占一行(0:不换行,1:换行)
     private Integer bold;//换行(0:不换行,1:加粗)
     private Integer position; //显示位置(1:靠右显示)
     private List<QuesCasesEntryDTO> quesCasesEntryDTOList = new ArrayList<>(); //质控条目明细

+ 6 - 1
mrman-service/src/main/java/com/diagbot/dto/QuestionPageDTO.java

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

+ 6 - 1
mrman-service/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:加粗)
      */

+ 2 - 1
mrman-service/src/main/java/com/diagbot/entity/wrapper/QuestionWrapper.java

@@ -27,7 +27,8 @@ public class QuestionWrapper implements Serializable {
     private Integer tagType; //标签显示类型
     private Integer controlType; //控件类型
     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 List<QuestionMappingWrapper> questionMappings = new ArrayList<>(); //映射关系

+ 1 - 2
mrman-service/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="remark" property="remark" />
     </resultMap>
@@ -112,7 +113,6 @@
 
     </select>
 
-
     <select id="getParent"  resultMap="BaseResultMap">
         SELECT a.* FROM `qc_question_info` a, qc_question_mapping b
         where a.is_deleted = 'N' and b.is_deleted = 'N' and a.id = b.parent_question
@@ -138,7 +138,6 @@
         </if>
     </select>
 
-
     <select id="getByParam" parameterType="java.util.Map" resultMap="BaseResultMap">
         select * from prec_question_info  where is_deleted = 'N'
         and id = #{id}