From 0058c05ed7f5e13628682d0f145d91a133209e82 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Tue, 23 Mar 2021 11:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/tall/bean/po/ProShow.java | 11 ++++ .../ccsens/tall/bean/po/ProShowExample.java | 60 +++++++++++++++++++ .../com/ccsens/tall/bean/vo/ProjectVo.java | 2 + .../ccsens/tall/service/ProjectService.java | 6 ++ .../resources/mapper_raw/ProShowMapper.xml | 45 +++++++++----- 5 files changed, 109 insertions(+), 15 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java index d18d011e..8a8a13ba 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java +++ b/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); diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java index cd570e76..59f56608 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java +++ b/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 values) { + addCriterion("style in", values, "style"); + return (Criteria) this; + } + + public Criteria andStyleNotIn(List 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; diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java index e3f7c08e..93a0cc16 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java +++ b/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("查询任务类型") diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index 5e440c39..5bd77f98 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/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); } //获取项目下的标签信息 diff --git a/tall/src/main/resources/mapper_raw/ProShowMapper.xml b/tall/src/main/resources/mapper_raw/ProShowMapper.xml index ab399014..dd83eae0 100644 --- a/tall/src/main/resources/mapper_raw/ProShowMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProShowMapper.xml @@ -7,6 +7,7 @@ + @@ -80,9 +81,9 @@ - id, project_id, slide, filter, is_show_mvp, create_task, time_show, duration, show_shortcuts, - select_task_type, detail_path, pims_nav_type, share_change, share_change_code, created_at, - updated_at, rec_status, role_belong + id, project_id, slide, filter, is_show_mvp, style, create_task, time_show, duration, + show_shortcuts, select_task_type, detail_path, pims_nav_type, share_change, share_change_code, + created_at, updated_at, rec_status, role_belong