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/service/IJgChangeRegistrationTransferService.java

 package com.yeejoin.amos.boot.module.jg.api.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -19,9 +20,9 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
 
-    boolean updateTransfer(String submitType, Map<String, Object> map, ReginParams reginParams);
+    boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
-    boolean createTransfer(String submitType, Map<String, Object> map, ReginParams reginParams);
+    boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java

 package com.yeejoin.amos.boot.module.jg.api.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
@@ -57,6 +58,6 @@ public interface IJgChangeRegistrationUnitService {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, JgChangeRegistrationUnitDto model, ReginParams reginParams);
+    void saveNotice(String submitType, JSONObject model, ReginParams reginParams);
 
 }

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

@@ -56,7 +56,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
 	public ResponseModel<Boolean> save(@RequestParam(value = "submitType", required = false) String submitType,
-									   @RequestBody Map<String, Object> map) {
+									   @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){
 			throw new BadRequest("参数校验失败.");
@@ -79,7 +79,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
 	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType", required = false) String submitType,
-													 @RequestBody Map<String, Object> map) {
+													 @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){
 			throw new BadRequest("参数校验失败.");

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
@@ -59,11 +60,10 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
-	public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
-		JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+	public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
 		ReginParams reginParams = getSelectedOrgInfo();
 
-		jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jgChangeRegistrationUnitDto, reginParams);
+		jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
 		return ResponseHelper.buildResponse("");
 	}
 

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

@@ -143,8 +143,16 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public boolean createTransfer(String submitType, Map<String, Object> map, ReginParams reginParams) {
+    public boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+
         Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
+        if(ValidationUtil.isEmpty(tableData)){
+            throw new BadRequest("参数校验失败.");
+        }
+        String equIds = (String) tableData.get("record");
+        if(ValidationUtil.isEmpty(equIds)){
+            throw new BadRequest("参数校验失败.");
+        }
         CompanyBo company = reginParams.getCompany();
         String sequenceNbr = (String) tableData.get("sequenceNbr");
         String equId = (String) tableData.get("record");
@@ -316,7 +324,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public boolean updateTransfer(String submitType, Map<String, Object> map, ReginParams reginParams) {
+    public boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
         return this.createTransfer(submitType, map, reginParams);
     }
 

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

@@ -316,7 +316,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, JgChangeRegistrationUnitDto model, ReginParams reginParams) {
+    public void saveNotice(String submitType,  JSONObject map, ReginParams reginParams) {
+        JgChangeRegistrationUnitDto model = BeanUtil.mapToBean(((LinkedHashMap) map.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+
+
         String[] taskName = new String[]{"流程结束"};
 
         // 字段转换

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonserviceImpl.java

@@ -101,7 +101,7 @@ public class CommonserviceImpl {
         model.setRelationId(params.getOrDefault("instanceId","").toString());
         model.setRoutePath(params.getOrDefault("routePath","").toString());
         model.setStartDate((Date) params.getOrDefault("startDate",""));
-        model.setStartUserId(params.getOrDefault("startUser","").toString());
+        model.setStartUserId(params.getOrDefault("startUserId","").toString());
         model.setTaskContent(params.getOrDefault("taskContent","").toString());
         model.setTaskType(params.getOrDefault("taskType","").toString());
         model.setTaskTypeLabel(params.getOrDefault("taskTypeLabel","").toString());

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -208,9 +208,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
 
-            Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
-            List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
-            String roleIds = String.join(",", userOrgRoleList);
+          // Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
+          // List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
+          // String roleIds = String.join(",", userOrgRoleList);
             String urlParams = null;
             try {
                 model.setEquip(null);
@@ -224,7 +224,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                         .put("taskStatus",FlowStatusEnum.TO_BE_PROCESSED.getCode()).put("taskStatusLabel",FlowStatusEnum.TO_BE_PROCESSED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
                         .put("taskTitle",reginParams.getUserModel().getUserName()+"发起了"+taskName).put("taskDesc","").put("taskCode",model.getApplicationNo())
                         .put("extras",JSON.toJSONString(model)).put("createUserId",reginParams.getUserModel().getUserName()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds)+"&"+urlParams)
+                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",model.getNextExecuteIds())+"&"+urlParams)
                         .build());
             }
 
@@ -324,9 +324,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             params.put("taskStatusLabel",FlowStatusEnum.TO_BE_FINISHED.getName());
             TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
 
-            Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
-            List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
-            String roleIds = String.join(",", userOrgRoleList);
+          // Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
+          // List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
+          // String roleIds = String.join(",", userOrgRoleList);
             String urlParams = null;
             try {
                 model.setEquip(null);
@@ -336,10 +336,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             }
             commonservice.buildTaskModel(MapBuilder.<String, Object>create().put("instanceId", model.getProcessInstanceId()).put("startDate",new Date())
                         .put("agencyCode",reginParams.getUserModel().getAgencyCode()).put("userId",reginParams.getUserModel().getUserId()).put("startUser",reginParams.getUserModel().getUserId()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("taskStatus",FlowStatusEnum.REJECTED.getCode()).put("taskStatusLabel",FlowStatusEnum.REJECTED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
+                        .put("taskStatus",FlowStatusEnum.TO_BE_PROCESSED.getCode()).put("taskStatusLabel",FlowStatusEnum.TO_BE_PROCESSED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
                         .put("taskTitle",reginParams.getUserModel().getUserName()+"发起了"+taskName).put("taskDesc","").put("taskCode",model.getApplicationNo())
                         .put("extras",JSON.toJSONString(model)).put("createUserId",reginParams.getUserModel().getUserName()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds)+"&"+urlParams)
+                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",model.getNextExecuteIds())+"&"+urlParams)
                      //   .put("routePath",url.replace("{sequenceNbr}",String.valueOf(model.getSequenceNbr())).replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds))
                         .build());
 
@@ -536,8 +536,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
         String role = (String) nextNodeInfo.get("role");
         taskV2Model.setExecuteUserIds(role);
+        Map<String, Object> map = BeanUtil.beanToMap(taskV2Model);
+        map.put("instanceId",taskV2Model.getRelationId());
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
-        commonservice.buildTaskModel(BeanUtil.beanToMap(taskV2Model));
+        map.put("userId",reginParams.getUserModel().getUserId());
+        map.put("executeUserIds",taskV2Model.getStartUserId());
+        commonservice.buildTaskModel(map);
 
         params.put("status", FlowStatusEnum.REJECTED.getCode() + "");
         Boolean rollBack = "1".equals(op) ? true : false;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/bizTypeInfo.json

@@ -2,15 +2,15 @@
   {
     "type":"supervise",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1735205097765367809&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"firstinspect",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1736588187213524994&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"detection",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"supervise",
     "pageType": "edit",