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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -9,6 +12,9 @@ import java.util.Date;
  * @author Administrator
  */
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TaskModelDto {
         /**
          * 工作流创建时间

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

@@ -221,6 +221,15 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
-
+    /**
+     * 创建人
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+    /**
+     *
+     */
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
 
 }

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

@@ -150,4 +150,7 @@ public class JgEquipTransfer extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
 }

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

@@ -214,6 +214,12 @@ public class JgMaintenanceContract extends BaseEntity {
     private String createUserId;
 
     /**
+     * 创建人名称
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
      * 创建时间
      */
 	@TableField("create_date")

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

@@ -298,11 +298,11 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "handle_date")
     private Date handleDate;
 
-    @TableField(value = "create_user_company_name")
+    @TableField(value = "\"create_user_company_name\"")
     private String createUserCompanyName;
 
     //下一步任务ID
-    @TableField(value = "next_taskId")
+    @TableField(value = "\"next_taskId\"")
     private String nextTaskId;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java

@@ -25,7 +25,7 @@ public enum WorkFlowStatusEnum {
 
 
     /**
-     * 维保流程
+     * 维保备案
      */
     MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位已撤回"),
     MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位已撤回"),

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

@@ -56,51 +56,6 @@ public class JgMaintenanceContractController extends BaseController {
         return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.saveOrSubmit(submit,model, reginParams));
     }
 
-    /**
-     * 更新维保合同和设备对应关系
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/updateMaintenanceAndEquipment")
-    @ApiOperation(httpMethod = "POST", value = "更新维保合同和设备对应关系", notes = "更新维保合同和设备对应关系")
-    public ResponseModel<Object> updateMaintenanceAndEquipment(@RequestBody Map<String , Object> model,
-                                                               @RequestParam(value = "submit",required = false,defaultValue = "0") String submit) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model), JgMaintenanceContractDto.class);
-        List<Map<String, Object>> list = (List<Map<String, Object>>) model.get("equipmentLists");
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateMaintenanceAndEquipment(submit,dto,list));
-    }
-
-    /**
-     * 提交
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/submit")
-    @ApiOperation(httpMethod = "POST", value = "维保合同提交", notes = "维保合同提交")
-    public ResponseModel<Object> submit(@RequestBody Map<String , Object> model) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model), JgMaintenanceContractDto.class);
-        String comment = String.valueOf(model.get("comment"));
-        String operate = String.valueOf(model.get("operate"));
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.submit(dto,comment,operate));
-    }
-
-    /**
-     * 审批
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/approval")
-    @ApiOperation(httpMethod = "POST", value = "审批", notes = "审批")
-    public ResponseModel<Object> approval(@RequestBody Map<String , Object> model) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model.get("formData")), JgMaintenanceContractDto.class);
-        String comment = String.valueOf(model.get("comment"));
-        String operate = String.valueOf(model.get("operate"));
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.approval(dto,comment,operate));
-    }
-
 
     /**
      * 撤回
@@ -216,8 +171,7 @@ public class JgMaintenanceContractController extends BaseController {
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
                                                                       @RequestParam(value = "size") int size,
                                                                       @RequestParam(value = "phase") int phase,
-                                                                      Map<String,Object> map,
-                                                                      JgMaintenanceContractDto maintenanceContractDto) {
+                                                                      Map<String,Object> map) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(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/CommonServiceImpl.java

@@ -631,7 +631,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             model.setFlowStatus(obj.getTaskStatus());
             model.setFlowCode(obj.getTaskStatusLabel());
-            model.setTaskType("0");
+            model.setTaskStatus(0);
             model.setFlowInstanceId(model.getRelationId());
             model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
             model.setTaskSource("workFlow");

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

@@ -224,6 +224,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get("EQU_LIST").toString());
 
             if (!ValidationUtil.isEmpty(equipParamsMap)) {
+                // 给技术参数中添加设备种类，标记技术参数属于那个设备
+                equipParamsMap.put("EQU_LIST",equIpClassMap.get("EQU_LIST").toString());
+                equipParamsMap.put("EQU_CATEGORY",equIpClassMap.get("EQU_CATEGORY").toString());
+                equipParamsMap.put("EQU_DEFINE",equIpClassMap.get("EQU_DEFINE").toString());
                 resultMap.put(EQUIP_PARAMS_FORM_ID, 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/JgTransferNoticeServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -365,7 +366,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public void saveNotice(String submitType, Map<String, Object> jgTransferNoticeDtoMap, ReginParams reginParams) {
-        JgTransferNoticeDto model = JSON.parseObject(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID).toString(), JgTransferNoticeDto.class);
+        JgTransferNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID)), JgTransferNoticeDto.class);
         // 字段转换
         convertField(model);
         // 获取告知设备列表
@@ -379,8 +380,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return;
         }
 
-        // 判断当前是否为提交
-        List<String> instanceIdList = new ArrayList<>();
+
         // 启动工作流并返回信息
         List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList);
 
@@ -406,12 +406,14 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
-            if (!CollectionUtils.isEmpty(instanceIdList)) {
-                dto.setInstanceId(instanceIdList.get(i));
+            if (!CollectionUtils.isEmpty(workflowResultList)) {
+                dto.setInstanceId(workflowResultList.get(i).getInstanceId());
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            dto.setCreateUserName(reginParams.getUserModel().getRealName());
+            dto.setCreateUserId(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -443,12 +445,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setFlowCreateDate(item.getCreateDate());
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName()); // 工作流API返回
             taskModelDto.setTaskCode(item.getApplyNo());
-            taskModelDto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
-            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
+            taskModelDto.setTaskType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
+            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName());
             taskModelDto.setRelationId(item.getInstanceId());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
-            taskModelDto.setTaskStatus(commonService.getDictionaryCodeByName(item.getNoticeStatus())); // 流程状态枚举
-            taskModelDto.setTaskStatusLabel(item.getNoticeStatus());
+            taskModelDto.setTaskStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
+            taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setStartUserId(item.getCreateUserId());
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
@@ -472,7 +474,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 list.add(dto);
             });
             actWorkflowBatchDTO.setProcess(list);
+            System.out.println("============== " + DateUtil.now());
             List<ProcessTaskDTO> processTaskDTOS = iCmWorkflowService.startBatch(actWorkflowBatchDTO);
+            System.out.println("============== " + DateUtil.now());
             // 组装工作流返回的数据
             return commonService.buildWorkFlowInfo(processTaskDTOS);
         }
@@ -565,7 +569,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgTransferNoticeMapper.updateById(jgInstallationNotice);
-        commonService.deleteTaskModel(jgInstallationNotice.getInstanceId());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId());
     }
 
@@ -598,6 +601,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             commMap.put("approvalStatus", op);
         }
         workDto.setVariable(commMap);
+        workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -623,8 +627,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
-                taskMap.put("taskStatus", commonService.getDictionaryCodeByName(jgTransferNotice.getNoticeStatus()));
-                taskMap.put("taskStatusLabel", jgTransferNotice.getNoticeStatus());
+                taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
@@ -637,8 +641,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
-                taskMap.put("taskStatus", commonService.getDictionaryCodeByName(jgTransferNotice.getNoticeStatus()));
-                taskMap.put("taskStatusLabel", jgTransferNotice.getNoticeStatus());
+                taskMap.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskV2Model = commonService.updateTaskModel(taskMap);
                 TaskModelDto taskModelDto = new TaskModelDto();
@@ -657,8 +661,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             // 上个代办改为已办
             HashMap<String, Object> taskMap = new HashMap<>();
-            taskMap.put("taskStatus", commonService.getDictionaryCodeByName(jgTransferNotice.getNoticeStatus()));
-            taskMap.put("taskStatusLabel", jgTransferNotice.getNoticeStatus());
+            taskMap.put("taskStatus", jgTransferNotice.getNoticeStatus());
+            taskMap.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
             taskMap.put("relationId", jgTransferNotice.getInstanceId());
             taskV2Model = commonService.updateTaskModel(taskMap);
             TaskModelDto taskModelDto = new TaskModelDto();

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

@@ -51,7 +51,7 @@
     "type": "105",
     "pageType": "look",
     "name": "移装告知",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=detail&userId={userId}&roleIds={roleIds}"
   },
   {
     "type": "105",
@@ -75,25 +75,25 @@
     "type": "107",
     "pageType": "look",
     "name": "使用登记",
-    "url": "url:/mixuap?appId=1742358052905971713&id=1735202405437435906&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "107",
     "pageType": "edit",
     "name": "使用登记",
-    "url": "url:/mixuap?appId=1742358052905971713&id=1735202405437435906&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "108",
   "pageType": "look",
   "name": "更名变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&pageType=look"
+  "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "108",
     "pageType": "edit",
     "name": "更名变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "109",
@@ -123,13 +123,13 @@
     "type": "111",
     "name": "改造变更登记",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=look&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&nextExecuteIds={userId}&pageType=look"
   },
   {
     "type": "111",
     "pageType": "edit",
     "name": "改造变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&nextExecuteIds={userId}&pageType=edit"
   },
   {
     "type": "112",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/UseInfo.java

@@ -186,12 +186,12 @@ public class UseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"IS_NOT_ES\"")
     private Integer isNotEs;
 
-    @TableField(value = "NEXT_INSPECT_DATE")
+    @TableField(value = "\"NEXT_INSPECT_DATE\"")
     private Date nextInspectDate;
 
-    @TableField(value = "LAST_INSPECT_REPORT_NO")
+    @TableField(value = "\"LAST_INSPECT_REPORT_NO\"")
     private String lastInspectReportNo;
 
-    @TableField(value = "LAST_INSPECT_TYPE")
+    @TableField(value = "\"LAST_INSPECT_TYPE\"")
     private String lastInspectType;
 }