1.修改模板

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -32,7 +32,10 @@ import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.model.*;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -63,9 +66,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     private JgChangeRegistrationNameEqServiceImpl jgChangeRegistrationNameEqService;
 
     @Autowired
-    private JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
-
-    @Autowired
     RedisUtils redisUtils;
 
     @Autowired
@@ -107,10 +107,12 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     @Autowired
     ICmWorkflowService cmWorkflowService;
 
+    static String templete = "来自企业（s%）的业务办理，【申请单号：s%】";
+
 
     @Transactional(rollbackFor = Exception.class)
     public void save2(String submitType, JSONObject requestParam) {
-        Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>)JSONObject.parseObject(JSONObject.toJSONString(requestParam),Map.class);
+        Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
         this.save(submitType, jgRegistrationInfoMap);
     }
 
@@ -237,7 +239,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
      * @return 摘要
      */
     private String buildTaskContent(JgChangeRegistrationName dto) {
-        return "申请单号：" + dto.getApplyNo() + "的业务办理";
+        return String.format(templete, dto.getUseUnitCreditCode(), dto.getApplyNo());
     }
 
 
@@ -277,14 +279,14 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     jgChangeRegistrationName.setNextTaskId(nextTaskId);
                     jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                     // 创建待办
-                    createTaskModel(jgChangeRegistrationName,taskName,"1", nextUserIds);
+                    createTaskModel(jgChangeRegistrationName, taskName, "1", nextUserIds);
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);
                     throw new BadRequest("提交失败" + e.getMessage());
                 }
             } else {
                 // 执行一步
-                ProcessTaskDTO processTaskDTO = submit(op,jgChangeRegistrationName.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(op, jgChangeRegistrationName.getNextTaskId());
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -332,7 +334,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         taskV2Model.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
         taskV2Model.setExecuteUserIds(nextUserIds);
         TaskModelDto modelDto = new TaskModelDto();
-        BeanUtil.copyProperties(taskV2Model,modelDto);
+        BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
         modelDto.setModel(jgChangeRegistrationName);
         // 再插入新代办、数据待定
@@ -340,7 +342,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    public ProcessTaskDTO submit(String op,String taskId) {
+    public ProcessTaskDTO submit(String op, String taskId) {
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
@@ -401,7 +403,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationName));
         jsonObject.put("nextTaskId", jgChangeRegistrationName.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationName.getNextExecutorIds());
-        jsonObject.put("taskType",BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
+        jsonObject.put("taskType", BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -439,7 +441,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         String taskName = "";
         String nextTaskId = "";
         JgChangeRegistrationName jgChangeRegistrationName = this.getBaseMapper().selectById(sequenceNbr);
-        if(processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() >0){
+        if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();
             nextTaskId = processTaskDTO.getNextTask().get(0).getId();
@@ -448,14 +450,14 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
             List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
             String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
-            jgChangeRegistrationName.setNextExecutorIds(String.join(",",roleListNext));
+            jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
             jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
             jgChangeRegistrationName.setInstanceId(instanceId);
             jgChangeRegistrationName.setNextTaskId(nextTaskId);
             if (!ObjectUtils.isEmpty(jgChangeRegistrationName.getInstanceStatus())) {
-                jgChangeRegistrationName.setInstanceStatus(jgChangeRegistrationName.getInstanceStatus() + "," + String.join(",",roleListNext));
+                jgChangeRegistrationName.setInstanceStatus(jgChangeRegistrationName.getInstanceStatus() + "," + String.join(",", roleListNext));
             } else {
-                jgChangeRegistrationName.setInstanceStatus(String.join(",",roleListNext));
+                jgChangeRegistrationName.setInstanceStatus(String.join(",", roleListNext));
             }
             if ("0".equals(operate)) {
                 // 通过操作
@@ -481,17 +483,17 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     private TaskV2Model updateTaskModel(JgChangeRegistrationName jgChangeRegistrationName, String operate) {
         Map<String, Object> params = new HashMap<>();
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
-        params.put("relationId",jgChangeRegistrationName.getInstanceId());
+        params.put("relationId", jgChangeRegistrationName.getInstanceId());
         params.put("taskStatus", flowStatusEnum.getCode());
         params.put("taskStatusLabel", flowStatusEnum.getName());
-        params.put("flowStatus",this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-        params.put("flowStatusLabel",jgChangeRegistrationName.getAuditStatus());
+        params.put("flowStatus", this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
+        params.put("flowStatusLabel", jgChangeRegistrationName.getAuditStatus());
         return commonService.updateTaskModelNew(params);
     }
 
 
     private FlowStatusEnum getTaskStatus(String operate) {
-        if("0".equals(operate)){
+        if ("0".equals(operate)) {
             return FlowStatusEnum.TO_BE_FINISHED;
         } else {
             return FlowStatusEnum.REJECTED;