Commit 38065ee0 authored by zhangsen's avatar zhangsen

fix-119调派车辆后,车辆绑定人员未收到待办任务,错误收到消息通知 加类型

parent cd2c5f24
...@@ -87,4 +87,8 @@ public class AlertCallePowerTransferRo implements Serializable{ ...@@ -87,4 +87,8 @@ public class AlertCallePowerTransferRo implements Serializable{
@ApiModelProperty(value = "调派类型队伍") @ApiModelProperty(value = "调派类型队伍")
private String powerTransType; private String powerTransType;
//bug 5973
@Label(value = "类别")
private Integer category;
} }
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
import com.yeejoin.amos.component.rule.config.ClazzUtils; import com.yeejoin.amos.component.rule.config.ClazzUtils;
import com.yeejoin.amos.feign.rule.Rule; import com.yeejoin.amos.feign.rule.Rule;
import com.yeejoin.amos.feign.rule.client.RuleClient; import com.yeejoin.amos.feign.rule.client.RuleClient;
...@@ -265,6 +266,9 @@ public class RuleAlertCalledService { ...@@ -265,6 +266,9 @@ public class RuleAlertCalledService {
if (alertCalledFormDto == null) { if (alertCalledFormDto == null) {
return false; return false;
} }
//任务型计划 // bug 5973
alertCallePowerTransferRo.setCategory(RuleTypeEnum.任务型计划生成.getCategory());
AlertCalled alertCalled = alertCalledFormDto.getAlertCalled(); AlertCalled alertCalled = alertCalledFormDto.getAlertCalled();
alertCallePowerTransferRo alertCallePowerTransferRo
.setCallTimeStr(DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN)); .setCallTimeStr(DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment