Просмотр исходного кода

[消息组件][添加][添加账单邮件通知]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
d6f2979406
3 измененных файлов: 29 добавлений и 16 удалений
  1. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
  2. +13
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/resources/mapper/WxTopicMapper.xml

+ 12
- 0
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;
}


+ 13
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -276,11 +276,11 @@ public class WxFlowServiceImpl implements WxFlowService {
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);margin-top: 11px;\">发起申请</div>";
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);\">"+record.getUserName()+"</div>";
taskListHtml += "</div>";
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; " ;
if(i != flowRecordList.size() - 1){
taskListHtml += "border-left: 2px dashed #DEDEDE;";
if(i == flowRecordList.size() - 1){
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
}else{
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; border-left: 2px dashed #DEDEDE; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
}
taskListHtml += " color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
taskListHtml += "</div>";
} else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) {
taskListHtml += "<div style=\"overflow: hidden;\">";
@@ -289,11 +289,11 @@ public class WxFlowServiceImpl implements WxFlowService {
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(200,89,98,1);margin-top: 11px;\">待审批</div>";
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(200,89,98,1);\">"+record.getUserName()+"</div>";
taskListHtml += "</div>";
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; " ;
if(i != flowRecordList.size() - 1){
taskListHtml += "border-left: 2px dashed #DEDEDE;";
if(i == flowRecordList.size() - 1){
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
}else{
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; border-left: 2px dashed #DEDEDE; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
}
taskListHtml += "color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
taskListHtml += "</div>";
} else {
taskListHtml += "<div style=\"overflow: hidden;\">";
@@ -302,11 +302,12 @@ public class WxFlowServiceImpl implements WxFlowService {
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-top: 11px;\">同意并呈送</div>";
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);\">"+record.getUserName()+"</div>";
taskListHtml += "</div>";
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px;" ;
if(i != flowRecordList.size() - 1){
taskListHtml += "border-left: 2px dashed #DEDEDE;";
if(i == flowRecordList.size() - 1){
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
}else{
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; border-left: 2px dashed #DEDEDE; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
}
taskListHtml += " color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>";
taskListHtml += "</div>";
}
}


+ 4
- 4
mallinkService/src/main/resources/mapper/WxTopicMapper.xml Просмотреть файл

@@ -14,11 +14,12 @@
<result column="status" property="status" />
<result column="createtime" property="createtime" />
<result column="updatetime" property="updatetime" />
<result column="bgColor" property="bgColor" />

</resultMap>

<sql id="allColumns">
`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
</sql>

<sql id="dynamicWhereConditions">
@@ -33,9 +34,8 @@
<if test=" null != status ">
and `status` = #{status}
</if>
<if test=" null != name and '' != name ">
and `name` like concat('%', #{name},'%')
<if test=" null != status ">
and `status` = #{status}
</if>
<if test=" null != beginTime ">
and `begin_time` >= #{beginTime}


Загрузка…
Отмена
Сохранить