diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index 647b5c4ad..d9451c1f3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -9,7 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.Date; @RestController 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 522fa4717..aca3c261d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -53,7 +53,17 @@ public class WxTopic implements Serializable { @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") @Transient private List couponList; + //状态,一个或者多个 + @Transient + private String statusStr; + + public String getStatusStr() { + return statusStr; + } + public void setStatusStr(String statusStr) { + this.statusStr = statusStr; + } public List getCouponList() { return couponList; 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 47911525e..23a6574d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -261,21 +261,53 @@ public class WxFlowServiceImpl implements WxFlowService { Map msgReplaceMap = new HashedMap(); msgReplaceMap.put("page", Constant.adminPage); msgReplaceMap.put("applyTime", new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date())); + msgReplaceMap.put("name",userName); + msgReplaceMap.put("linkName",userName); + msgReplaceMap.put("linkPhone",phone); ResultData resultData = getTaskStatusList(businessId, tenantId); List flowRecordList = (List) resultData.data; String taskListHtml = ""; - for (WxFlowRecord record : flowRecordList) { + for (int i = flowRecordList.size() -1; i>=0; i--) { + WxFlowRecord record = flowRecordList.get(i); if (record.getStatus().equals(EnumFlowRecordStatus.NEW.getCode())) { - msgReplaceMap.put("starter", record.getUserName()); - msgReplaceMap.put("starterRemark", record.getRemark() == null ? "" : record.getRemark()); + taskListHtml += "
"; + taskListHtml += "
"; + taskListHtml += "
"; + taskListHtml += "
发起申请
"; + taskListHtml += "
"+record.getUserName()+"
"; + taskListHtml += "
"; + taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; + taskListHtml += "
"; } else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) { - taskListHtml += "
"; - taskListHtml += "
待审批
" + record.getUserName() + "
"; - taskListHtml += "
" + record.getRemark() + "
"; + taskListHtml += "
"; + taskListHtml += "
"; + taskListHtml += "
"; + taskListHtml += "
待审批
"; + taskListHtml += "
"+record.getUserName()+"
"; + taskListHtml += "
"; + taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; + taskListHtml += "
"; } else { - taskListHtml += "
"; - taskListHtml += "
审批通过
" + record.getUserName() + "
"; - taskListHtml += "
" + record.getRemark() + "
"; + taskListHtml += "
"; + taskListHtml += "
"; + taskListHtml += "
"; + taskListHtml += "
同意并呈送
"; + taskListHtml += "
"+record.getUserName()+"
"; + taskListHtml += "
"; + taskListHtml += "
"+record.getRemark() == null ? "" : record.getRemark()+"
"; + taskListHtml += "
"; } } msgReplaceMap.put("taskList", taskListHtml); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index c54b6a123..e36876db1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -22,12 +22,7 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { @Override public void save(BaseMsg data){ final IdWorker idWorker = IdWorker.get(); - WxMsgRecord msgRecord = new WxMsgRecord(); - msgRecord.setId(idWorker.nextId()); - msgRecord.setUuid(data.getUuid()); - msgRecord.setMsgJson(JsonUtil.obj2Json(data)); - msgRecord.setMsgStatus(EnumMsgRecordStatus.DEFAULT.getCode()); if(data instanceof WxMsgRecord){ msgRecord = (WxMsgRecord)data; @@ -47,6 +42,11 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { msgRecord.setMsgType(wxMsg.getMsgType()); msgRecord.setReceiver(wxMsg.getTo()); } + + msgRecord.setUuid(data.getUuid()); + msgRecord.setId(idWorker.nextId()); + msgRecord.setMsgJson(JsonUtil.obj2Json(data)); + msgRecord.setMsgStatus(EnumMsgRecordStatus.DEFAULT.getCode()); wxMsgRecordMapper.save(msgRecord); } diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index c4eeaa68c..df1b0b5bc 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -43,6 +43,10 @@ and `end_time` <= #{endTime} + + and `status` in (#{statusStr}) + + order by createtime desc