diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index aca3c261d..ece5a067b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -44,6 +44,9 @@ public class WxTopic implements Serializable { private Date createtime; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; + /*背景颜色*/ + @io.swagger.annotations.ApiModelProperty(value="背景颜色",name="bgColor") + private String bgColor; /*优惠券ids**/ @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") @@ -57,6 +60,15 @@ public class WxTopic implements Serializable { @Transient private String statusStr; + + public String getBgColor() { + return bgColor; + } + + public void setBgColor(String bgColor) { + this.bgColor = bgColor; + } + public String getStatusStr() { return statusStr; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 23a6574d6..35d322d19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -276,11 +276,11 @@ public class WxFlowServiceImpl implements WxFlowService { taskListHtml += "
发起申请
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += ""; - taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; + }else{ + taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; } - taskListHtml += " color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+""; taskListHtml += ""; } else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) { taskListHtml += "
"; @@ -289,11 +289,11 @@ public class WxFlowServiceImpl implements WxFlowService { taskListHtml += "
待审批
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; - taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; + }else{ + taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; } - taskListHtml += "color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+""; taskListHtml += ""; } else { taskListHtml += "
"; @@ -302,11 +302,12 @@ public class WxFlowServiceImpl implements WxFlowService { taskListHtml += "
同意并呈送
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; - taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; + }else{ + taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; } - taskListHtml += " color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+""; + taskListHtml += ""; } } diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index df1b0b5bc..b68eec096 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -14,11 +14,12 @@ + - `id`,`tenant_id`,`name`,`title`,content,cover,advert,begin_time,end_time,createtime,updatetime + `id`,`tenant_id`,`name`,`title`,content,cover,advert,begin_time,end_time,createtime,updatetime,bgColor @@ -33,9 +34,8 @@ and `status` = #{status} - - - and `name` like concat('%', #{name},'%') + + and `status` = #{status} and `begin_time` >= #{beginTime}