提交

tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java

@@ -14,6 +14,8 @@ public class ProShow implements Serializable {
 
     private Byte isShowMvp;
 
+    private Byte style;
+
     private Byte createTask;
 
     private String timeShow;
@@ -82,6 +84,14 @@ public class ProShow implements Serializable {
         this.isShowMvp = isShowMvp;
     }
 
+    public Byte getStyle() {
+        return style;
+    }
+
+    public void setStyle(Byte style) {
+        this.style = style;
+    }
+
     public Byte getCreateTask() {
         return createTask;
     }
@@ -197,6 +207,7 @@ public class ProShow implements Serializable {
         sb.append(", slide=").append(slide);
         sb.append(", filter=").append(filter);
         sb.append(", isShowMvp=").append(isShowMvp);
+        sb.append(", style=").append(style);
         sb.append(", createTask=").append(createTask);
         sb.append(", timeShow=").append(timeShow);
         sb.append(", duration=").append(duration);

tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java

@@ -405,6 +405,66 @@ public class ProShowExample {
             return (Criteria) this;
         }
 
+        public Criteria andStyleIsNull() {
+            addCriterion("style is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleIsNotNull() {
+            addCriterion("style is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleEqualTo(Byte value) {
+            addCriterion("style =", value, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleNotEqualTo(Byte value) {
+            addCriterion("style <>", value, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleGreaterThan(Byte value) {
+            addCriterion("style >", value, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleGreaterThanOrEqualTo(Byte value) {
+            addCriterion("style >=", value, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleLessThan(Byte value) {
+            addCriterion("style <", value, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleLessThanOrEqualTo(Byte value) {
+            addCriterion("style <=", value, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleIn(List<Byte> values) {
+            addCriterion("style in", values, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleNotIn(List<Byte> values) {
+            addCriterion("style not in", values, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleBetween(Byte value1, Byte value2) {
+            addCriterion("style between", value1, value2, "style");
+            return (Criteria) this;
+        }
+
+        public Criteria andStyleNotBetween(Byte value1, Byte value2) {
+            addCriterion("style not between", value1, value2, "style");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTaskIsNull() {
             addCriterion("create_task is null");
             return (Criteria) this;

tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@@ -134,6 +134,8 @@ public class ProjectVo {
         private int createTask = 1;
         @ApiModelProperty("是否展示MVP 0：不展示  1：展示")
         private int showMvp = 1;
+        @ApiModelProperty("项目样式 0 胶囊 1列表")
+        private Byte style;
         @JsonIgnore//0日程，1天，2周，3月
         private int selectTaskType = 2;
         @ApiModelProperty("查询任务类型")

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -210,9 +210,11 @@ public class ProjectService implements IProjectService {
                     projectConfig.setSelectTaskType(proShowList.get(0).getSelectTaskType());
                     projectConfig.setDetailPath(proShowList.get(0).getDetailPath());
                     projectConfig.setPimsNavType(proShowList.get(0).getPimsNavType());
+                    projectConfig.setStyle(proShowList.get(0).getStyle());
                     projectInfo.setProjectConfig(projectConfig);
                 } else {
                     ProjectVo.ProjectConfig projectConfig = new ProjectVo.ProjectConfig();
+                    projectConfig.setStyle((byte) 0);
                     projectInfo.setProjectConfig(projectConfig);
                 }
                 //查找项目未处理的消息数量
@@ -286,12 +288,14 @@ public class ProjectService implements IProjectService {
                     projectConfig.setSelectTaskType(proShowList.get(0).getSelectTaskType());
                     projectConfig.setDetailPath(proShowList.get(0).getDetailPath());
                     projectConfig.setPimsNavType(proShowList.get(0).getPimsNavType());
+                    projectConfig.setStyle(proShowList.get(0).getStyle());
                     projectInfo.setProjectConfig(projectConfig);
                 } else {
                     ProjectVo.ProjectConfig projectConfig = new ProjectVo.ProjectConfig();
                     projectConfig.setFilter(0);
                     projectConfig.setSlide(0);
                     projectConfig.setCreateTask(1);
+                    projectConfig.setStyle((byte)0);
                     projectInfo.setProjectConfig(projectConfig);
                 }
                 //获取项目下的标签信息
@@ -381,9 +385,11 @@ public class ProjectService implements IProjectService {
             projectConfig.setSelectTaskType(proShowList.get(0).getSelectTaskType());
             projectConfig.setDetailPath(proShowList.get(0).getDetailPath());
             projectConfig.setPimsNavType(proShowList.get(0).getPimsNavType());
+            projectConfig.setStyle(proShowList.get(0).getStyle());
             projectInfo.setProjectConfig(projectConfig);
         } else {
             ProjectVo.ProjectConfig projectConfig = new ProjectVo.ProjectConfig();
+            projectConfig.setStyle((byte)0);
             projectInfo.setProjectConfig(projectConfig);
         }
         //获取项目下的标签信息

tall/src/main/resources/mapper_raw/ProShowMapper.xml

@@ -7,6 +7,7 @@
     <result column="slide" jdbcType="TINYINT" property="slide" />
     <result column="filter" jdbcType="TINYINT" property="filter" />
     <result column="is_show_mvp" jdbcType="TINYINT" property="isShowMvp" />
+    <result column="style" jdbcType="TINYINT" property="style" />
     <result column="create_task" jdbcType="TINYINT" property="createTask" />
     <result column="time_show" jdbcType="VARCHAR" property="timeShow" />
     <result column="duration" jdbcType="TINYINT" property="duration" />
@@ -80,9 +81,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, project_id, slide, filter, is_show_mvp, create_task, time_show, duration, show_shortcuts, 
+    id, project_id, slide, filter, is_show_mvp, style, create_task, time_show, duration, 
-    select_task_type, detail_path, pims_nav_type, share_change, share_change_code, created_at, 
+    show_shortcuts, select_task_type, detail_path, pims_nav_type, share_change, share_change_code, 
-    updated_at, rec_status, role_belong
+    created_at, updated_at, rec_status, role_belong
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultMap="BaseResultMap">
     select
@@ -116,19 +117,19 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProShow">
     insert into t_pro_show (id, project_id, slide, 
-      filter, is_show_mvp, create_task, 
+      filter, is_show_mvp, style, 
-      time_show, duration, show_shortcuts, 
+      create_task, time_show, duration, 
-      select_task_type, detail_path, pims_nav_type, 
+      show_shortcuts, select_task_type, detail_path, 
-      share_change, share_change_code, created_at, 
+      pims_nav_type, share_change, share_change_code, 
-      updated_at, rec_status, role_belong
+      created_at, updated_at, rec_status, 
-      )
+      role_belong)
     values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,jdbcType=TINYINT}, 
-      #{filter,jdbcType=TINYINT}, #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, 
+      #{filter,jdbcType=TINYINT}, #{isShowMvp,jdbcType=TINYINT}, #{style,jdbcType=TINYINT}, 
-      #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, #{showShortcuts,jdbcType=TINYINT}, 
+      #{createTask,jdbcType=TINYINT}, #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, 
-      #{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, #{pimsNavType,jdbcType=TINYINT}, 
+      #{showShortcuts,jdbcType=TINYINT}, #{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, 
-      #{shareChange,jdbcType=TINYINT}, #{shareChangeCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{pimsNavType,jdbcType=TINYINT}, #{shareChange,jdbcType=TINYINT}, #{shareChangeCode,jdbcType=VARCHAR}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{roleBelong,jdbcType=TINYINT}
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
-      )
+      #{roleBelong,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProShow">
     insert into t_pro_show
@@ -148,6 +149,9 @@
       <if test="isShowMvp != null">
         is_show_mvp,
       </if>
+      <if test="style != null">
+        style,
+      </if>
       <if test="createTask != null">
         create_task,
       </if>
@@ -204,6 +208,9 @@
       <if test="isShowMvp != null">
         #{isShowMvp,jdbcType=TINYINT},
       </if>
+      <if test="style != null">
+        #{style,jdbcType=TINYINT},
+      </if>
       <if test="createTask != null">
         #{createTask,jdbcType=TINYINT},
       </if>
@@ -269,6 +276,9 @@
       <if test="record.isShowMvp != null">
         is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT},
       </if>
+      <if test="record.style != null">
+        style = #{record.style,jdbcType=TINYINT},
+      </if>
       <if test="record.createTask != null">
         create_task = #{record.createTask,jdbcType=TINYINT},
       </if>
@@ -320,6 +330,7 @@
       slide = #{record.slide,jdbcType=TINYINT},
       filter = #{record.filter,jdbcType=TINYINT},
       is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT},
+      style = #{record.style,jdbcType=TINYINT},
       create_task = #{record.createTask,jdbcType=TINYINT},
       time_show = #{record.timeShow,jdbcType=VARCHAR},
       duration = #{record.duration,jdbcType=TINYINT},
@@ -352,6 +363,9 @@
       <if test="isShowMvp != null">
         is_show_mvp = #{isShowMvp,jdbcType=TINYINT},
       </if>
+      <if test="style != null">
+        style = #{style,jdbcType=TINYINT},
+      </if>
       <if test="createTask != null">
         create_task = #{createTask,jdbcType=TINYINT},
       </if>
@@ -400,6 +414,7 @@
       slide = #{slide,jdbcType=TINYINT},
       filter = #{filter,jdbcType=TINYINT},
       is_show_mvp = #{isShowMvp,jdbcType=TINYINT},
+      style = #{style,jdbcType=TINYINT},
       create_task = #{createTask,jdbcType=TINYINT},
       time_show = #{timeShow,jdbcType=VARCHAR},
       duration = #{duration,jdbcType=TINYINT},