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/entity/JgChangeRegistrationTransfer.java

@@ -122,13 +122,19 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     /**
      * 创建人ID
      */
-    @TableField(value = "create_user_id", fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "create_user_id")
     private String createUserId;
 
     /**
+     * 创建人名称
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
      * 创建时间
      */
-	@TableField(value = "create_date", fill = FieldFill.INSERT_UPDATE)
+	@TableField(value = "create_date")
     private Date createDate;
 
     /**
@@ -198,8 +204,32 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     private String promoter;
 
     /**
+     * 使用登记证书附件
+     */
+    @TableField("use_registration_certificate")
+    private String useRegistrationCertificate;
+
+    /**
+     * 流程状态
+     */
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    /**
      *工作流下一节点任务id
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+    /**
+     * 创建单位名称
+     */
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+    /**
+     * 设备种类名称
+     */
+    @TableField(value = "equip_list_name")
+    private String equipListName;
 }

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +21,7 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
     void updatePromoter(@Param ("id")Long id);
 
     Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds);
+
+    @Select("select name from tz_equipment_category  where code=#{code}")
+    String getEquiplistNameByEquiplist(String code);
 }

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

@@ -55,7 +55,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
-	public ResponseModel<Boolean> save(@RequestParam(value = "submitType", required = false) String submitType,
+	public ResponseModel<Boolean> save(@RequestParam(value = "submitType") String submitType,
 									   @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){
@@ -78,7 +78,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
-	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType", required = false) String submitType,
+	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
 													 @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){

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

@@ -661,7 +661,7 @@ public class CommonServiceImpl implements ICommonService {
       // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
       //         .findFirst()
       //         .orElse(null);
-        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
+        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
                 .findFirst()
                 .orElse(null);
         if (model == null) {

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

@@ -270,8 +270,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             resultMap.putAll(equipInfoMap);
         }
         //设备参数
-        if (equIpClassMap.containsKey("EQU_LIST") && !ValidationUtil.isEmpty(equIpClassMap.get("EQU_LIST").toString())) {
-            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "CamelCase", equIpClassMap.get("EQU_LIST").toString());
+        if (equIpClassMap.containsKey("equList") && !ValidationUtil.isEmpty(equIpClassMap.get("equList").toString())) {
+            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "CamelCase", equIpClassMap.get("equList").toString());
             if (!ValidationUtil.isEmpty(equipParamsMap)) {
                 resultMap.putAll(equipParamsMap);
             }

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

@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.module.ymt.flc.api.feign.AccessFeignService;
 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.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.beans.BeanUtils;
@@ -297,7 +296,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                 jgChangeRegistrationName.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
                 jgChangeRegistrationName.setNextTaskId(nextTaskId);
-                executeOneStep(jgChangeRegistrationName, taskName, nextUserIds);
+                executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, op);
             }
             BeanUtils.copyProperties(jgChangeRegistrationNameDto, jgChangeRegistrationName);
 
@@ -310,9 +309,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         return jgChangeRegistrationNameDto;
     }
 
-    private void executeOneStep(JgChangeRegistrationName jgChangeRegistrationName, String taskName, String nextUserIds) {
+    private void executeOneStep(JgChangeRegistrationName jgChangeRegistrationName, String taskName, String nextUserIds, String operate) {
         // 先更新之前的待办
-        TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName);
+        TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
         // 再插入新代办、数据待定
         taskV2Model.setTaskName(taskName);
         taskV2Model.setExecuteUserIds(nextUserIds);
@@ -384,8 +383,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgChangeRegistrationName.setNextTaskId(nextTaskId);
         this.update(jgChangeRegistrationName, lambda);
         // 删除待办
-        commonService.deleteTaskModel(jgChangeRegistrationName.getInstanceId());
-        commonService.rollbackTask(jgChangeRegistrationName.getInstanceId());
+        commonService.rollbackTask(instanceId);
     }
 
 
@@ -449,25 +447,39 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationName.setPromoter(null);
             }
             // 更新上一步待办、创建待办
-            executeOneStep(jgChangeRegistrationName, taskName, nextUserIds);
+            executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, operate);
         } else {
             jgChangeRegistrationName.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationName.setAuditPassDate(new Date());
             // 修改业务信息
             updateInfoOther(jgChangeRegistrationName);
-            updateTaskModel(jgChangeRegistrationName);
+            // 更新代办
+            updateTaskModel(jgChangeRegistrationName, operate);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationName);
     }
 
-    private TaskV2Model updateTaskModel(JgChangeRegistrationName jgChangeRegistrationName) {
+    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("taskStatus",this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-        params.put("taskStatusLabel",jgChangeRegistrationName.getAuditStatus());
+        params.put("taskStatus", flowStatusEnum.getCode());
+        params.put("taskStatusLabel", flowStatusEnum.getName());
+        params.put("flowStatus",this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
+        params.put("flowStatusLabel",jgChangeRegistrationName.getAuditStatus());
         return commonService.updateTaskModel(params);
     }
 
+
+    private FlowStatusEnum getTaskStatus(String operate) {
+        if("0".equals(operate)){
+            return FlowStatusEnum.TO_BE_FINISHED;
+        } else {
+            return FlowStatusEnum.REJECTED;
+        }
+    }
+
+
     private Integer getTaskStatusByName(String auditStatus) {
         return commonService.getDictionaryCodeByName(auditStatus);
     }

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

@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -81,8 +82,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, int phase,
                                                       Map<String, Object> map, ReginParams reginParams) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
-
+        JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
+        if(map.containsKey("jgMaintenanceContractDto")){
+            dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
+        }
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
@@ -213,8 +216,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         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();
-//        JgMaintenanceContract contract = new JgMaintenanceContract();
-//        BeanUtils.copyProperties(contractDto, contract);
         contractDto.setCreateDate(new Date());
         contractDto.setPromoter(reginParams.getUserModel().getUserId());
         //获取维保备案编号
@@ -228,46 +229,61 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         contractDto.setUseUnitCode(company.getCompanyCode());
         contractDto.setUseUnitName(company.getCompanyName());
         //管理员信息
-        String[] MaintenanceManager = contractDto.getMaintenanceManagerId().split("_");
-        contractDto.setMaintenanceManagerId(MaintenanceManager[0]);
-        contractDto.setMaintenanceManagerName(MaintenanceManager[1]);
+        if (!StringUtils.isEmpty(contractDto.getMaintenanceManagerId())) {
+            String[] MaintenanceManager = contractDto.getMaintenanceManagerId().split("_");
+            contractDto.setMaintenanceManagerId(MaintenanceManager[0]);
+            contractDto.setMaintenanceManagerName(MaintenanceManager[1]);
+        }
         //接收机构信息
-        String[] splitReceiveOrgCode = contractDto.getReceiveOrgCode().split("_");
-        contractDto.setReceiveOrgCode(splitReceiveOrgCode[0]);
-        contractDto.setReceiveOrgName(splitReceiveOrgCode[1]);
+        if (!StringUtils.isEmpty(contractDto.getReceiveOrgCode())) {
+            String[] splitReceiveOrgCode = contractDto.getReceiveOrgCode().split("_");
+            contractDto.setReceiveOrgCode(splitReceiveOrgCode[0]);
+            contractDto.setReceiveOrgName(splitReceiveOrgCode[1]);
+        }
         //维保单位信息
-        String[] splitMaintenanceUnitCode = contractDto.getMaintenanceUnitCode().split("_");
-        contractDto.setMaintenanceUnitCode(splitMaintenanceUnitCode[0]);
-        contractDto.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
+        if (!StringUtils.isEmpty(contractDto.getMaintenanceUnitCode())) {
+            String[] splitMaintenanceUnitCode = contractDto.getMaintenanceUnitCode().split("_");
+            contractDto.setMaintenanceUnitCode(splitMaintenanceUnitCode[0]);
+            contractDto.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
+        }
         contractDto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
-        contractDto.setEquNum(equipmentLists.size());
-        JgMaintenanceContract contract = getById(contractDto.getSequenceNbr());
-        BeanUtils.copyProperties(contractDto, contract);
-        if (!"add".equals(String.valueOf(map.get("pageType")))) {
-            //编辑
+        JgMaintenanceContract contract = new JgMaintenanceContract();
+        boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());//没有id说明是新增
+        if (hasId) {
+            BeanUtils.copyProperties(contractDto, contract);
+            contract.setCreateUserId(reginParams.getUserModel().getUserId());
+            contract.setCreateUserName(reginParams.getUserModel().getRealName());
+            contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
+            this.save(contract);
+        } else {
+            //删除以前设备关联关系
             this.getBaseMapper().updateById(contract);
             LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
             lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
             jgMaintenanceContractEqService.getBaseMapper().delete(lambda);
         }
-        //关联设备信息
-        List<JgMaintenanceContractEq> equipList = new ArrayList<>();
-        equipmentLists.forEach(x -> {
-            JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
-            equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
-            equip.setEquipTransferId(contract.getSequenceNbr().toString());
-            equipList.add(equip);
-        });
-        // 保存维保关联设备信息
-        jgMaintenanceContractEqService.saveBatch(equipList);
+        // 更新关联设备信息
+        if (!CollectionUtils.isEmpty(equipmentLists)) {
+            contractDto.setEquNum(equipmentLists.size());
+            List<JgMaintenanceContractEq> equipList = new ArrayList<>();
+            equipmentLists.forEach(x -> {
+                JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
+                equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
+                equip.setEquipTransferId(contract.getSequenceNbr().toString());
+                equipList.add(equip);
+            });
+            // 保存关联设备信息
+            jgMaintenanceContractEqService.saveBatch(equipList);
+        }
+
         // 判断当前是否为提交
-        List<String> roleListNext = new ArrayList<>();
-        List<String> roleListAll = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
-            if (!StringUtils.isEmpty(contract.getInstanceId())) {
-                // 发起流程
+            List<String> roleListNext = new ArrayList<>();
+            List<String> roleListAll = new ArrayList<>();
+            //新增提交
+            if (StringUtils.isEmpty(contract.getInstanceId())) {
+                //没有InstanceId需要发起流程
                 try {
-                    List<ProcessTaskDTO> processTasks = new ArrayList<>();
                     ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                     List<ActWorkflowStartDTO> list = new ArrayList<>();
                     ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -276,7 +292,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     dto.setCompleteFirstTask(true);
                     list.add(dto);
                     actWorkflowBatchDTO.setProcess(list);
-                    processTasks = workflowService.startBatch(actWorkflowBatchDTO);
+                    List<ProcessTaskDTO> processTasks  = workflowService.startBatch(actWorkflowBatchDTO);
                     String instanceId = processTasks.get(0).getProcessInstance().getId();
                     String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
                     String taskName = processTasks.get(0).getNextTask().get(0).getName();
@@ -296,7 +312,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     throw new BadRequest("提交失败" + e.getMessage());
                 }
             } else {
-                // 执行一步
+                // 有InstanceId，执行一步
                 ProcessTaskDTO processTaskDTO = this.submit("0", contract.getNextTaskId());
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
@@ -315,12 +331,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextTaskId(nextTaskId);
                 executeOneStep(contract, taskName, nextUserIds);
             }
-            updateById(contract);
-        } else {
-            // 新增
-            contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
-            this.save(contract);
         }
+        updateById(contract);
         return true;
     }