修改暂存

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

@@ -139,4 +139,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "下一步执行人userids")
   private String nextExecuteUserIds;
 
+  @ApiModelProperty(value = "监管码")
+    private  String supervisoryCode;
+
 }

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

@@ -100,13 +100,15 @@
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
             ei.legal_person AS safetyManager,
             ei.legal_phone AS safetyManagerPhone,
-            ei.address AS address
+            ei.address AS address,
+            oi.SUPERVISORY_CODE AS supervisoryCode
         FROM
             tzs_jg_change_registration_unit isn
                 LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_other_info oi ON oi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code

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

@@ -659,6 +659,7 @@ public class CommonServiceImpl implements ICommonService {
                 if (flag && map.get("type").equals(obj.getTaskType())
                         && map.get("pageType").equals("draft")){
                     model.setRoutePath(map.get("url").toString()+ urlParams );
+                    break;
                 }
                 //维保需特殊获取页面  状态不等于监管单位审核的页面均取对应编辑页面
                 else if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode())
@@ -689,7 +690,7 @@ public class CommonServiceImpl implements ICommonService {
                 model.setTaskTitle("有一条待提交的草稿");
                 model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
                 model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
-                model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
+           //     model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
             }else {
                 model.setTaskStatus(0);
                 model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());

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

@@ -242,7 +242,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
                 JgChangeRegistrationUnit noticeOld = JgChangeRegistrationUnitMapper.selectById(noticeDto.getSequenceNbr());
                 BeanUtils.copyProperties(noticeOld, notice);
-                boolean submit = submit(notice, op);
+       //         boolean submit = submit(notice, op);
                 notice.setChangeCertificate(noticeDto.getChangeCertificate());
                 notice.setRemark(noticeDto.getRemark());
               //  notice.setStatus(taskName[0]);
@@ -251,9 +251,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 } else {
                     notice.setInstanceStatus(String.join(",", roleListAll));
                 }
+                notice.setInstanceId(instanceId);
+                notice.setNextTaskId(nextTaskId);
+                notice.setSupervisoryCode(noticeDto.getSupervisoryCode());
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecutorIds(String.join(",", roleListNext));
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
+                notice.setNextExecuteUserIds(nextUserIds);
                 JgChangeRegistrationUnitMapper.updateById(notice);
                 commonServiceImpl.deleteTaskModel(notice.getSequenceNbr()+"");
                 createTaskModel(notice,taskname,"1", nextUserIds);
@@ -550,6 +554,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             for (JgChangeRegistrationUnit obj : list) {
                 TaskModelDto dto = new TaskModelDto();
                 dto.setModel(obj);
+                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 dto.setTaskCode(obj.getApplyNo());
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
                 dto.setRelationId(obj.getSequenceNbr()+"");
@@ -978,13 +983,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setTaskCode(dto.getApplyNo());
             taskModelDto.setTaskContent(this.buildTaskContent(dto));
             taskModelDto.setTaskDesc("");
-            taskModelDto.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
-            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+            taskModelDto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
             taskModelDto.setRelationId(dto.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getStatus()));
+            taskModelDto.setFlowStatusLabel(dto.getStatus());
             taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
-            taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
+            taskModelDto.setStartUserId(RequestContext.getExeUserId());
+            taskModelDto.setStartUser(reginParams.getUserModel().getUserName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());

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

@@ -91,6 +91,11 @@
   },
   {
     "type": "109",
+    "pageType": "draft",
+    "name": "单位变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"  },
+  {
+    "type": "109",
     "pageType": "look",
     "name": "单位变更登记",
     "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look"
@@ -102,11 +107,6 @@
     "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
-    "type": "109",
-    "pageType": "draft",
-    "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"  },
-  {
     "type": "110",
     "pageType": "look",
     "name": "移装变更登记",