增加暂存待办及撤销待办

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -51,6 +52,8 @@ public class JgChangeRegistrationUnitController extends BaseController {
 
     @Autowired
     JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
+    @Autowired
+	CommonServiceImpl commonService;
 
 	/**
 	 * 新增
@@ -94,6 +97,12 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@DeleteMapping(value = "/delete")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
 	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+		JgChangeRegistrationUnit byId = jgChangeRegistrationUnitServiceImpl.getById(sequenceNbr);
+		boolean bool = jgChangeRegistrationUnitServiceImpl.removeById(sequenceNbr);
+		if (bool){
+			commonService.deleteTaskModel(sequenceNbr+"");
+			commonService.deleteTaskModel(byId.getInstanceId());
+		}
 		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.removeById(sequenceNbr));
 	}
 
@@ -136,7 +145,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET", value = "单位变更分页查询", notes = "单位变更分页查询")
+	@ApiOperation(httpMethod = "POST", value = "单位变更分页查询", notes = "单位变更分页查询")
 	public ResponseModel<Page<JgChangeRegistrationUnitDto>> queryForPage(
 			@ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
 			@ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int 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/JgChangeRegistrationUnitServiceImpl.java

@@ -255,6 +255,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 notice.setNextExecutorIds(String.join(",", roleListNext));
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
                 JgChangeRegistrationUnitMapper.updateById(notice);
+                commonServiceImpl.deleteTaskModel(notice.getSequenceNbr()+"");
                 createTaskModel(notice,taskname,"1", nextUserIds);
             }else {
                 ArrayList<String> roleList = new ArrayList<>();
@@ -522,29 +523,41 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         JgChangeRegistrationUnitMapper.insertBatchSomeColumn(list);
 
         List<TaskModelDto> modelDtos = new ArrayList<>();
-        for (JgChangeRegistrationUnit obj : list) {
-            TaskModelDto dto = new TaskModelDto();
-            dto.setModel(obj);
-            dto.setFlowCreateDate(new Date());
-            dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
-            dto.setFlowCode(obj.getNextTaskId());
-            dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
-            dto.setTaskCode(obj.getApplyNo());
-            dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-            dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-            dto.setRelationId(obj.getInstanceId());
-            dto.setExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
-            dto.setTaskStatusLabel("未处理");
-            dto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass()));
-            dto.setFlowStatusLabel(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
-            dto.setStartUserId(RequestContext.getExeUserId());
-            dto.setStartUser(workflowResultDtos.get(0).getStartUserName());
-            dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
-            dto.setStartDate(new Date());
-            dto.setNextExecuteUser(workflowResultDtos.get(0).getNextExecutorRoleIds());
-            modelDtos.add(dto);
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            for (JgChangeRegistrationUnit obj : list) {
+                TaskModelDto dto = new TaskModelDto();
+                dto.setModel(obj);
+                dto.setFlowCreateDate(new Date());
+                dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
+                dto.setFlowCode(obj.getNextTaskId());
+                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskCode(obj.getApplyNo());
+                dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+                dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
+                dto.setRelationId(obj.getInstanceId());
+                dto.setExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
+                dto.setTaskStatusLabel("未处理");
+                dto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass()));
+                dto.setFlowStatusLabel(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
+                dto.setStartUserId(RequestContext.getExeUserId());
+                dto.setStartUser(workflowResultDtos.get(0).getStartUserName());
+                dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
+                dto.setStartDate(new Date());
+                dto.setNextExecuteUser(workflowResultDtos.get(0).getNextExecutorRoleIds());
+                modelDtos.add(dto);
+            }
+        }else {
+            for (JgChangeRegistrationUnit obj : list) {
+                TaskModelDto dto = new TaskModelDto();
+                dto.setModel(obj);
+                dto.setTaskCode(obj.getApplyNo());
+                dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+                dto.setRelationId(obj.getSequenceNbr()+"");
+                modelDtos.add(dto);
+            }
         }
 
+
         commonServiceImpl.buildTaskModel(modelDtos);
 
 

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

@@ -102,6 +102,11 @@
     "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": "移装变更登记",