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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -59,7 +60,7 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, JSONObject model, ReginParams reginParams);
+    List<JgInstallationNotice> saveNotice(String submitType, JSONObject model, ReginParams reginParams);
 
     /**
      * 打印告知单

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import jdk.nashorn.api.scripting.JSObject;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,7 +27,7 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
 
     Boolean deleteForBatch(Long[] sequenceNbrs);
 
-    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
+    List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
 
     String generateTransferNoticeReport(Long sequenceNbr);
 

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/controller/JgUseRegistrationController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -18,10 +19,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author system_generator
@@ -40,8 +38,8 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
-        jgUseRegistrationServiceImpl.save(map);
-        return ResponseHelper.buildResponse("ok");
+        JgUseRegistration data = jgUseRegistrationServiceImpl.save(map);
+        return ResponseHelper.buildResponse(Collections.singletonList(data));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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()));
         }
 
     }
@@ -545,7 +545,7 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject1 = (JSONObject) JSONObject.toJSON(jgInstallationNoticeDto);
             provideMap.put(AZGZ_FORM_ID, jsonObject1);
             JSONObject jsonObject = new JSONObject(provideMap);
-            iJgInstallationNoticeService.saveNotice(submitType, jsonObject, reginParams);
+            return iJgInstallationNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.GZGZ.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -563,7 +563,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(YZGZ_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgTransferNoticeService.saveNotice(submitType, jsonObject, reginParams);
+            return jgTransferNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.SYDJ.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -571,14 +571,14 @@ public class CommonServiceImpl implements ICommonService {
             if (submitType.equals("1")) {
                 jsonObject.put("submit", Boolean.TRUE);
             }
-            jgUseRegistrationServiceImpl.save(jsonObject);
+            return jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
             //兼容业务逻辑代码
             if (submitType.equals("1")) {
                 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())) {
@@ -597,7 +597,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("pageType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
-            jgMaintenanceContractServiceImpl.saveOrSubmit(submitType, jsonObject, reginParams);
+            return jgMaintenanceContractServiceImpl.saveOrSubmit(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.SBYJ.getBusinessCode())) {
 
             JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
@@ -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/JgInstallationNoticeServiceImpl.java

@@ -471,7 +471,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, JSONObject jgInstallationNoticeDtoMap, ReginParams reginParams) {
+    public List<JgInstallationNotice> saveNotice(String submitType, JSONObject jgInstallationNoticeDtoMap, ReginParams reginParams) {
 
         JgInstallationNoticeDto model = JSON.parseObject(jgInstallationNoticeDtoMap.get(TABLE_PAGE_ID).toString(), JgInstallationNoticeDto.class);
         // 字段转换
@@ -517,6 +517,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
         }).collect(Collectors.toList());
         jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
+        return list;
     }
 
     /**

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

@@ -8,14 +8,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
-import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -28,11 +30,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseUnitLicence;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
-import jdk.nashorn.api.scripting.JSObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -118,10 +118,10 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("constructionContractList", JSON.parseArray(notice.getConstructionContract()));
         maintainInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         maintainInfo.put("city", ObjectUtils.isEmpty(notice.getCity()) ? null : notice.getCity() + "_" + notice.getCityName());
-        maintainInfo.put("constructionManagerId",ObjectUtils.isEmpty(notice.getConstructionManagerId()) ? null :  notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
-        maintainInfo.put("county",ObjectUtils.isEmpty(notice.getCounty()) ? null :  notice.getCounty() + "_" + notice.getCountyName());
+        maintainInfo.put("constructionManagerId", ObjectUtils.isEmpty(notice.getConstructionManagerId()) ? null : notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
+        maintainInfo.put("county", ObjectUtils.isEmpty(notice.getCounty()) ? null : notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCounty() + notice.getStreetName() + notice.getAddress());
-        maintainInfo.put("useUnitCreditCode",ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null :   notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+        maintainInfo.put("useUnitCreditCode", ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null : notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
         maintainInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
         if (!ValidationUtil.isEmpty(notice.getInspectionUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getInspectionUnitName())) {
             maintainInfo.put("inspectUnitId", notice.getInspectionUnitCreditCode() + "_" + notice.getInspectionUnitName());
@@ -143,7 +143,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 map.put(s, JSON.parseArray(map.get(s).toString()));
         }
         maintainInfo.putAll(map);
-        return new HashMap<String, Map<String, Object>>() {{put(TABLE_PAGE_ID, maintainInfo);}};
+        return new HashMap<String, Map<String, Object>>() {{
+            put(TABLE_PAGE_ID, maintainInfo);
+        }};
     }
 
     /**
@@ -166,13 +168,13 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             // 如果没有实例ID，说明是启动并执行一步
             // 直接调用工作流 启动并执行API  -  可以拿到两个节点的信息，用于填充业务字段
             // 如果有实例ID，为撤回或者驳回后重新提交
-            if(!StringUtils.hasText(noticeDto.getInstanceId())){
+            if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 // 发起流程
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
+                dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
@@ -194,7 +196,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 notice.setInstanceId(workflowResultDto.getInstanceId());
                 jgMaintainNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto),Boolean.TRUE);
+                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
             } else {
                 // 只调用执行API，返回下个节点信息，用于填充业务字段
                 //组装信息
@@ -415,7 +417,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
         List<String> applyNoList = applyNoResult.getResult();
 
-        List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList,model.getReceiveCompanyCode());
+        List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
 
         List<JgMaintainNotice> list = new ArrayList<>();
         List<JgMaintainNoticeEq> equipList = new ArrayList<>();
@@ -441,8 +443,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
-            dto.setEquList(obj.get("EQU_LIST").toString());
-            dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
 
@@ -472,6 +474,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
     /**
      * 暂存任务生成待办
+     *
      * @param list 业务信息
      */
     private void buildTaskDraft(List<JgMaintainNotice> list) {
@@ -526,19 +529,19 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+                commonService.deleteTaskModel(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);
     }
 
 
-    private List<WorkflowResultDto> workFlowInfo(String submitType,List<Map<String, Object>> deviceList,String receiveCompanyCode) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList, String receiveCompanyCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
-            deviceList.forEach(item->{
+            deviceList.forEach(item -> {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
@@ -556,7 +559,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
 
-
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
         AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
@@ -749,7 +751,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 TaskMessageDto taskMessageDto = new TaskMessageDto();
-                BeanUtils.copyProperties(jgMaintainNotice,taskMessageDto);
+                BeanUtils.copyProperties(jgMaintainNotice, taskMessageDto);
                 taskMap.put("model", taskMessageDto);
                 commonService.updateTaskModel(taskMap);
             } else {

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) {

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

@@ -266,7 +266,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
+                dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
@@ -383,19 +383,19 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, Object> jgTransferNoticeDtoMap, ReginParams reginParams) {
+    public List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> jgTransferNoticeDtoMap, ReginParams reginParams) {
         JgTransferNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID)), JgTransferNoticeDto.class);
         // 字段转换
         convertField(model);
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            return new ArrayList<>();
         }
         // 获取告知单号
         ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
         if (CollectionUtils.isEmpty(responseModel.getResult())) {
-            return;
+            return new ArrayList<>();
         }
         // 启动工作流并返回信息
         List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveOrgCode());
@@ -418,10 +418,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }).collect(Collectors.toList());
 
         jgTransferNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
+        return list;
     }
 
     /**
      * 暂存任务生成待办
+     *
      * @param list 业务信息
      */
     private void buildTaskDraft(List<JgTransferNotice> list) {
@@ -465,8 +467,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
             }
-            dto.setEquList(obj.get("EQU_LIST").toString());
-            dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -516,7 +518,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDtoList.add(taskModelDto);
             if (isDeleteDraft) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+                commonService.deleteTaskModel(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -536,7 +538,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             deviceList.forEach(item -> {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
+                dto.setBusinessKey(String.valueOf(item.get("SEQUENCE_NBR")));
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(receiveOrgCode);

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

@@ -154,7 +154,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     @Transactional
-    public void save(JSONObject map) {
+    public JgUseRegistration save(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
@@ -260,6 +260,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             list.add(dto);
             commonServiceImpl.buildTaskModel(list);
         }
+        return jgUseRegistration;
     }
 
     public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BizTypeEnum.java

@@ -57,7 +57,7 @@ public enum BizTypeEnum {
 
     public static String getNameByNum(String num) {
         for (BizTypeEnum c : BizTypeEnum.values()) {
-            if (c.getCode().equals(num)){
+            if (c.getNum().equals(num)){
                 return c.getName();
             }
         }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -121,4 +121,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty ("下个任务执行人ids")
     private String nextExecuteUserIds;
+
+    @ApiModelProperty ("是否监管")
+    private String identityType;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -5,27 +5,13 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        tzjia.sequence_nbr,
-        tzjia.process_instance_id,
-        tzjia.workflow_node,
-        tzjia.biz_type,
-        tzjia.application_no,
+        tzjia.*
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
-        tzjia.inspection_unit_code,
         cdd.NAME AS equipClassify,
-        tzjia.number_of_equip,
-        tzjia.inspection_unit_code,
-        tzjia.application_date,
-        tzjia.accept_date,
-        tzjia.inspection_charge_phone,
         tbei.use_unit AS applicationUnitName,
         tbei1.use_unit AS inspectionUnitName,
-        tzjia.status,
         cdd2.NAME AS statusName,
-        tzjia.next_execute_ids as nextExecuteIds,
-        tzjia.promoter,
-        tzjia.create_user_id,
         (select  group_concat(name)  from  tzs_user_info where  find_in_set(sequence_nbr,tzjia.inspection_charge_person))  as  inspectionChargePerson        FROM
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
@@ -82,29 +68,13 @@
 
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        DISTINCT(tzjia.sequence_nbr),
-        tzjia.process_instance_id,
-        tzjia.workflow_node,
-        tzjia.biz_type,
-        tzjia.application_no,
+        tzjia.*
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
-        tzjia.inspection_unit_code,
         cdd.NAME AS equipClassify,
-        tzjia.number_of_equip,
-        tzjia.inspection_unit_code,
-        tzjia.application_date,
-        tzjia.accept_date,
-        tzjia.inspection_charge_phone,
         tbei.use_unit AS applicationUnitName,
         tbei1.use_unit AS inspectionUnitName,
-        tzjia.status,
-        cdd2.NAME AS statusName,
-        tzjia.next_execute_ids as nextExecuteIds,
-        tzjia.promoter,
-        tzjia.create_user_id,
-        tzjia.next_execute_user_ids as nextExecuteUserIds,
-        tzjia.inspection_charge_person as  inspectionChargePerson
+        cdd2.NAME AS statusName
         FROM
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -112,6 +112,9 @@
             <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
                 and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
             </if>
+            <if test="jyjcInspectionResultModel.applicationUnitName != '' and jyjcInspectionResultModel.applicationUnitName != null">
+                and bei1.use_unit like concat('%',#{jyjcInspectionResultModel.applicationUnitName},'%')
+            </if>
             <choose>
                 <when test="identity == 'apply'">
                     and res.application_unit_code = #{jyjcInspectionResultModel.companyCode}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -6,28 +6,7 @@
     <select id="selectJyjcOpeningApplicationList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel">
         select
-        a.unit_code,
-        a.detection_region,
-        a.detection_region_name,
-        a.application_seq,
-        a.result_type,
-        a.expiry_date,
-        a.accept_date,
-        a.status,
-        a.remark,
-        a.sequence_nbr,
-        a.rec_date,
-        a.rec_user_id,
-        a.rec_user_name,
-        a.apply_time,
-        a.workflow_prostance_id,
-        a.workflow_role,
-        a.unit_code_name,
-        cdd2.NAME as status_name,
-        a.workflow_active_key,
-        a.next_execute_ids,
-        a.promoter,
-        a.create_user_id
+        a.*,cdd2.NAME as status_name
         from tz_jyjc_opening_application a
             LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = a.status and cdd2.type = 'JYLCSQ'
         <where>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -80,9 +80,13 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/submit")
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
-	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JSONObject jsonObject, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
+	public ResponseModel<List<JyjcOpeningApplicationModel>> updateBySequenceNbrAndStartFlow(@RequestBody JSONObject jsonObject, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 		JyjcOpeningApplicationModel model = new JyjcOpeningApplicationModel();
-		BeanUtil.copyProperties(jsonObject.get("applyInfo"),model);
+		if (jsonObject.containsKey("applyInfo")) {
+			BeanUtil.copyProperties(jsonObject.get("applyInfo"), model);
+		} else {
+			BeanUtil.copyProperties(jsonObject, model);
+		}
 		model.setSequenceNbr(sequenceNbr);
 		if (sequenceNbr != null) {
 			JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
@@ -90,7 +94,8 @@ public class JyjcOpeningApplicationController extends BaseController {
 				throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
 			}
 		}
-		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
+		JyjcOpeningApplicationModel data = jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, true);
+		return ResponseHelper.buildResponse(Collections.singletonList(data));
 	}
 
 	@Deprecated

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
@@ -167,7 +168,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 // 存在流程，执行
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("sequenceNbr",model.getSequenceNbr());
-                map.put("op", "1");
+                map.put("op", "0");
+                map.put("comments", "提交");
                 execueFlow(map);
 //                TaskResultDTO dto = new TaskResultDTO();
 //                dto.setResultCode("approvalStatus");
@@ -207,15 +209,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 // 申请单号
                 dto.setTaskCode(model.getApplicationSeq());
                 // 业务类型
-                dto.setTaskType("114");
+                dto.setTaskType(BusinessTypeEnum.JY_OPENING_APPLICATION.getCode());
                 // 业务主键
                 dto.setRelationId(String.valueOf(model.getSequenceNbr()));
                 dto.setNextExecuteUser("");
-                dto.setTaskName("");
                 list.add(dto);
                 commonServiceImpl.buildTaskModel(list);
             }
         }
+        model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
        return this.updateWithModel(model);
 
     }
@@ -350,7 +352,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             applyStartTime = date + " 00:00:00";
             applyEndTime = date + " 23:59:59";
         }
-        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, applyEndTime);
+        Page<JyjcOpeningApplicationModel> result = jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, applyEndTime);
+        for (JyjcOpeningApplicationModel record : result.getRecords()) {
+            record.setIdentityType(dto.getType());
+        }
+        return result;
     }
 
 //    public Page<JyjcOpeningApplicationModel> querypageForCompany(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
@@ -516,6 +522,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 接收/驳回通知检验单
      */
     public void execueFlow(Map<String, Object> params) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         String op = params.get("op").toString();
         JyjcOpeningApplication data = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
@@ -526,6 +533,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setComment(params.get("comments").toString());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
+        if (String.valueOf(FlowStatusEnum.ROLLBACK.getCode()).equals(data.getStatus()) || String.valueOf(FlowStatusEnum.REJECTED.getCode()).equals(data.getStatus())) {
+            map.put("approvalStatus", "提交");
+        }
         dto.setVariable(map);
         ProcessTaskDTO complete = cmWorkflowService.complete(data.getNextTaskId(), dto);
         ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
@@ -533,13 +543,22 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
         if (!org.springframework.util.ObjectUtils.isEmpty(resultDto) && !org.springframework.util.ObjectUtils.isEmpty(resultDto.get(0))) {
             WorkflowResultDto workflowResultDto = resultDto.get(0);
+            if (!ObjectUtils.isEmpty(workflowResultDto.getNextTaskId())){
                 if ("1".equals(op)) {
                     // 驳回
                     data.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+                    data.setStatusName(String.valueOf(FlowStatusEnum.REJECTED.getName()));
                     data.setPromoter("");
+
+                }else {
+                    data.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    data.setStatusName(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+                    data.setPromoter(reginParams.getUserModel().getUserId());
+                }
                 // 更新代办
-                updateTask(data, workflowResultDto);
-            } else {
+                updateTask(data, workflowResultDto, op);
+                data.setNextTaskId(workflowResultDto.getNextTaskId());
+            }else {
                 // 流程结束
                 data.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 // 更新代办
@@ -551,6 +570,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 taskParams.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskParams.put("model", data);
                 commonServiceImpl.updateTaskModel(taskParams);
+                data.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName());
             }
         }
         jyjcOpeningApplicationMapper.updateById(data);
@@ -567,7 +587,23 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(jyjcOpeningApplication.getWorkflowProstanceId());
         ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
         processTaskDTOS.add(processTaskDTO);
+        jyjcOpeningApplication.setStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jyjcOpeningApplication));
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
+        if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
+            WorkflowResultDto workflowResultDto = resultDto.get(0);
+            jsonObject.put("nextExecuteUser", workflowResultDto.getNextExecutorRoleIds());
+            jyjcOpeningApplication.setNextTaskId(workflowResultDto.getNextTaskId());
+            jyjcOpeningApplication.setStatusName(FlowStatusEnum.ROLLBACK.getName());
+        }
+        jsonObject.put("nextTaskId", jyjcOpeningApplication.getNextTaskId());
+        jsonObject.put("taskType", BusinessTypeEnum.JY_OPENING_APPLICATION.getCode());
+        jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+        jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+        // 撤回删除代办
+        commonServiceImpl.rollbackTask(jyjcOpeningApplication.getWorkflowProstanceId(), jsonObject);
+        // 更新数据
+        jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
         return jyjcOpeningApplication;
     }
 
@@ -636,7 +672,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         // 代办消息
         ArrayList<TaskModelDto> list = new ArrayList<>();
         TaskModelDto dto = new TaskModelDto();
-        dto.setTaskType("114");
+        dto.setTaskType(BusinessTypeEnum.JY_OPENING_APPLICATION.getCode());
         dto.setTaskTypeLabel(BizTypeEnum.BUSINESS_OPEN.getName());
         dto.setFlowCreateDate(model.getRecDate());
         dto.setTaskName(workflowResultDto.getNextTaskName());
@@ -654,13 +690,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setStartDate(new Date());
         model.setWorkflowProstanceId(workflowResultDto.getInstanceId());
         model.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
-        dto.setModel(model);
+        JyjcOpeningApplicationModel urlParms = new JyjcOpeningApplicationModel();
+        BeanUtil.copyProperties(model, urlParms, "unitCode" ,"unitAddress" , "unitCodeName" ,"detectionRegion" , "detectionRegionName" , "applicationSeq" , "resultType" , "expiryDate" , "acceptDate" , "remark" , "applyTime" , "baseUnitLicences" , "userInfos" , "useContact" , "contactPhone" , "industrySupervisor" , "longitude" , "latitude" , "geographic" , "unitBusinessLicense");
+        dto.setModel(urlParms);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+        dto.setPageType("look");
         list.add(dto);
         commonServiceImpl.buildTaskModel(list);
     }
 
-    public void updateTask(JyjcOpeningApplication model, WorkflowResultDto workflowResultDto) {
+    public void updateTask(JyjcOpeningApplication model, WorkflowResultDto workflowResultDto, String op) {
         // 更新代办状态
         HashMap<String, Object> params = new HashMap<>();
         params.put("relationId", model.getWorkflowProstanceId());
@@ -673,10 +712,24 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         if (!ObjectUtils.isEmpty(taskV2Model)) {
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
-            taskModelDto.setModel(model);
+            JyjcOpeningApplication urlParms = new JyjcOpeningApplication();
+            BeanUtil.copyProperties(model, urlParms, "unitCode" ,"unitAddress" , "unitCodeName" ,"detectionRegion" , "detectionRegionName" , "applicationSeq" , "resultType" , "expiryDate" , "acceptDate" , "remark" , "applyTime" , "baseUnitLicences" , "userInfos" , "useContact" , "contactPhone" , "industrySupervisor" , "longitude" , "latitude" , "geographic" , "unitBusinessLicense");
+            taskModelDto.setModel(urlParms);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+            if ("0".equals(op)){
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+            }else {
+                taskModelDto.setTaskStatusLabel(FlowStatusEnum.REJECTED.getName());
+                taskModelDto.setTaskStatus(FlowStatusEnum.REJECTED.getCode());
+                taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());
+                taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
+                taskModelDto.setPageType("edit");
+            }
+
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
         } else {

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

@@ -42,7 +42,7 @@
 },  {
   "type":"114",
   "pageType": "look",
-  "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit"
+  "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=look"
 },  {
   "type":"114",
   "pageType": "edit",