Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+import com.yeejoin.amos.feign.workflow.model.*;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public interface ICmWorkflowService {
+    List<ProcessTaskDTO> startBatch(ActWorkflowBatchDTO params);
+
+    ProcessTaskDTO complete(String taskId, TaskResultDTO data);
+
+    ProcessTaskDTO rollBack(String processInstanceId);
+}

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/CmWorkflowServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+@Slf4j
+public class CmWorkflowServiceImpl implements ICmWorkflowService {
+
+    @Override
+    public List<ProcessTaskDTO> startBatch(ActWorkflowBatchDTO params) {
+        List<ProcessTaskDTO> processTasks;
+        try {
+            log.info("开始前请求工作流启动接口:/start/batch,请求参数：{}", JSONObject.toJSONString(params));
+            processTasks = FeignUtil.remoteCall(() -> Workflow.taskV2Client.startForBatch(params));
+        } catch (Exception e) {
+            log.error("调用工作流批量启动失败", e);
+            throw new RuntimeException("调用工作流批量启动失败");
+        }
+        return processTasks;
+    }
+
+    @Override
+    public ProcessTaskDTO complete(String taskId, TaskResultDTO data) {
+        ProcessTaskDTO processTaskDTO;
+        try {
+            log.info("开始前请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+            processTaskDTO = FeignUtil.remoteCall(() -> Workflow.taskV2Client.completeByTaskFroStandard(taskId, data));
+        } catch (Exception e) {
+            log.error("调用工作流完成任务接口失败", e);
+            throw new RuntimeException("调用工作流完成任务接口失败");
+        }
+        return processTaskDTO;
+    }
+
+    @Override
+    public ProcessTaskDTO rollBack(String processInstanceId) {
+        log.info("开始前请求工作流撤回接口:/rollBack/standard/{processInstanceId},请求参数：{}", processInstanceId);
+        return FeignUtil.remoteCall(() -> Workflow.taskV2Client.rollBackTask(processInstanceId));
+    }
+}

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

@@ -14,7 +14,9 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationNameService;
@@ -103,6 +105,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     @Autowired
     AccessFeignService accessFeignService;
 
+    @Autowired
+    CommonServiceImpl commonService;
+
 
 
 
@@ -211,7 +216,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         dto.setUseUnitName(reginParams.getCompany().getCompanyName());
         this.save(dto);
-
+        // 创建代办
+        this.createTaskModel(dto, taskName[0], submitType);
         List<JgChangeRegistrationNameEq> equipList = new ArrayList<>();
         List<JgRegistrationHistory> list = new ArrayList<>();
         deviceList.forEach(obj -> {
@@ -223,7 +229,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgRelationEquip.setCreateUserId(reginParams.getUserModel().getUserId());
             jgRelationEquip.setCreateUserName(reginParams.getUserModel().getRealName());
             equipList.add(jgRelationEquip);
-
             JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
             jgRegistrationHistory.setCreateUserId(reginParams.getUserModel().getUserId());
             jgRegistrationHistory.setCreateDate(dto.getCreateDate());
@@ -237,10 +242,46 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgRegistrationHistory.setCurrentDocumentId(dto.getApplyNo());
             list.add(jgRegistrationHistory);
         });
-        jgChangeRegistrationNameEqService.saveBatch(equipList);
         jgRegistrationHistoryService.saveBatch(list);
     }
 
+    private void createTaskModel(JgChangeRegistrationName dto, String taskName, String submitType) {
+        if("1".equals(submitType)){
+            TaskModelDto taskModelDto = new TaskModelDto();
+            taskModelDto.setFlowCreateDate(dto.getApplyDate());
+            taskModelDto.setTaskName(taskName);
+            taskModelDto.setTaskCode(dto.getApplyNo());
+            taskModelDto.setTaskContent(this.buildTaskContent(dto));
+            taskModelDto.setTaskDesc("");
+            taskModelDto.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
+            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+            taskModelDto.setRelationId(dto.getInstanceId());
+            taskModelDto.setExecuteUserIds(dto.getNextExecutorIds());
+            taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus()));
+            taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
+            taskModelDto.setStartUserId(dto.getCreateUserId());
+            taskModelDto.setStartUser(dto.getCreateUserName());
+            taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
+            taskModelDto.setStartDate(dto.getCreateDate());
+            taskModelDto.setModel(dto);
+            commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+        }
+    }
+
+    private Integer getTaskCodeByName(String auditStatus) {
+        return null;
+    }
+
+    /**
+     * 摘要构建
+     * @param dto 业务
+     * @return  摘要
+     */
+    private String buildTaskContent(JgChangeRegistrationName dto) {
+        return "申请单号：" + dto.getApplyNo() + "的业务办理";
+    }
+
+
     public JgChangeRegistrationNameDto updateInfo(String submitType, JgChangeRegistrationNameDto jgChangeRegistrationNameDto, String op) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (Objects.isNull(jgChangeRegistrationNameDto) || StringUtils.isEmpty(submitType)) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -135,12 +135,12 @@
     "type": "113",
     "pageType": "look",
     "name": "设备注销",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
   },
   {
     "type": "113",
     "pageType": "edit",
     "name": "设备注销",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
   }
 ]
\ No newline at end of file

amos-boot-system-tzs/pom.xml

@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-workflow</artifactId>
-            <version>1.10.3</version>
+            <version>1.10.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>