Commit 8c444a52 authored by suhuiguang's avatar suhuiguang

1. 自测bug,检验检测工作台待办摘要内容在无监管码时去掉不显示空【】

parent c06bf4d3
...@@ -287,7 +287,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -287,7 +287,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
ta.setNextTaskId(model.getNextTaskId()); ta.setNextTaskId(model.getNextTaskId());
dto.setModel(ta); dto.setModel(ta);
//摘要 按原有规则组装 //摘要 按原有规则组装
dto.setTaskContent("来自" + model.getEquList() + "【" + model.getSupervisoryCode() + "】的业务办理,【申请单号:" + model.getApplicationNo() + "】"); dto.setTaskContent(this.buildTaskContent(model));
//申请单号 //申请单号
dto.setTaskCode(model.getApplicationNo()); dto.setTaskCode(model.getApplicationNo());
//业务类型枚举code值 //业务类型枚举code值
...@@ -304,7 +304,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -304,7 +304,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
this.createdTaskModel(model); this.createdTaskModel(model);
} else { } else {
String taskContent = "来自" + model.getEquList() + "【" + model.getSupervisoryCode() + "】的业务办理,【申请单号:" + model.getApplicationNo() + "】"; String taskContent =
taskModelService.updateTaskContentById(MapBuilder.<String, Object>create().put("taskContent", taskContent).put("relationId", model.getSequenceNbr() + "").build()); taskModelService.updateTaskContentById(MapBuilder.<String, Object>create().put("taskContent", taskContent).put("relationId", model.getSequenceNbr() + "").build());
} }
} }
...@@ -418,6 +418,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -418,6 +418,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
return this.buildRedundancyField(model); return this.buildRedundancyField(model);
} }
private String buildTaskContent(JyjcInspectionApplicationModel model){
return String.format("来自%s%s的业务办理,【申请单号:%s】", model.getEquList(), StringUtils.isNotBlank(model.getSupervisoryCode()) ? "【" + model.getSupervisoryCode() + "】" : "", model.getApplicationNo());
}
private String null2String(Object obj) { private String null2String(Object obj) {
return obj == null ? "" : obj.toString(); return obj == null ? "" : obj.toString();
} }
...@@ -1032,7 +1039,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -1032,7 +1039,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
dto.setFlowCreateDate(new Date()); dto.setFlowCreateDate(new Date());
dto.setTaskName(model.getNextTaskName()); dto.setTaskName(model.getNextTaskName());
dto.setFlowCode(model.getNextTaskId()); dto.setFlowCode(model.getNextTaskId());
dto.setTaskContent("来自" + model.getEquList() + "【" + model.getSupervisoryCode() + "】的业务办理,【申请单号:" + model.getApplicationNo() + "】"); dto.setTaskContent(this.buildTaskContent(model));
dto.setTaskCode(model.getApplicationNo()); dto.setTaskCode(model.getApplicationNo());
dto.setTaskType(BizTypeEnum.getNumByCode(model.getBizType())); dto.setTaskType(BizTypeEnum.getNumByCode(model.getBizType()));
dto.setTaskTypeLabel(BizTypeEnum.getNameByCode(model.getBizType())); dto.setTaskTypeLabel(BizTypeEnum.getNameByCode(model.getBizType()));
......
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