Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -42,8 +42,7 @@ public class JgScrapCancelController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增/新增并提交", notes = "新增/新增并提交")
     public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
-        jgScrapCancelService.save(submitType, model);
-        return ResponseHelper.buildResponse("ok");
+        return ResponseHelper.buildResponse(jgScrapCancelService.save(submitType, model));
     }
 
     /**

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

@@ -271,7 +271,7 @@ public class CommonServiceImpl implements ICommonService {
             //判断redis是否存在管辖机构树
             return !ObjectUtils.isEmpty(result) ? result : creatTree();
         } else {
-            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+            return Collections.singletonList((LinkedHashMap) BeanUtil.beanToMap(reginParams.getCompany()));
         }
 
     }
@@ -296,7 +296,7 @@ public class CommonServiceImpl implements ICommonService {
             return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
         } else {
             // 监管单位逻辑
-            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+            return Collections.singletonList((LinkedHashMap) BeanUtil.beanToMap(reginParams.getCompany()));
         }
 
     }
@@ -578,7 +578,7 @@ public class CommonServiceImpl implements ICommonService {
                 noticeObj.put("submit", "true");
             }
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
-            noticeObj.put("techInfo",techInfoObj);
+            noticeObj.put("techInfo", techInfoObj);
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgChangeRegistrationReformServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {
@@ -609,7 +609,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(SBZX_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgScrapCancelService.save(submitType, jsonObject);
+            return jgScrapCancelService.saveList(submitType, jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GMBG.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -629,8 +629,8 @@ public class CommonServiceImpl implements ICommonService {
 
     public void deleteTaskModel(String id) {
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
-        if (result.size() >0 ){
-            List<Long> idList= result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
+        if (result.size() > 0) {
+            List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
             String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
             Systemctl.taskV2Client.delete(ids);
         }
@@ -644,10 +644,10 @@ public class CommonServiceImpl implements ICommonService {
         List<TaskV2Model> taskV2Models = new ArrayList<>();
         for (TaskModelDto obj : list) {
             //判断是否是暂存 新增若无下一节点执行人即为暂存
-            boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser())? true:false;
-            if (flag){
+            boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser()) ? true : false;
+            if (flag) {
                 List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
-                if (CollectionUtil.isNotEmpty(result) && result.size() > 0){
+                if (CollectionUtil.isNotEmpty(result) && result.size() > 0) {
                     break;
                 }
             }
@@ -664,8 +664,8 @@ public class CommonServiceImpl implements ICommonService {
             for (Map map : urlList) {
                 //获取暂存的可编辑页面url
                 if (flag && map.get("type").equals(obj.getTaskType())
-                        && map.get("pageType").equals("draft")){
-                    model.setRoutePath(map.get("url").toString()+ urlParams );
+                        && map.get("pageType").equals("draft")) {
+                    model.setRoutePath(map.get("url").toString() + urlParams);
                     break;
                 }
                 //维保需特殊获取页面  状态不等于监管单位审核的页面均取对应编辑页面
@@ -678,13 +678,13 @@ public class CommonServiceImpl implements ICommonService {
                 }
                 //其他逻辑均按详情页面获取
                 else if (map.get("type").equals(obj.getTaskType())
-                        && map.get("pageType").equals(null == obj.getPageType()?"look":obj.getPageType())) {
+                        && map.get("pageType").equals(null == obj.getPageType() ? "look" : obj.getPageType())) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }
             }
             //是true则为暂存 除公共部分统一处理
-            if (flag){
+            if (flag) {
                 model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
                 model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName());
                 model.setStartUserId(RequestContext.getExeUserId());
@@ -698,7 +698,7 @@ public class CommonServiceImpl implements ICommonService {
                 model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
                 model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
                 //     model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
-            }else {
+            } else {
                 model.setTaskStatus(0);
                 model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
             }
@@ -886,13 +886,13 @@ public class CommonServiceImpl implements ICommonService {
                 if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
                     lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams);
                     break;
-                } else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType","edit"))) {
+                } else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType", "edit"))) {
                     lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
                     break;
                 }
             }
             Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr());
-        }else if (list.size() == 1) {
+        } else if (list.size() == 1) {
             model.setExecuteUserIds(model.getStartUserId());
             model.setTaskStatusLabel("重新提交");
             model.setTaskStatus(FlowStatusEnum.TO_SUBMITTED.getCode());
@@ -919,13 +919,13 @@ public class CommonServiceImpl implements ICommonService {
     private static String toQueryParams2(JSONObject jsonObject) {
         StringBuilder sb = new StringBuilder();
         Set<String> keys = jsonObject.keySet();
-        keys.forEach(key->{
+        keys.forEach(key -> {
             Object value = jsonObject.get(key);
             if (sb.length() > 0) {
                 sb.append('&');
             }
             try {
-                if(value != null && !"".equals(value)){
+                if (value != null && !"".equals(value)) {
                     sb.append(URLEncoder.encode(key, "UTF-8"))
                             .append('=')
                             .append(URLEncoder.encode(value.toString(), "UTF-8"));
@@ -938,8 +938,6 @@ public class CommonServiceImpl implements ICommonService {
     }
 
 
-
-
     public <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
         StringBuilder sb = new StringBuilder();
 
@@ -968,8 +966,6 @@ public class CommonServiceImpl implements ICommonService {
     }
 
 
-
-
     /**
      * 根据流程状态name 获取流程状态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/JgScrapCancelServiceImpl.java

@@ -142,9 +142,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public List<JgScrapCancel> saveList(String submitType, Map<String, Object> mapParams) {
+        return Collections.singletonList(this.save(submitType, mapParams));
+    }
+
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void save(String submitType, Map<String, Object> mapParams) {
+    public JgScrapCancel save(String submitType, Map<String, Object> mapParams) {
         ReginParams reginParams = this.getSelectedOrgInfo();
         Map<?, ?> noticeParams = (Map) mapParams.get(PAGE_KEY);
         String equipId = String.valueOf(noticeParams.get("record"));
@@ -175,7 +180,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         List<String> roleListAll = new ArrayList<>();
         List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+            return null;
         }
         // 判断当前是否为提交
         List<WorkflowResultDto> workflowResultDtos = null;
@@ -238,6 +243,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
         jgRelationEquip.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
         jgScrapCancelEqService.save(jgRelationEquip);
+        return jgScrapCancel;
     }
 
     private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {