yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复：消息中心类型转换

zhongwei
ty 4 months ago
parent
f8bd1b25fb
commit
eee0993d7c
4 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java
  2. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java
  3. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java
  4. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java
Unescape View File

@ -107,7 +107,7 @@ public class TaskGenerateAspect {
PlanMsgRecordDto recordDto = new PlanMsgRecordDto() PlanMsgRecordDto recordDto = new PlanMsgRecordDto()
.setDeptId(taskEntity.getCreateDept()) .setDeptId(taskEntity.getCreateDept())
.setTemplateId(taskEntity.getMessageTemplateId()) .setTemplateId(taskEntity.getMessageTemplateId())
.setTaskId(taskEntity.getId()) .setTaskId(taskEntity.getId().toString())
.setTenantId(Optional.ofNullable(AuthUtil.getTenantId()).orElse(taskEntity.getTenantId())) .setTenantId(Optional.ofNullable(AuthUtil.getTenantId()).orElse(taskEntity.getTenantId()))
.setReceiver(userId) .setReceiver(userId)
.setCreateUser(userId) .setCreateUser(userId)

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java
Unescape View File

@ -144,7 +144,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service, StartProces
if (StringUtils.isNotBlank(param)){ if (StringUtils.isNotBlank(param)){
variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class);
}else { }else {
variables = JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(entity,DateUtil.PATTERN_DATETIME), Map.class); variables = JSONObject.parseObject(entity);
} }
variables.put("creator", TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()))); variables.put("creator", TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId())));
R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(), R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(),

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java
Unescape View File

@ -263,7 +263,7 @@ public class MaintenanceTaskCreateTask {
planMsgRecordDto.setTemplateId(taskEntity.getMessageTemplateId()); planMsgRecordDto.setTemplateId(taskEntity.getMessageTemplateId());
planMsgRecordDto.setCreateUser(taskEntity.getCreateUser()); planMsgRecordDto.setCreateUser(taskEntity.getCreateUser());
planMsgRecordDto.setPlanTime(LocalDateTime.ofInstant(taskEntity.getDisposeTime().toInstant(),zoneId)); planMsgRecordDto.setPlanTime(LocalDateTime.ofInstant(taskEntity.getDisposeTime().toInstant(),zoneId));
planMsgRecordDto.setTaskId(taskEntity.getId()); planMsgRecordDto.setTaskId(taskEntity.getId().toString());
planMsgRecordDto.setDeptId(taskEntity.getCreateDept()); planMsgRecordDto.setDeptId(taskEntity.getCreateDept());
planMsgRecordDto.setReceiver(userId); planMsgRecordDto.setReceiver(userId);
TemplateService templateService1 = templateService.stream().filter(item -> item.isTemplateStatus(1)).findFirst().orElse(null); TemplateService templateService1 = templateService.stream().filter(item -> item.isTemplateStatus(1)).findFirst().orElse(null);

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java
Unescape View File

@ -366,7 +366,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
planMsgRecordDto.setTemplateId(taskEntity.getMessageTemplateId()); planMsgRecordDto.setTemplateId(taskEntity.getMessageTemplateId());
planMsgRecordDto.setCreateUser(taskEntity.getCreateUser()); planMsgRecordDto.setCreateUser(taskEntity.getCreateUser());
planMsgRecordDto.setPlanTime(LocalDateTime.ofInstant(taskEntity.getDisposeTime().toInstant(), zoneId)); planMsgRecordDto.setPlanTime(LocalDateTime.ofInstant(taskEntity.getDisposeTime().toInstant(), zoneId));
planMsgRecordDto.setTaskId(taskEntity.getId()); planMsgRecordDto.setTaskId(taskEntity.getId().toString());
planMsgRecordDto.setDeptId(taskEntity.getCreateDept()); planMsgRecordDto.setDeptId(taskEntity.getCreateDept());
planMsgRecordDto.setReceiver(userId); planMsgRecordDto.setReceiver(userId);
TemplateService templateService1 = templateService.stream().filter(item -> item.isTemplateStatus(1)).findFirst().orElse(null); TemplateService templateService1 = templateService.stream().filter(item -> item.isTemplateStatus(1)).findFirst().orElse(null);

Write Preview
Loading…
Cancel
Save