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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -142,4 +142,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "监管码")
     private  String supervisoryCode;
 
+  @ApiModelProperty(value = "分类")
+  private  String equList;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -217,6 +217,9 @@ public class JgChangeRegistrationUnit extends BaseEntity {
 
     @TableField(exist = false)
     private String supervisoryCode;
+
+    @TableField(exist = false)
+    private String equList;
     /**
      *工作流下一节点任务id
      */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -25,6 +25,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getUseDetail(@Param("id")String id);
 
+    Map<String, Object> getDesDetail(@Param("id")String id);
+
     Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
 
     void updatePromoter(@Param("id")Long id);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -147,5 +147,19 @@
             </if>
         </where>
     </select>
+    <select id="getDesDetail" resultType="java.util.Map">
+        select DESIGN_UNIT_CREDIT_CODE as designUnitCreditCode,
+               DESIGN_UNIT_NAME        as designUnitName,
+               DESIGN_LICENSE_NUM      as designLicenseNum,
+               DESIGN_USE_DATE         as designUseDate,
+               DESIGN_DATE             as designDate,
+               DRAWING_DO              as drawingDo,
+               APPRAISAL_UNIT          as appraisalUnit,
+               APPRAISAL_DATE          as appraisalDate,
+               DESIGN_DOC              as designDoc,
+               DESIGN_STANDARD         as designStandard
+        from idx_biz_jg_design_info
+        where RECORD = #{id}
+    </select>
 
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/LocalBadRequest.java

+package com.yeejoin.amos.boot.module.jg.biz.config;
+
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+
+public class LocalBadRequest extends BaseException {
+
+    public LocalBadRequest(String message)
+    {
+        super(message, com.yeejoin.amos.component.robot.BadRequest.class.getSimpleName(),message);
+        this.httpStatus = 500;
+    }
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -38,7 +38,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
         jgUseRegistrationServiceImpl.save(map);
         return ResponseHelper.buildResponse("ok");
@@ -72,7 +72,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/deleteMessage")
-    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    @ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
     public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
         ArrayList<Long> ids = new ArrayList<>();
         ids.add(id);

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

@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -10,6 +12,7 @@ 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 org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.List;
 
@@ -25,7 +28,13 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
         List<ProcessTaskDTO> processTasks;
         try {
             log.info("开始请求工作流启动接口:/start/batch,请求参数：{}", JSONObject.toJSONString(params));
-            processTasks = FeignUtil.remoteCall(() -> Workflow.taskV2Client.startForBatch(params));
+            processTasks = Workflow.taskV2Client.startForBatch(params).getResult();
+        } catch (InnerInvokException e) {
+            //拦截无审核人异常信息
+            String devMessage = e.getDevMessage();
+            devMessage = devMessage.contains(";") ? devMessage.split(";")[0] : devMessage;
+            log.error(devMessage);
+            throw new LocalBadRequest(devMessage);
         } catch (Exception e) {
             log.error("调用工作流批量启动失败", e);
             throw new RuntimeException("调用工作流批量启动失败");
@@ -38,7 +47,13 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
         ProcessTaskDTO processTaskDTO;
         try {
             log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
-            processTaskDTO = FeignUtil.remoteCall(() -> Workflow.taskV2Client.completeByTaskFroStandard(taskId, data));
+            processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+        } catch (InnerInvokException e) {
+            //拦截无审核人异常信息
+            String devMessage = e.getDevMessage();
+            devMessage = devMessage.contains(";") ? devMessage.split(";")[0] : devMessage;
+            log.error(devMessage);
+            throw new LocalBadRequest(devMessage);
         } catch (Exception e) {
             log.error("调用工作流完成任务接口失败", e);
             throw new RuntimeException("调用工作流完成任务接口失败");

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

@@ -688,7 +688,7 @@ public class CommonServiceImpl implements ICommonService {
                 model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
                 model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName());
                 model.setStartUserId(RequestContext.getExeUserId());
-                model.setStartUser(reginParams.getUserModel().getUserName());
+                model.setStartUser(reginParams.getUserModel().getRealName());
                 model.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
                 model.setStartDate(new Date());
                 model.setExecuteUserIds(RequestContext.getExeUserId());

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

@@ -353,7 +353,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         WorkflowResultDto workflowResult = new WorkflowResultDto();
         JgChangeRegistrationTransfer transfer = this.getById(id);
-        try {
+
         String taskId = transfer.getNextTaskId();
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
@@ -373,9 +373,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
         // 更新下一步执行人
         this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+
     }
 
     /**
@@ -696,6 +694,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     taskModelDto.setRelationId(instanceId);
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgChangeRegistrationTransfer, taskMessageDto);
+                    taskModelDto.setPageType(this.getPageTypeByCurrentNode(jgChangeRegistrationTransfer.getAuditStatus()));
                     taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
@@ -1032,7 +1031,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * 启动工作流
      */
     private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) {
-        try {
         ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
         List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
         ActWorkflowStartDTO workflow = new ActWorkflowStartDTO();
@@ -1046,10 +1044,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
         // 组装工作流返回的数据
         return commonService.buildWorkFlowInfo(processTasks).get(0);
-        } catch (Exception e) {
-            log.error("提交失败：{}", e);
-            throw new BadRequest("提交失败" + e.getMessage());
-        }
     }
 
     /**

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -504,7 +505,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
             dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setUnitChangeRegistrationId(applyNo);
             if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
@@ -542,7 +543,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setFlowCreateDate(new Date());
                 dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
                 dto.setFlowCode(obj.getNextTaskId());
-                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 dto.setTaskCode(obj.getApplyNo());
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
                 dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
@@ -564,7 +565,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 //行数据
                 dto.setModel(obj);
                 //摘要 按原有规则组装
-                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 //申请单号
                 dto.setTaskCode(obj.getApplyNo());
                 //业务类型枚举code值
@@ -762,9 +763,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
         task.setComment("");
-        task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,dto));
+        task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,jgChangeRegistrationUnit));
 
-        task.setNextExecuteUserCompanyCode(dto.getReceiveOrgCode());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         if (!ObjectUtils.isEmpty(jgChangeRegistrationUnit.getInstanceStatus()) &&
@@ -984,7 +984,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
 
     private String buildTaskContent(JgChangeRegistrationUnit obj) {
-        return "来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
+        return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
     }
 
 
@@ -1120,14 +1120,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    private String getNextUserOrgCode(String operate, JgChangeRegistrationUnitDto jgChangeRegistrationName) {
+    private String getNextUserOrgCode(String operate, JgChangeRegistrationUnit jgChangeRegistrationName) {
         if("0".equals(operate)){
             // 执行通过节点，单位code为接收机构单位信息
             return jgChangeRegistrationName.getReceiveOrgCode();
         }
-        if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass())
-                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())
-                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack())){
+        if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass())
+                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getReject())
+                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getRollBack())){
             // 驳回且当前节点为一键节点时，单位code为发起人单位信息
             return jgChangeRegistrationName.getUseUnitCreditCode();
         }

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

@@ -214,6 +214,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      * @param noticeDto 安装告知
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
+    @Transactional
     public JgInstallationNoticeDto updateInstallationNotice(String submitType, JgInstallationNoticeDto noticeDto, String op) {
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
@@ -729,6 +730,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
 
+    @Transactional
     public void cancel(JgInstallationNoticeDto noticeDto) {
         JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());
@@ -742,6 +744,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
         jsonObject.put("taskType", BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
+        jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+        jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 

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

@@ -548,12 +548,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             });
 
             actWorkflowBatchDTO.setProcess(list);
-            try {
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             return commonService.buildWorkFlowInfo(processTaskDTOS);
-            } catch (Exception e) {
-                log.error("提交失败：{}", e);
-            }
         }
         return new ArrayList<>();
     }

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

@@ -17,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 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.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -43,7 +42,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
@@ -162,7 +160,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update) {
-        try {
         JgMaintenanceContract contract = this.getBaseMapper().selectById(id);
         String taskId = contract.getNextTaskId();
         //组装信息
@@ -182,9 +179,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         ProcessTaskDTO complete = workflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, complete);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     public String getNextUserOrgCode(String operate, JgMaintenanceContract contract) {
@@ -267,12 +261,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     @Transactional
     public void revocation(String instanceId) {
-        JgMaintenanceContract contract = new JgMaintenanceContract();
         LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
         lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
-        contract = this.getOne(lambda);
+        JgMaintenanceContract contract = this.getOne(lambda);
         ProcessTaskDTO processTaskDTO = workflowService.rollBack(instanceId);
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -296,7 +289,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(contract.getStatus()));
         jsonObject.put("flowStatusLabel", contract.getStatus());
-        jsonObject.put("changeCertificate", null);
+        jsonObject.put("maintenanceContract", null);//不传合同照片附件信息
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -304,7 +297,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      * 新增维保合同
      */
     @Transactional(rollbackFor = Exception.class)
-    public Boolean saveOrSubmit(String submit, Map<String, Object> map, ReginParams reginParams) {
+    public List<JgMaintenanceContract> saveOrSubmit(String submit, Map<String, Object> map, ReginParams reginParams) {
         JgMaintenanceContractDto contractDto = JSON.parseObject(JSON.toJSONString(map), JgMaintenanceContractDto.class);
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
         CompanyBo company = reginParams.getCompany();
@@ -314,7 +307,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1);
         if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
             log.error("告知单获取失败");
-            return false;
+            return null;
         }
         String wbApplyNo = listResponseModel.getResult().get(0);
         contractDto.setApplyNo(wbApplyNo);
@@ -375,7 +368,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             //新增提交
             if (StringUtils.isEmpty(contract.getInstanceId())) {
                 //没有InstanceId需要发起流程
-                try {
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -399,14 +391,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextTaskId(nextTaskId);
                 contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setNextExecuteUserIds(nextUserIds);
+                commonService.deleteTaskModel(contract.getSequenceNbr() + "");
                 // 创建待办
                 JgMaintenanceContract bean = new JgMaintenanceContract();
                 BeanUtil.copyProperties(contract, bean);
                 createTaskModel(bean, taskName, "1", nextUserIds);
-                } catch (Exception e) {
-                    log.error("提交失败：{}", e);
-                    throw new BadRequest("提交失败" + e.getMessage());
-                }
             } else {
                 // 有InstanceId，执行一步
                 ProcessTaskDTO processTaskDTO = this.submit("0", contract);
@@ -426,22 +415,22 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setNextTaskId(nextTaskId);
                 contract.setNextExecuteUserIds(nextUserIds);
+                commonService.deleteTaskModel(contract.getSequenceNbr() + "");
                 executeOneStep(contract, taskName, nextUserIds, "0");
             }
-            commonService.deleteTaskModel(contract.getSequenceNbr()+"");
         } else {
             List<TaskModelDto> modelDtos = new ArrayList<>();
             TaskModelDto dto = new TaskModelDto();
             dto.setModel(contract);
             dto.setTaskContent(buildTaskContent(contract));
             dto.setTaskCode(contract.getApplyNo());
-            dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+            dto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
             dto.setRelationId(contract.getSequenceNbr() + "");
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
         updateById(contract);
-        return true;
+        return Collections.singletonList(contract);
     }
 
     public ProcessTaskDTO submit(String op, JgMaintenanceContract contract) {

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

@@ -50,7 +50,6 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
@@ -202,7 +201,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
-            try {
             processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
             instanceId = processTaskDTOS.get(0).getProcessInstance().getId();
@@ -211,10 +209,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             workflowResultDtos = commonService.buildWorkFlowInfo(processTaskDTOS);
             nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
             this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
-            } catch (Exception e) {
-                log.error("提交失败：{}", e);
-                throw new BadRequest("提交失败" + e.getMessage());
-            }
         }
 
         List<JgScrapCancel> list = new ArrayList<>();
@@ -329,11 +323,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     public void deleteBatch(List<Long> ids) {
-        JgScrapCancel jgScrapCancel = new JgScrapCancel();
-        jgScrapCancel.setIsDelete(true);
+        if (!ids.isEmpty()) {
+            for (Long id : ids) {
                 LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
-        lambda.in(JgScrapCancel::getSequenceNbr, ids);
-        this.update(jgScrapCancel, lambda);
+                lambda.eq(JgScrapCancel::getSequenceNbr, id);
+                JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
+                //删除代办消息
+                commonService.deleteTaskModel(jgScrapCancel.getInstanceId());
+                //更新jgScrapCancel数据
+                jgScrapCancel.setIsDelete(true);
+                this.updateById(jgScrapCancel);
+            }
+        }
     }
 
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
@@ -349,7 +350,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
                 //未进流程直接发起并执行
-                try {
+
                 List<ProcessTaskDTO> processTasks;
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -378,10 +379,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 BeanUtil.copyProperties(jgScrapCancelDto, bean);
                 commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
                 createTaskModel(bean, taskName, "1", nextUserIds);
-                } catch (Exception e) {
-                    log.error("提交失败：{}", e);
-                    throw new BadRequest("提交失败" + e.getMessage());
-                }
             } else {
                 // 已经在流程中，执行一步
                 ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId());
@@ -595,7 +592,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
-        try {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
         //组装信息
@@ -615,9 +611,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, processTaskDTO);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -125,11 +126,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         for (String s : fields) {
             if (transferNotice.containsKey(s)) {
                 if ("powerOfAttorney".equalsIgnoreCase(s)) {
-                    transferNotice.put("powerOfAttorneyList", JSON.parseArray(transferNotice.get(s).toString()));
+                    transferNotice.put("powerOfAttorneyList", ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
                 } else if ("constructionContract".equalsIgnoreCase(s)) {
-                    transferNotice.put("constructionContractList", JSON.parseArray(transferNotice.get(s).toString()));
+                    transferNotice.put("constructionContractList", ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
                 } else {
-                    transferNotice.put(s, JSON.parseArray(transferNotice.get(s).toString()));
+                    transferNotice.put(s, ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
                 }
             }
             if (equipmentInfos.get(0).containsKey(s)) {
@@ -243,6 +244,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @param noticeDto 移装告知
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
+    @Transactional
     public JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
@@ -623,6 +625,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
 
+    @Transactional
     public void cancel(JgTransferNoticeDto noticeDto) {
         JgTransferNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());
@@ -636,6 +639,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
         jsonObject.put("taskType", BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
+        jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+        jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 

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

@@ -462,6 +462,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
         jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
+        jsonObject.put("flowStatus",  commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
+        jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
         if (!WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)) {
             jsonObject.put("pageType", "look");
         }
@@ -488,22 +490,30 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
             jsonObject.put("status", jgUseRegistration.getStatus());
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
+            jsonObject.remove("submit");
+            jsonObject.remove("instanceId");
             return jsonObject;
         }
         Map<String, Object> detail = this.baseMapper.getDetail(id);
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
+        Map<String, Object> useDestail = this.baseMapper.getDesDetail(id);
         if (!ObjectUtils.isEmpty(inspectDetail)) {
             detail.putAll(inspectDetail);
         }
         if (!ObjectUtils.isEmpty(useDetail)) {
             detail.putAll(useDetail);
         }
+        if (!ObjectUtils.isEmpty(useDestail)) {
+            detail.putAll(useDestail);
+        }
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
         detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
         return detail;
     }
 

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

@@ -135,19 +135,19 @@
     "type": "109",
     "pageType": "draft",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit&isEdit=true"
   },
   {
     "type": "109",
     "pageType": "look",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look&isEdit=false"
   },
   {
     "type": "109",
     "pageType": "edit",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit&isEdit=true"
   },
   {
     "type": "110",
@@ -171,7 +171,7 @@
     "type": "111",
     "name": "改造变更登记",
     "pageType": "draft",
-    "url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "111",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquipmentClassifityEnum.java

@@ -39,4 +39,14 @@ public enum EquipmentClassifityEnum {
         }
 
     }
+
+
+    public static String getNameByCode(String code){
+        for (EquipmentClassifityEnum value : EquipmentClassifityEnum.values()) {
+            if (value.getCode().equals(code)){
+                return value.getName();
+            }
+        }
+        return "";
+    }
 }