维保备案bug修改

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

@@ -633,7 +633,8 @@ public class CommonServiceImpl implements ICommonService {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
-                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&obj.getTaskType().equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && !obj.getFlowStatus().equals("16723") && map.get("pageType").equals("edit")) {
+                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&obj.getTaskType().equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&
+                        !obj.getFlowStatus().toString().equals("16723") && map.get("pageType").equals("edit")) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }else if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {

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

@@ -240,6 +240,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         jsonObject.put("nextTaskId", contract.getNextTaskId());
         jsonObject.put("nextExecuteUser", contract.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
+        jsonObject.put("flowStatus", this.getTaskCodeByName(contract.getStatus()));
+        jsonObject.put("flowStatusLabel", contract.getStatus());
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -285,9 +287,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         JgMaintenanceContract contract = new JgMaintenanceContract();
         boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());//没有id说明是新增
         BeanUtils.copyProperties(contractDto, contract);
+        contract.setCreateUserId(reginParams.getUserModel().getUserId());
+        contract.setCreateUserName(reginParams.getUserModel().getRealName());
         if (hasId) {
-            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 {
@@ -338,6 +340,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     contract.setInstanceId(instanceId);
                     contract.setNextExecuteIds(String.join(",", roleListNext));
                     contract.setNextTaskId(nextTaskId);
+                    contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                     contract.setNextExecuteUserIds(nextUserIds);
                     // 创建待办
                     JgMaintenanceContract bean = new JgMaintenanceContract();
@@ -437,7 +440,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contract.setNextExecuteUserIds("");
             contract.setApplyDate(new Date());
             contract.setStatus(taskCode);
-            updateTaskModel(contract, operate);
+            updateTaskModel(contract, "0");
         }
         this.getBaseMapper().updateById(contract);
     }
@@ -450,6 +453,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         params.put("taskStatusLabel", flowStatusEnum.getName());
         params.put("flowStatus", this.getTaskStatusByName(contract.getStatus()));
         params.put("flowStatusLabel", contract.getStatus());
+        params.put("model", contract);
         return commonService.updateTaskModelNew(params);
     }
 

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

@@ -55,15 +55,15 @@
   },
   {
     "type": "106",
-    "pageType": "look",
+    "pageType": "edit",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "106",
-    "pageType": "edit",
+    "pageType": "look",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "107",