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/resources/mapper/JgEnableDisableMapper.xml

@@ -64,6 +64,8 @@
                concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
                       use.STREET_NAME) as fullAddress,
                jri.EQU_CODE            as equCode,
+               jed.audit_status        as auditStatus,
+               jed.apply_no            as applyNo,
                jed.apply_type          as applyType,
                jed.remark,
                use.RECORD              as record,

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

@@ -131,8 +131,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             } else {
                 jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
             }
-            jgEnableDisable.setEquList(map.get("equListDesc").toString());
-            jgEnableDisable.setSupervisoryCode(map.get("supervisoryCode").toString());
+            jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
+            jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
             jgEnableDisable.setPromoter(RequestContext.getExeUserId());
             jgEnableDisable.setNextExecutorIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
@@ -192,11 +192,13 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, String.valueOf(map.get("sequenceNbr")));
             jgEnableDisableEqService.getBaseMapper().delete(lambda);
         }
+        if(!"null".equals(record)){
             // 关联设备表
             JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
             jgEnableDisableEq.setEquId(record);
             jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
             jgEnableDisableEqService.save(jgEnableDisableEq);
+        }
 
     }
 

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

@@ -161,13 +161,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @return 代办信息
      */
     private TaskModelDto buildTaskModelDto(JgEquipTransfer item, WorkflowResultDto workflowResultDto) {
+        item.setInstanceId(workflowResultDto.getInstanceId());
         return TaskModelDto.builder()
                 .flowCreateDate(item.getCreateDate())
                 .taskName(workflowResultDto.getNextTaskName())
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
                 .taskTypeLabel(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
-                .relationId(item.getInstanceId())
+                .relationId(workflowResultDto.getInstanceId())
                 .executeUserIds(workflowResultDto.getNextExecutorUserIds())
                 .taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
@@ -192,6 +193,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @param taskV2Model       代办信息
      */
     private void createNewTodo(JgEquipTransfer transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) {
+        transfer.setInstanceId(workflowResultDto.getInstanceId());
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         TaskModelDto taskModelDto = TaskModelDto.builder()
                 .flowCreateDate(taskV2Model.getFlowCreateDate())

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

@@ -252,6 +252,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                notice.setInstanceId(workflowResultDto.getInstanceId());
                 this.updateById(notice);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);

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

@@ -43,6 +43,7 @@ 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.text.ParseException;
@@ -402,8 +403,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            log.error(" 获取告知设备列表");
-            throw new RuntimeException();
+            throw new BadRequest("请选择设备");
         }
         // 获取告知单号
         ResponseModel<List<String>> applyNoResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());

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;
@@ -267,12 +266,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 +294,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);
     }
 
@@ -399,6 +397,7 @@ 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);
@@ -426,9 +425,9 @@ 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();

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

@@ -283,6 +283,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                notice.setInstanceId(workflowResultDto.getInstanceId());
                 jgTransferNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);