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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -58,6 +59,6 @@ public interface IJgChangeRegistrationUnitService {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, JSONObject model, ReginParams reginParams);
+    List<JgChangeRegistrationUnit> 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/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/JgChangeRegistrationUnitServiceImpl.java

@@ -372,7 +372,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationUnit> saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
         JgChangeRegistrationUnitDto model = BeanUtil.toBeanIgnoreError(map.get("changeRegisInfo"), JgChangeRegistrationUnitDto.class);
         String[] taskName = new String[]{"流程结束"};
 
@@ -382,7 +382,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         // 获取单位变更设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            return new ArrayList<>();
         }
 
         // 获取单位变更单号
@@ -390,7 +390,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
             log.error("生成申请变更单位编失败");
-            return;
+            return new ArrayList<>();
         }
 
         ArrayList<String> roleListFirst = new ArrayList<>();
@@ -588,7 +588,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }).collect(Collectors.toList());
 
         JgChangeRegistrationUnitEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-
+        return list;
     }
 
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {

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

@@ -198,7 +198,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 installationInfo.put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? new JSONArray() : parseArray(installationInfo.get(s).toString()));
             }
             if(equipmentInfos.get(0).containsKey(s)) {
-                equipmentInfos.get(0).put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? new JSONArray() : parseArray(equipmentInfos.get(0).get(s).toString()));
+                equipmentInfos.get(0).put(s, ObjectUtils.isEmpty(equipmentInfos.get(0).get(s)) ? new JSONArray() : parseArray(equipmentInfos.get(0).get(s).toString()));
             }
         }
         Map<String, Object> map = equipmentInfos.get(0);
@@ -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) {
@@ -309,6 +315,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
                 lambda.eq(JgScrapCancel::getSequenceNbr, id);
                 JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
+                //删除代办消息
+                commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()));
                 //更新jgScrapCancel数据
                 jgScrapCancel.setIsDelete(true);
                 this.updateById(jgScrapCancel);

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

@@ -19,13 +19,14 @@ import java.util.List;
 @AllArgsConstructor
 public enum BizTypeEnum {
 
-    SUPERVISE("supervise", "监督检验"),
-    FIRST_INSPECTION("firstinspect", "定检"),
-    DETECTION("detection", "检测"),
-    BUSINESS_OPEN("businessOpen", "开通");
+    SUPERVISE("supervise", "监督检验","115"),
+    FIRST_INSPECTION("firstinspect", "定检","116"),
+    DETECTION("detection", "检测","117"),
+    BUSINESS_OPEN("businessOpen", "检验业务开通","114");
 
     private String code;
     private String name;
+    private String num;
 
     public static List<String> getEnumNameList() {
         List<String> codeList = new ArrayList<String>();
@@ -44,4 +45,22 @@ public enum BizTypeEnum {
         }
         return null;
     }
+
+    public static String getNumByCode(String code) {
+        for (BizTypeEnum c : BizTypeEnum.values()) {
+            if (c.getCode().equals(code)){
+                return c.getNum();
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByNum(String num) {
+        for (BizTypeEnum c : BizTypeEnum.values()) {
+            if (c.getNum().equals(num)){
+                return c.getName();
+            }
+        }
+        return null;
+    }
 }

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+/**
+ * 业务类型枚举
+ *
+ * @author Administrator
+ */
+public enum BusinessTypeEnum {
+
+    /**
+     * 业务类型枚举
+     */
+    JG_EQUIPMENT_HANDOVER("101", "设备移交"),
+
+    JG_INSTALLATION_NOTIFICATION("102", "安装告知"),
+
+    JG_MODIFICATION_NOTIFICATION("103", "改造告知"),
+
+    JG_MAINTENANCE_NOTIFICATION("104", "维修告知"),
+
+    JG_ADVICE_REMOVAL("105", "移装告知"),
+
+    JG_MAINTENANCE_RECORD("106", "维保备案"),
+
+    JG_USAGE_REGISTRATION("107", "使用登记"),
+
+    JG_NAME_CHANGE_REGISTRATION("108", "更名变更登记"),
+
+    JG_COMPANY_CHANGE_REGISTRATION("109", "单位变更登记"),
+
+    JG_CHANGE_REGISTRATION("110", "移装变更登记"),
+
+    JG_RENOVATION_REGISTRATION("111", "改造变更登记"),
+
+    JG_EQUIPMENT_START("112-1", "设备启用"),
+    JG_EQUIPMENT_STOP("112-2", "设备停用"),
+
+    JG_EQUIPMENT_MOVE("113-1", "移装报废"),
+    JG_EQUIPMENT_CANCEL("113-2", "注销报废"),
+
+    JY_OPENING_APPLICATION("114", "业务开通"),
+
+    JY_INSPECTION_APPLICATION_JD("115", "监督检验"),
+
+    JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
+
+    JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）");
+    private final String code;
+
+    private final String name;
+
+    BusinessTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (BusinessTypeEnum enumOne : BusinessTypeEnum.values()) {
+            if (enumOne.getCode().equals(code)) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -7,8 +7,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -27,4 +25,6 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
    JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);
 
    void updatePromoter(@org.apache.ibatis.annotations.Param ("id") Long id);
+
+   Page<JyjcInspectionApplicationModel> selectForPage(@Param("page") Page<JyjcInspectionApplication> page,  @Param("jyjcInspectionApplicationModel") JyjcInspectionApplicationModel jyjcInspectionApplicationModel,  @Param("identity") String identity, @Param("currentApplicationUnitCode") String currentApplicationUnitCode, @Param("currentInspectionUnitCode") String currentInspectionUnitCode);
 }

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

@@ -68,6 +68,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String originalApplicationNo;
 
     @ApiModelProperty(value = "受理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date acceptDate;
 
     @ApiModelProperty(value = "报检单位编号")
@@ -165,7 +166,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String nextTaskId;
 
     @ApiModelProperty(value = "下一步执行人Ids")
-    private String nextExcuteUserIds;
+    private String nextExecuteUserIds;
 
     @ApiModelProperty(value = "下一步任务名称")
     private String nextTaskName;

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/java/com/yeejoin/amos/boot/module/jyjc/api/model/TaskMessageDto.java

@@ -58,4 +58,6 @@ public class TaskMessageDto {
      * 设备id、使用登记使用
      */
     String equipId;
+
+    String processKey;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 
 import java.util.List;
 
@@ -13,4 +15,5 @@ import java.util.List;
 public interface IJyjcInspectionApplicationService {
     Boolean deleteBatchData(List<Long> sequenceNbr);
 
+    Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model);
 }

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
@@ -79,6 +65,83 @@
         </where>
         order by tzjia.application_no desc
     </select>
+
+    <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
+        tzjia.*
+        cdd1.NAME AS inspectionClassify,
+        cdd3.NAME AS inspectionType,
+        cdd.NAME AS equipClassify,
+        tbei.use_unit AS applicationUnitName,
+        tbei1.use_unit AS inspectionUnitName,
+        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
+        LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
+        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
+        LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
+        LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
+        LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
+        <where>
+            <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
+                and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
+            </if>
+            <if test="jyjcInspectionApplicationModel.inspectionClassify != null and jyjcInspectionApplicationModel.inspectionClassify != ''">
+                and tzjia.inspection_classify = #{jyjcInspectionApplicationModel.inspectionClassify}
+            </if>
+
+            <if test="jyjcInspectionApplicationModel.equipClassify != null and jyjcInspectionApplicationModel.equipClassify != ''">
+                and tzjia.equip_classify = #{jyjcInspectionApplicationModel.equipClassify}
+            </if>
+            <if test="jyjcInspectionApplicationModel.applicationDate != null and jyjcInspectionApplicationModel.applicationDate != ''">
+                and tzjia.application_date = #{jyjcInspectionApplicationModel.applicationDate}
+            </if>
+            <if test="jyjcInspectionApplicationModel.acceptDate != null and jyjcInspectionApplicationModel.acceptDate != ''">
+                and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
+            </if>
+            <if test="jyjcInspectionApplicationModel.inspectionChargePerson != null and jyjcInspectionApplicationModel.inspectionChargePerson != ''">
+                and tzjia.inspection_charge_person like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePerson},'%')
+            </if>
+            <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
+                and tzjia.status = #{jyjcInspectionApplicationModel.status}
+            </if>
+            <if test="jyjcInspectionApplicationModel.bizType != null and jyjcInspectionApplicationModel.bizType != ''">
+                and tzjia.biz_type = #{jyjcInspectionApplicationModel.bizType}
+            </if>
+
+            <if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
+                and tzjia.inspection_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+            </if>
+            <if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
+                and tzjia.application_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+            </if>
+            <if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
+                and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'
+            </if>
+            <if test="jyjcInspectionApplicationModel.applicationUnitCode != null and jyjcInspectionApplicationModel.applicationUnitCode != ''">
+                and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
+            </if>
+
+            <choose>
+                <when test="identity == 'apply'">
+                    and tzjia.application_unit_code = #{currentApplicationUnitCode}
+                </when>
+                <when test="identity == 'receive'">
+                    and tzjia.inspection_unit_code = #{currentInspectionUnitCode}
+                </when>
+                <when test="identity == 'all'">
+                    and (tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentInspectionUnitCode})
+                </when>
+                <otherwise>
+                1=2
+                </otherwise>
+            </choose>
+        </where>
+        order by tzjia.application_no desc
+    </select>
+
+
     <select id="listByCategory"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel">
         select

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

@@ -109,6 +109,12 @@
             <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
                 and use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
             </if>
+            <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}
@@ -117,7 +123,7 @@
                     and res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode}
                 </when>
                 <when test="identity == 'all'">
-                    and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or es.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
+                    and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
                 </when>
                 <otherwise>
                     1 = 2

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl;
 import io.swagger.annotations.Api;
@@ -28,8 +29,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-14
  */
@@ -41,6 +40,12 @@ public class JyjcInspectionApplicationController extends BaseController {
     @Autowired
     JyjcInspectionApplicationServiceImpl jyjcInspectionApplicationServiceImpl;
 
+	// 业务通用发起——基本信息
+	private static final String basic = "basic";
+	// 业务通用发起——设备信息
+	private static final String equipPageInfo = "equipPageInfo";
+	// 业务通用发起——技术参数-
+	private static final String filePageData = "filePageData";
 
     /**
      * 新增
@@ -51,7 +56,17 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<JyjcInspectionApplicationModel> save(@RequestBody JSONObject model) {
-
+    	if (model.containsKey(basic)) {
+			JSONObject finallyJson = new JSONObject();
+			Map<String, Object> basicObj = (Map<String, Object>) model.get(basic);
+			Map<String, Object> equipPageInfoObj = (Map<String, Object>) model.get(equipPageInfo);
+			Map<String, Object> filePageDataObj = (Map<String, Object>) model.get(filePageData);
+			finallyJson.putAll(model);
+			finallyJson.putAll(basicObj);
+			finallyJson.putAll(equipPageInfoObj);
+			finallyJson.putAll(filePageDataObj);
+			model = finallyJson;
+		}
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		model.put("applicationUnitCode",selectedOrgInfo.getCompany().getCompanyCode());
 
@@ -65,22 +80,6 @@ public class JyjcInspectionApplicationController extends BaseController {
     }
 
 
-
-	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<JyjcInspectionApplicationModel> updateBySequenceNbrJyjcInspectionApplication(@RequestBody JyjcInspectionApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-
-		model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.updateWithModel(model));
-	}
-
 	/**
      * 根据sequenceNbr删除
      *
@@ -90,185 +89,200 @@ public class JyjcInspectionApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.removeById(sequenceNbr));
     }
 
 
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/deleteBatch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "批量删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam List<Long> sequenceNbr) {
 
-	/**
-	 * 根据sequenceNbr删除
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/deleteBatch")
-	@ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "批量删除")
-	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam List<Long>sequenceNbr){
-
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.deleteBatchData(sequenceNbr));
-	}
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.deleteBatchData(sequenceNbr));
+    }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<Map<String,Object>> selectOne(@PathVariable Long sequenceNbr) {
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr));
+    }
 
-	/**
+    /**
      * 列表分页查询
      *
      * @param current 当前页
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/pageByInstitution")
-	@ApiOperation(httpMethod = "GET",value = "分页查询（检验机构）",  notes = "分页查询（检验机构）")
-	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,@RequestParam(required = false) String applicationNo,
-											  @RequestParam(required = false) String inspectionClassify,
-											  @RequestParam(required = false) String applicationUnitCode,
-											  @RequestParam(required = false) String applicationUnitName,
-											  @RequestParam(required = false) String inspectionUnitName,
-											  @RequestParam(required = false) String equipClassify,
-											  @RequestParam(required = false) String inspectionUnitCode,
-											  @RequestParam(required = false) String applicationDate,
-											  @RequestParam(required = false) String acceptDate,
-											  @RequestParam(required = false) String inspectionChargePerson,
-											  @RequestParam(required = false) String status ,
-											 @RequestParam(required = false) String roles,	  String bizType) {
-	    Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
-	    page.setCurrent(current);
-	    page.setSize(size);
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/pageByInstitution")
+    @ApiOperation(httpMethod = "GET", value = "分页查询（检验机构）", notes = "分页查询（检验机构）")
+    public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByInstitution(@RequestParam(value = "current") int current,
+                                                                                         @RequestParam(value = "size") int size,
+                                                                                         @RequestParam(required = false) String applicationNo,
+                                                                                         @RequestParam(required = false) String inspectionClassify,
+                                                                                         @RequestParam(required = false) String applicationUnitCode,
+                                                                                         @RequestParam(required = false) String applicationUnitName,
+                                                                                         @RequestParam(required = false) String inspectionUnitName,
+                                                                                         @RequestParam(required = false) String equipClassify,
+                                                                                         @RequestParam(required = false) String inspectionUnitCode,
+                                                                                         @RequestParam(required = false) String applicationDate,
+                                                                                         @RequestParam(required = false) String acceptDate,
+                                                                                         @RequestParam(required = false) String inspectionChargePerson,
+                                                                                         @RequestParam(required = false) String status,
+                                                                                         @RequestParam(required = false) String roles, String bizType) {
+        Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
+        page.setCurrent(current);
+        page.setSize(size);
 
-		ReginParams reginParams = getSelectedOrgInfo();
-		inspectionUnitCode = reginParams.getCompany().getCompanyCode();
-		List<String> roleIds = StrUtil.split(roles, ",");
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType ));
-	}
+        ReginParams reginParams = getSelectedOrgInfo();
+        inspectionUnitCode = reginParams.getCompany().getCompanyCode();
+        List<String> roleIds = StrUtil.split(roles, ",");
 
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page, applicationNo, inspectionClassify, applicationUnitCode, equipClassify, inspectionUnitCode, applicationUnitName, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType));
+    }
 
-		@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/pageByCompany")
-	@ApiOperation(httpMethod = "GET",value = "分页查询（报检单位）",  notes = "分页查询（报检单位）")
-	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam
-			(value = "size") int size,@RequestParam(required = false) String applicationNo,
-																				@RequestParam(required = false) String inspectionClassify,
-																				@RequestParam(required = false) String applicationUnitCode,
-																				@RequestParam(required = false) String equipClassify,
-																				@RequestParam(required = false) String inspectionUnitCode,
-																				@RequestParam(required = false) String applicationUnitName,
-																				@RequestParam(required = false) String inspectionUnitName,
-																				@RequestParam(required = false) String applicationDate,
-																				@RequestParam(required = false) String acceptDate,
-																				@RequestParam(required = false) String inspectionChargePerson,
-																					 @RequestParam(required = false) String roles,
-																					 @RequestParam(required = false) String status , String bizType) {
-		Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
-		page.setCurrent(current);
-		page.setSize(size);
-		ReginParams reginParams = getSelectedOrgInfo();
-		applicationUnitCode = reginParams.getCompany().getCompanyCode();
-			List<String> roleIds = StrUtil.split(roles, ",");
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/pageByCompany")
+    @ApiOperation(httpMethod = "GET", value = "分页查询（报检单位）", notes = "分页查询（报检单位）")
+    public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByCompany(@RequestParam(value = "current") int current,
+                                                                                     @RequestParam (value = "size") int size,
+                                                                                     @RequestParam(required = false) String applicationNo,
+                                                                                     @RequestParam(required = false) String inspectionClassify,
+                                                                                     @RequestParam(required = false) String applicationUnitCode,
+                                                                                     @RequestParam(required = false) String equipClassify,
+                                                                                     @RequestParam(required = false) String inspectionUnitCode,
+                                                                                     @RequestParam(required = false) String applicationUnitName,
+                                                                                     @RequestParam(required = false) String inspectionUnitName,
+                                                                                     @RequestParam(required = false) String applicationDate,
+                                                                                     @RequestParam(required = false) String acceptDate,
+                                                                                     @RequestParam(required = false) String inspectionChargePerson,
+                                                                                     @RequestParam(required = false) String roles,
+                                                                                     @RequestParam(required = false) String status, String bizType) {
+        Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
+        page.setCurrent(current);
+        page.setSize(size);
+        ReginParams reginParams = getSelectedOrgInfo();
+        applicationUnitCode = reginParams.getCompany().getCompanyCode();
+        List<String> roleIds = StrUtil.split(roles, ",");
 //			return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType,roleIds));
-			return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page, applicationNo, inspectionClassify, applicationUnitCode, equipClassify, inspectionUnitCode, applicationUnitName, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType));
 
-	}
+    }
 
-			/**
-             * 列表全部数据查询
-             *
-             * @return
-             */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JyjcInspectionApplicationModel>> selectForList() {
-	    return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationList());
-	}
 
-	/**
-	 * 接收接口
-	 *
-	 *
-	 * @param params params
-	 * @return {@link  ResponseModel< HashMap< String  String>>}
-	 * @author yangyang
-	 * @throws
-	 * @date 2023/12/15 11:25
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "POST",value = "接收",   notes = "接收")
-	@PostMapping(value = "/flow/{type}/receive")
-	public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
-		params.put("type", type);
-		try {
-			jyjcInspectionApplicationServiceImpl.doReceive(params);
-		}catch (Exception e){
-			return CommonResponseUtil.failure("该项流程发生变化，请返回列表刷新查看状态后重试");
-		}
-		HashMap<String, String> result = new HashMap<>();
-		result.put("result","success");
-		return ResponseHelper.buildResponse(result);
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/pageList")
+    @ApiOperation(httpMethod = "POST", value = "分页列表页面(检验检测单位、使用单位共用）", notes = "分页列表页面(检验检测单位、使用单位共用）")
+    public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageList(@RequestParam(value = "current") int current,
+                                                                                @RequestParam(value = "size") int size,
+                                                                                @RequestBody JyjcInspectionApplicationModel model) {
+        Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
+        page.setCurrent(current);
+        page.setSize(size);
 
-	/**
-	 * 退回接口（监督检验、定（首）检、检测）-通用
-	 *
-	 *
-	 * @param params params
-	 * @return {@link }
-	 * @author yangyang
-	 * @throws
-	 * @date 2023/12/15 13:44
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "退回",   notes = "退回")
-	@PostMapping(value = "/flow/reject")
-	public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String,Object> params) {
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params));
-	}
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForPageList(page, model));
 
-	/**
-	 * 撤回接口（监督检验、定（首）检、检测）-通用
-	 *
-	 *
-	 * @param sequenceNbr sequenceNbr
-	 * @return {@link }
-	 * @author yangyang
-	 * @throws
-	 * @date 2023/12/15 13:39
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "撤回",   notes = "撤回")
-	@GetMapping(value = "/flow/rollback")
-	public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr));
-	}
-	/**
-	 * 查询指定设备种类的设备列表
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "查询指定设备种类的设备列表",   notes = "查询指定设备种类的设备列表")
-	@GetMapping(value = "/listByCategory")
-	public ResponseModel<Page<JyjcInspectionApplicationEquipModel>> listByCategory(
-			@RequestParam("current") int current,
-			@RequestParam("size") int size,
-			@RequestParam("equipClassify") String equipClassify) {
-		Page<JyjcInspectionApplicationEquipModel> page = new Page<>();
-		page.setCurrent(current);
-		page.setSize(size);
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page,equipClassify));
-	}
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<JyjcInspectionApplicationModel>> selectForList() {
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationList());
+    }
+
+    /**
+     * 接收接口
+     *
+     * @param params params
+     * @return {@link  ResponseModel< HashMap< String  String>>}
+     * @throws
+     * @author yangyang
+     * @date 2023/12/15 11:25
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "接收", notes = "接收")
+    @PostMapping(value = "/flow/{type}/receive")
+    public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
+        params.put("type", type);
+        try {
+            jyjcInspectionApplicationServiceImpl.doReceive(params);
+        } catch (Exception e) {
+            return CommonResponseUtil.failure("该项流程发生变化，请返回列表刷新查看状态后重试");
+        }
+        HashMap<String, String> result = new HashMap<>();
+        result.put("result", "success");
+        return ResponseHelper.buildResponse(result);
+    }
+
+    /**
+     * 退回接口（监督检验、定（首）检、检测）-通用
+     *
+     * @param params params
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2023/12/15 13:44
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "退回", notes = "退回")
+    @PostMapping(value = "/flow/reject")
+    public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String, Object> params) {
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params));
+    }
+
+    /**
+     * 撤回接口（监督检验、定（首）检、检测）-通用
+     *
+     * @param sequenceNbr sequenceNbr
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2023/12/15 13:39
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "撤回", notes = "撤回")
+    @GetMapping(value = "/flow/rollback")
+    public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr));
+    }
+
+    /**
+     * 查询指定设备种类的设备列表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询指定设备种类的设备列表", notes = "查询指定设备种类的设备列表")
+    @GetMapping(value = "/listByCategory")
+    public ResponseModel<Page<JyjcInspectionApplicationEquipModel>> listByCategory(
+            @RequestParam("current") int current,
+            @RequestParam("size") int size,
+            @RequestParam("equipClassify") String equipClassify) {
+        Page<JyjcInspectionApplicationEquipModel> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page, equipClassify));
+    }
 }

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
@@ -56,9 +57,10 @@ public class JyjcOpeningApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JyjcOpeningApplicationModel model) {
-	    model = jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, false);
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JSONObject model) {
+		JyjcOpeningApplicationModel jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
+		BeanUtil.copyProperties(model.get("applyInfo"),jyjcOpeningApplicationModel);
+	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(jyjcOpeningApplicationModel, false));
 	}
 
 	/**
@@ -78,7 +80,13 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/submit")
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
-	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @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();
+		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);
@@ -86,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
@@ -217,7 +226,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回业务开通申请",   notes = "撤回业务开通申请")
 	@GetMapping(value = "/rollBackFlow")
-	public ResponseModel<JSONObject> overflow(@RequestParam("sequenceNbr") String sequenceNbr) {
+	public ResponseModel<Object> overflow(@RequestParam("sequenceNbr") String sequenceNbr) {
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.stopFlow(sequenceNbr));
 	}
 

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

@@ -108,7 +108,7 @@ public class TaskModelServiceImpl {
                 model.setFlowCreateDate(new Date());
                 model.setTaskStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
                 model.setTaskTitle("有一条待提交的草稿");
-                model.setTaskName(BizTypeEnum.getNameByCode(obj.getTaskType()));
+                model.setTaskName(BizTypeEnum.getNameByNum(obj.getTaskType()));
                 model.setTaskTypeLabel(BizTypeEnum.getNameByCode(obj.getTaskType()));
                 //     model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
             }else {

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

@@ -10,14 +10,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 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.enums.DocumentEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
@@ -26,21 +27,19 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.TaskModelServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.component.feign.utils.FeignUtil;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
-import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import com.yeejoin.amos.feign.workflow.model.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -51,7 +50,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -98,6 +96,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     WorkflowFeignService workflowFeignService;
     @Autowired
     CommonserviceImpl commonservice;
+    @Autowired
+    CmWorkflowServiceImpl cmWorkflowService;
     @Value("classpath:/json/bizTypeInfo.json")
     private Resource bizTypeInfo;
 
@@ -109,47 +109,53 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    TaskModelServiceImpl taskModelService;
+
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
         //接口通用 部分页面按钮无法分开配置类型 所以根据业务情况 将带有工作流实例id的数据 接口类型设置为2 走编辑逻辑
         JyjcInspectionApplicationModel model = JSONObject.parseObject(JSON.toJSONString(obj), JyjcInspectionApplicationModel.class);
+        model.setEquip((List<Map<String, Object>> )obj.get("equip"));
         if (CharSequenceUtil.isNotEmpty(model.getProcessInstanceId()) && model.getOperationType().equals("0")){
             model.setOperationType("2");
         }
 
+        ArrayList<String> roleListAll = new ArrayList<>();
+        ArrayList<String> roleListNext = new ArrayList<>();
         if (!model.getOperationType().equals("2")) {
             String taskName = "";
             if (model.getOperationType().equals("0")) {
-
+                List<ProcessTaskDTO> processTasks = new ArrayList<>();
+                ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey( model.getProcessKey());
-                dto.setBusinessKey(buildOrderNo());
-                try {
-                    //开启报检流程工作流
-                    FeignClientResult ajaxResult = Workflow.taskV2Client.startByVariable(dto);
-                    String id = JSON.parseObject(JSON.toJSONString(ajaxResult.getResult())) .get("id").toString();
-             //       String id = ((Map) ajaxResult.getResult()).get("id").toString();
-                    model.setProcessInstanceId(id);
-                    execueFlow(MapBuilder.<String, Object>create().put("op", "提交").put("instanceId", id).put("comments", "").build());
-
-
-                    // region 获取下一个流程节点的数据
-                    Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
-                    String role = (String) nextNodeInfo.get("role");
-                    taskName = (String) nextNodeInfo.get("taskName");
-                    model.setNextExecuteIds(role);
-                    if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
-                        model.setWorkflowRole(model.getWorkflowRole() + "," + role);
-                    } else {
-                        model.setWorkflowRole(role);
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
+                dto.setProcessDefinitionKey(model.getProcessKey());
+                dto.setBusinessKey(String.valueOf(new Date().getTime()));
+                dto.setCompleteFirstTask(true);
+                list.add(dto);
+                actWorkflowBatchDTO.setProcess(list);
+                dto.setNextExecuteUserCompanyCode(model.getInspectionUnitCode());
+                processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
+                String instanceId = processTasks.get(0).getProcessInstance().getId();
+                String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
+                taskName = processTasks.get(0).getNextTask().get(0).getName();
+                this.buildRoleList(processTasks, roleListNext, roleListAll);
+                List<WorkflowResultDto> workflowResultDtos = taskModelService.buildWorkFlowInfo(processTasks);
+                String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+                String nextExcuteIds = workflowResultDtos.get(0).getNextExecutorRoleIds();
+                model.setProcessInstanceId(instanceId);
+                if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
+                    model.setWorkflowRole(model.getWorkflowRole() + "," + nextExcuteIds);
+                } else {
+                    model.setWorkflowRole(nextExcuteIds);
                 }
-
-
-             model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
+                model.setNextExecuteIds(nextExcuteIds);
+                model.setNextTaskId(nextTaskId);
+                model.setNextTaskName(taskName);
+                model.setNextExecuteUserIds(nextUserIds);
+                model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
             } else if (model.getOperationType().equals("1")) {
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
@@ -184,48 +190,39 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                  //   equipInfo.setApplicationSeq(model.getSequenceNbr());
                     equipInfos.add(equipInfo);
                 }
+                model.setEquList(model.getEquip().get(0).getOrDefault("EQU_LIST","").toString());
+                model.setSupervisoryCode(model.getEquip().get(0).getOrDefault("SUPERVISORY_CODE","").toString());
             }
             model.setCreateUserId(reginParams.getUserModel().getUserId());
             model.setNumberOfEquip(equipInfos.size());
-            // endregion
 
             if (null == model.getSequenceNbr()){
                 model = this.createWithModel(model);
             }else {
                 model = this.updateWithModel(model);
             }
-            String json = null;
-            try {
-                json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            List<Map> list = parseArray(json, Map.class);
-            String url = null;
-            for (Map map : list) {
-                if (map.get("type").equals(model.getBizType() )&& "look".equals(map.get("pageType"))){
-                    url = map.get("url").toString();
-                }
-            }
 
-          // 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);
-                urlParams = commonservice.toQueryParams(model);
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
+
             if (StringUtils.isNotBlank(model.getProcessInstanceId())){
-                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.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}",model.getNextExecuteIds())+"&"+urlParams)
-                        .build());
+                this.createdTaskModel(model);
+            }else {
+                TaskModelDto dto = new TaskModelDto();
+                TaskMessageDto ta = new TaskMessageDto();
+                ta.setInstanceId(model.getProcessInstanceId());
+                ta.setStatus(model.getStatus());
+                ta.setPromoter(model.getPromoter());
+                ta.setNextExecuteUserIds(model.getNextExecuteUserIds());
+                ta.setSequenceNbr(model.getSequenceNbr());
+                dto.setModel(ta);
+                //摘要 按原有规则组装
+                dto.setTaskContent("来自"+model.getEquList()+"【"+model.getSupervisoryCode()+"】的业务办理,【申请单号:"+model.getApplicationNo()+"】");
+                //申请单号
+                dto.setTaskCode(model.getApplicationNo());
+                //业务类型枚举code值
+                dto.setTaskType(BizTypeEnum.getNumByCode(model.getBizType()));
+                ////业务主键
+                dto.setRelationId(model.getSequenceNbr()+"");
+                taskModelService.buildTaskModel(Arrays.asList(dto));
             }
 
             //保存报检装备监管码
@@ -273,6 +270,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     equipInfo.setApplicationSeq(model.getSequenceNbr());
                     jyjcInspectionApplicationEquipService.save(equipInfo);
                 }
+                model.setEquList(model.getEquip().get(0).getOrDefault("EQU_LIST","").toString());
+                model.setSupervisoryCode(model.getEquip().get(0).getOrDefault("SUPERVISORY_CODE","").toString());
             }
 
         //    Map<String, Object> map = BeanUtil.beanToMap(model);
@@ -291,58 +290,45 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
             model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
-            execueFlow(MapBuilder.<String, Object>create().put("op", "提交").put("instanceId", model.getProcessInstanceId()).put("comments", "").build());
-            Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
-            String role = (String) nextNodeInfo.get("role");
-            String taskName = (String) nextNodeInfo.get("taskName");
-            model.setNextExecuteIds(role);
-            model.setPromoter(reginParams.getUserModel().getUserId());
+
+            ArrayList<String> roleList = new ArrayList<>();
+            String taskId = model.getNextTaskId();
+            //组装信息
+            TaskResultDTO task = new TaskResultDTO();
+            task.setResultCode("approvalStatus");
+            task.setTaskId(taskId);
+            task.setComment("");
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", "提交");
+            task.setVariable(map);
+            //执行流程
+            task.setNextExecuteUserCompanyCode(model.getInspectionUnitCode());
+            ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+            String taskCode = FlowStatusEnum.TO_SUBMITTED.getName();
+            String taskName1 = "";
+            String nextTaskId = "";
+            this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
+            List<WorkflowResultDto> workflowResultDtos = taskModelService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+            String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+            if(processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() >0){
+                taskCode = processTaskDTO.getNextTask().get(0).getKey();
+                taskName1 = processTaskDTO.getNextTask().get(0).getName();
+                nextTaskId = processTaskDTO.getNextTask().get(0).getId();
+            }
+            model.setNextExecuteIds(String.join(",", roleList));
             if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
-                model.setWorkflowRole(model.getWorkflowRole() + "," + role);
+                model.setWorkflowRole(model.getWorkflowRole() + "," + String.join(",", roleList));
             } else {
-                model.setWorkflowRole(role);
+                model.setWorkflowRole(String.join(",", roleList));
             }
+            model.setNextTaskId(nextTaskId);
+            model.setPromoter(RequestContext.getExeUserId());
+            model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode()));
+            model.setStatusName(FlowStatusEnum.TO_SUBMITTED.getName());
+            model.setNextTaskName(taskName1);
+            executeOneStep(model, taskName1, nextUserIds);
+            model.setNextExecuteIds(nextUserIds);
             this.updateWithModel(model);
-
-
-            String json = null;
-            try {
-                json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            List<Map> list = parseArray(json, Map.class);
-            String url = null;
-            for (Map map : list) {
-                if (map.get("type").equals(model.getBizType() )&& "look".equals(map.get("pageType"))){
-                    url = map.get("url").toString();
-                }
-            }
-            Map<String,Object> params = new HashMap<>();
-            params.put("relationId",model.getProcessInstanceId());
-            params.put("taskStatus",FlowStatusEnum.TO_BE_FINISHED.getCode());
-            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);
-            String urlParams = null;
-            try {
-                model.setEquip(null);
-                urlParams = commonservice.toQueryParams(model);
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
-            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.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}",model.getNextExecuteIds())+"&"+urlParams)
-                     //   .put("routePath",url.replace("{sequenceNbr}",String.valueOf(model.getSequenceNbr())).replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds))
-                        .build());
-
         }
         return model;
     }
@@ -393,6 +379,57 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
+    public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model) {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
+                RequestContext.getToken())).toString(), ReginParams.class);
+        String companyType = reginParams.getCompany().getCompanyType();
+        String companyCode = reginParams.getCompany().getCompanyCode();
+        String currentApplicationUnitCode = null;
+        String currentInspectionUnitCode = null;
+        if(ValidationUtil.isEmpty(companyType)){
+            return new Page<>(0,10, 0);
+        }
+        // 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
+        String identity= this.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
+        if(ValidationUtil.equals("apply", identity)){
+            currentApplicationUnitCode = companyCode;
+        }
+        if(ValidationUtil.equals("receive", identity)){
+            currentInspectionUnitCode = companyCode;
+        }
+        if(ValidationUtil.equals("all", identity)){
+            currentApplicationUnitCode = companyCode;
+            currentInspectionUnitCode = companyCode;
+        }
+        Page<JyjcInspectionApplicationModel> resultPage = this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode);
+        return resultPage;
+    }
+
+    private String getCompanyIdentityByType(String companyType){
+        // 可发起单位的单位类型（角色与单位类型已绑定，在业务系统增加的账号不会出现角色与的单位类型不匹配场景）
+        String[] applyIdentityDefine = {"使用单位", "安装改造维修单位"};
+        // 可进行检验检测申请接收的单位类型，在业务系统增加的账号不会出现角色与的单位类型不匹配场景
+        String[] receiveIdentityDefine = {"检验检测机构"};
+        boolean isApplyIdentityMatch = false;
+        boolean isReceiveIdentityMatch = false;
+        if(Arrays.stream(applyIdentityDefine).anyMatch(companyType::contains)){
+            isApplyIdentityMatch = true;
+        }
+        if(Arrays.stream(receiveIdentityDefine).anyMatch(companyType::contains)){
+            isReceiveIdentityMatch = true;
+        }
+        if(isApplyIdentityMatch && !isReceiveIdentityMatch){
+            return "apply";
+        }
+        if(!isApplyIdentityMatch && isReceiveIdentityMatch){
+            return "receive";
+        }
+        if(isApplyIdentityMatch){
+            return "all";
+        }
+        return "no";
+    }
+
     /**
      * 列表查询 示例
      */
@@ -592,21 +629,45 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             log.warn("JyjcInspectionApplicationModel Not Found！sequenceNbr => " + sequenceNbr);
             return false;
         }
-        try {
-            // 撤回流程
-            JSONObject jsonObject = workflowHelper.rollBack(inspectionApplicationModel.getProcessInstanceId());
-            if (ObjectUtils.isEmpty(jsonObject) || 200 != jsonObject.getInteger("status")) {
-                log.error("撤回工作流错误, => {}", jsonObject);
-                return false;
-            }
-            updateModelByInstanceId(inspectionApplicationModel.getSequenceNbr(), inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.ROLLBACK.getCode() + "").build(), true);
-            commonservice.deleteTaskModel(inspectionApplicationModel.getProcessInstanceId());
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("撤回工作流错误, => {}", inspectionApplicationModel.getProcessInstanceId(), e);
-            return false;
+        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
+        String[] taskName = new String[]{"流程结束"};
+        // FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
+        List<String> roleListNext = new ArrayList<>();
+        List<String> roleListAll = new ArrayList<>();
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(inspectionApplicationModel.getProcessInstanceId());
+        String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
+        this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
+        List<WorkflowResultDto> workflowResultDtos = taskModelService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+        if (!org.springframework.util.ObjectUtils.isEmpty(inspectionApplicationModel.getWorkflowRole())) {
+            inspectionApplicationModel.setWorkflowRole(inspectionApplicationModel.getWorkflowRole() + "," + roleListAll);
+        } else {
+            inspectionApplicationModel.setWorkflowRole(inspectionApplicationModel.getWorkflowRole());
         }
+        // 待调整
+        taskCode = processTaskDTO.getNextTask().get(0).getKey();
+        inspectionApplicationModel.setStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
+        inspectionApplicationModel.setStatusName(FlowStatusEnum.ROLLBACK.getName());
+        inspectionApplicationModel.setPromoter("");
+        inspectionApplicationModel.setNextTaskId(nextTaskId);
+        inspectionApplicationModel.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
+        inspectionApplicationModel.setNextExecuteIds(String.join(",", roleListNext));
+        JyjcInspectionApplication jyjcInspectionApplication = new JyjcInspectionApplication();
+
+
+        BeanUtils.copyProperties(inspectionApplicationModel,jyjcInspectionApplication);
+
+        this.getBaseMapper().updateById(jyjcInspectionApplication);
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(inspectionApplicationModel));
+        jsonObject.put("nextTaskId", inspectionApplicationModel.getNextTaskId());
+        jsonObject.put("nextExecuteUser", inspectionApplicationModel.getNextExecuteIds());
+        jsonObject.put("taskType", BizTypeEnum.getNumByCode(inspectionApplicationModel.getBizType()));
+        jsonObject.put("flowStatus",FlowStatusEnum.ROLLBACK.getCode());
+        jsonObject.put("flowStatusLabel",FlowStatusEnum.ROLLBACK.getName());
+
+        taskModelService.rollbackTask(inspectionApplicationModel.getProcessInstanceId(), jsonObject);
+        return true;
+
+
     }
 
     public void updateModelByInstanceId(Long sequenceNbr, String instanceId, Map<String, Object> params, Boolean rollBack) {
@@ -656,4 +717,96 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         this.updateById(entity);
 
     }
+
+    private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
+        processTasks.forEach(p -> {
+            p.getNextCandidateGroups().values().forEach(e -> {
+                roleListNext.addAll(e);
+                roleListAll.addAll(e);
+            });
+            roleListAll.addAll(p.getCandidateGroups());
+        });
+    }
+
+    private   void createdTaskModel(JyjcInspectionApplicationModel model){
+
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        TaskModelDto dto = new TaskModelDto();
+        TaskMessageDto ta = new TaskMessageDto();
+        ta.setInstanceId(model.getProcessInstanceId());
+        ta.setStatus(model.getStatus());
+        ta.setPromoter(model.getPromoter());
+        ta.setNextExecuteUserIds(model.getNextExecuteUserIds());
+        ta.setSequenceNbr(model.getSequenceNbr());
+        ta.setProcessKey(model.getProcessKey());
+        dto.setModel(ta);
+        dto.setFlowCreateDate(new Date());
+        dto.setTaskName(model.getNextTaskName());
+        dto.setFlowCode(model.getNextTaskId());
+        dto.setTaskContent("来自"+model.getEquList()+"【"+model.getSupervisoryCode()+"】的业务办理,【申请单号:"+model.getApplicationNo()+"】");
+        dto.setTaskCode(model.getApplicationNo());
+        dto.setTaskType(BizTypeEnum.getNumByCode(model.getBizType()));
+        dto.setTaskTypeLabel(BizTypeEnum.getNameByCode(model.getBizType()));
+        dto.setRelationId(model.getInstanceId());
+        dto.setExecuteUserIds(model.getNextExecuteUserIds());
+        dto.setTaskStatusLabel("未处理");
+        dto.setFlowStatus(Integer.valueOf(model.getStatus()));
+        dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        dto.setStartUserId(RequestContext.getExeUserId());
+        dto.setStartUser(model.getCreateUserId());
+        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
+        dto.setStartDate(new Date());
+        dto.setNextExecuteUser(model.getNextExecuteIds());
+
+        taskModelService.buildTaskModel(Arrays.asList(dto));
+    }
+
+
+    private void executeOneStep(JyjcInspectionApplicationModel model, String taskName, String nextUserIds) {
+        // 先更新之前的待办
+        TaskV2Model taskV2Model = updateTaskModel(model);
+        taskV2Model.setTaskDesc("");
+        taskV2Model.setTaskName(taskName);
+        taskV2Model.setTaskCode(model.getApplicationNo());
+        taskV2Model.setExecuteUserIds(nextUserIds);
+        taskV2Model.setRelationId(model.getProcessInstanceId());
+        taskV2Model.setTaskStatus(Integer.valueOf(model.getStatus()));
+        taskV2Model.setTaskStatusLabel(model.getStatusName());
+        taskV2Model.setFlowStatus(Integer.valueOf(model.getStatus()));
+        taskV2Model.setFlowStatusLabel(model.getStatusName());
+        //  taskV2Model.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+        //  taskV2Model.setStartUser(jgChangeRegistrationName.getCreateUserName());
+        //  taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
+        //  taskV2Model.setStartDate(jgChangeRegistrationName.getCreateDate());
+        //  taskV2Model.setStartUserId(jgChangeRegistrationName.getCreateUserId());
+        //  taskV2Model.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
+        taskV2Model.setExecuteUserIds(nextUserIds);
+        TaskModelDto modelDto = new TaskModelDto();
+        BeanUtil.copyProperties(taskV2Model, modelDto);
+        modelDto.setNextExecuteUser(model.getNextExecuteIds());
+        if (model.getStatus().equals(FlowStatusEnum.REJECTED.getCode())){
+            modelDto.setPageType("edit");
+        }
+        TaskMessageDto obj = new TaskMessageDto();
+        obj.setInstanceId(model.getProcessInstanceId());
+        obj.setStatus(model.getStatus());
+        obj.setPromoter(model.getPromoter());
+        obj.setNextExecuteUserIds(model.getNextExecuteUserIds());
+        obj.setSequenceNbr(model.getSequenceNbr());
+        modelDto.setModel(obj);
+        // 再插入新代办、数据待定
+        taskModelService.buildTaskModel(Collections.singletonList(modelDto));
+    }
+
+
+    private TaskV2Model updateTaskModel(JyjcInspectionApplicationModel model) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("relationId",model.getInstanceId());
+        params.put("taskStatus", model.getStatus());
+        params.put("taskStatusLabel", model.getStatusName());
+        params.put("flowStatus",model.getStatus());
+        params.put("flowStatusLabel",model.getStatusName());
+        params.put("model",model);
+        return taskModelService.updateTaskModel(params);
+    }
 }
\ No newline at end of file

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

@@ -4,13 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.JSONPObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
@@ -24,7 +22,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttach
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultService;
 import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.CategoryOtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -127,7 +124,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             model = new JyjcInspectionResultModel();
         }
         // 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
-        String identity= this.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
+        String identity = this.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
         model.setCompanyCode(reginParams.getCompany().getCompanyCode());
         Page<JyjcInspectionResultModel> resultPage = resultMapper.selectForPage(page, model, identity);
         resultPage.getRecords().forEach(v -> {
@@ -142,27 +139,27 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         return resultPage;
     }
 
-    private String getCompanyIdentityByType(String companyType){
+    private String getCompanyIdentityByType(String companyType) {
         // 可发起单位的单位类型（角色与单位类型已绑定，在业务系统增加的账号不会出现角色与的单位类型不匹配场景）
         String[] applyIdentityDefine = {"使用单位", "安装改造维修单位"};
         // 可进行检验检测申请接收的单位类型，在业务系统增加的账号不会出现角色与的单位类型不匹配场景
         String[] receiveIdentityDefine = {"检验检测机构"};
         boolean isApplyIdentityMatch = false;
         boolean isReceiveIdentityMatch = false;
-        if(Arrays.stream(applyIdentityDefine).anyMatch(companyType::contains)){
+        if (Arrays.stream(applyIdentityDefine).anyMatch(companyType::contains)) {
             isApplyIdentityMatch = true;
         }
-        if(Arrays.stream(receiveIdentityDefine).anyMatch(companyType::contains)){
+        if (Arrays.stream(receiveIdentityDefine).anyMatch(companyType::contains)) {
             isReceiveIdentityMatch = true;
         }
-        if(isApplyIdentityMatch && !isReceiveIdentityMatch){
+        if (isApplyIdentityMatch && !isReceiveIdentityMatch) {
             return "apply";
         }
-        if(!isApplyIdentityMatch && isReceiveIdentityMatch){
+        if (!isApplyIdentityMatch && isReceiveIdentityMatch) {
             return "receive";
         }
-        if(isApplyIdentityMatch){
-             return "all";
+        if (isApplyIdentityMatch) {
+            return "all";
         }
         return "no";
     }
@@ -235,7 +232,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                 paramList.add(resultParam);
             }
         });
-        if (!CollectionUtils.isEmpty(paramList)){
+        if (!CollectionUtils.isEmpty(paramList)) {
             resultParamService.saveOrUpdateBatch(paramList);
         }
 
@@ -254,11 +251,11 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             inspectionDetectionInfoMapper.updateById(info);
         }
         //更新使用信息表
-    useInfoMapper.updateByRecord(model.getEquipUnicode(),model.getNextInspectionDate(),model.getInspectionType(),model.getApplicationNo());
+        useInfoMapper.updateByRecord(model.getEquipUnicode(), model.getNextInspectionDate(), model.getInspectionType(), model.getApplicationNo());
         return model;
     }
 
-    private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info, JyjcInspectionResultAttachment jybgFile ) {
+    private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info, JyjcInspectionResultAttachment jybgFile) {
         // 回填检验机构名称
         LambdaQueryWrapper<TzBaseEnterpriseInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TzBaseEnterpriseInfo::getUseCode, model.getInspectionUnitCode());

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

@@ -11,11 +11,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 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.*;
@@ -43,6 +45,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -124,8 +127,20 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 isUpdate = true;
             }
         }
+        List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
+        model.setApplicationSeq(codes.get(0));
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        model.setPromoter(reginParams.getUserModel().getUserId());
+        if (!isUpdate) {
+            CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
+            model.setUnitCode(companyBo.getCompanyCode());
+            model.setUnitCodeName(companyBo.getCompanyName());
+            model.setCreateUserId(reginParams.getUserModel().getUserId());
+            this.createWithModel(model);
+        }
         if (enableStartFlow) {
+            model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+            model.setApplyTime(new Date());
             if (StringUtils.isBlank(instanceId)) {
                 // 未开启过工作流则进行开启 startProcess
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -146,65 +161,64 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                     model.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     model.setNextTaskId(workflowResultDto.getNextTaskId());
                     model.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    // 创建代办
+                    buildTask(model, workflowResultDto);
                 }
             } else {
                 // 存在流程，执行
-                TaskResultDTO dto = new TaskResultDTO();
-                dto.setResultCode("approvalStatus");
-                dto.setTaskId(model.getNextTaskId());
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("approvalStatus", "提交");
-                dto.setVariable(map);
-                ProcessTaskDTO complete = cmWorkflowService.complete(model.getNextTaskId(), dto);
-                ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
-                processTaskDTOS.add(complete);
-                List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
-                if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
-                    WorkflowResultDto workflowResult = resultDto.get(0);
-                    model.setWorkflowProstanceId(workflowResult.getInstanceId());
-                    model.setNextExecuteIds(workflowResult.getNextExecutorRoleIds());
-                    model.setNextTaskId(workflowResult.getNextTaskId());
-                    model.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
-                }
+                map.put("sequenceNbr",model.getSequenceNbr());
+                map.put("op", "0");
+                map.put("comments", "提交");
+                execueFlow(map);
+//                TaskResultDTO dto = new TaskResultDTO();
+//                dto.setResultCode("approvalStatus");
+//                dto.setTaskId(model.getNextTaskId());
+//                HashMap<String, Object> map = new HashMap<>();
+//                map.put("approvalStatus", "提交");
+//                dto.setVariable(map);
+//                ProcessTaskDTO complete = cmWorkflowService.complete(model.getNextTaskId(), dto);
+//                ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
+//                processTaskDTOS.add(complete);
+//                List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
+//                if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
+//                    WorkflowResultDto workflowResult = resultDto.get(0);
+//                    model.setWorkflowProstanceId(workflowResult.getInstanceId());
+//                    model.setNextExecuteIds(workflowResult.getNextExecutorRoleIds());
+//                    model.setNextTaskId(workflowResult.getNextTaskId());
+//                    model.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
+//                    model.setPromoter(reginParams.getUserModel().getUserId());
+//                    // 更新代办
+//                }
+
             }
-            model.setStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode() + "");
-            model.setApplyTime(new Date());
+
         } else {
             // 只有第一次改为待提交
             if (entity == null) {
                 model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
+                // 暂存生成代办逻辑
+                ArrayList<TaskModelDto> list = new ArrayList<>();
+                TaskModelDto dto = new TaskModelDto();
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtil.copyProperties(model, taskMessageDto);
+                // 数据参数
+                dto.setModel(taskMessageDto);
+                // 摘要
+                dto.setTaskContent(String.format("检验检测业务开通办理，【申请单号：%s】", model.getApplicationSeq()));
+                // 申请单号
+                dto.setTaskCode(model.getApplicationSeq());
+                // 业务类型
+                dto.setTaskType(BusinessTypeEnum.JY_OPENING_APPLICATION.getCode());
+                // 业务主键
+                dto.setRelationId(String.valueOf(model.getSequenceNbr()));
+                dto.setNextExecuteUser("");
+                list.add(dto);
+                commonServiceImpl.buildTaskModel(list);
             }
         }
-        if (!isUpdate) {
-            CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
-            model.setUnitCode(companyBo.getCompanyCode());
-            model.setUnitCodeName(companyBo.getCompanyName());
-            List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
-            model.setApplicationSeq(codes.get(0));
-            model.setCreateUserId(reginParams.getUserModel().getUserId());
-            model = this.createWithModel(model);
-            // 暂存生成代办逻辑
-            ArrayList<TaskModelDto> list = new ArrayList<>();
-            TaskModelDto dto = new TaskModelDto();
-            TaskMessageDto taskMessageDto = new TaskMessageDto();
-            BeanUtil.copyProperties(model, taskMessageDto);
-            // 数据参数
-            dto.setModel(taskMessageDto);
-            // 摘要
-            dto.setTaskContent(String.format("检验检测业务开通办理，【申请单号：%s】", model.getApplicationSeq()));
-            // 申请单号
-            dto.setTaskCode(model.getApplicationSeq());
-            // 业务类型
-            dto.setTaskType(String.valueOf(BizTypeEnum.BUSINESS_OPEN.getCode()));
-            // 业务主键
-            dto.setRelationId(String.valueOf(model.getSequenceNbr()));
-            dto.setNextExecuteUser("");
-            list.add(dto);
-            commonServiceImpl.buildTaskModel(list);
-            return model;
-        } else {
-            return this.updateWithModel(model);
-        }
+        model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
+       return this.updateWithModel(model);
 
     }
 
@@ -338,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) {
@@ -504,89 +522,58 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 接收/驳回通知检验单
      */
     public void execueFlow(Map<String, Object> params) {
-        String role = "";
-        String taskName = "流程结束";
+        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();
-        String instanceId = params.get("instanceId").toString();
-        String comments = params.get("comments").toString();
-        try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
-            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-            if (!ValidationUtil.isEmpty(dataObject)) {
-                String taskId = dataObject.getString("id");
-                //组装信息
-                TaskResultDTO dto = new TaskResultDTO();
-                dto.setResultCode("approvalStatus");
-                dto.setTaskId(taskId);
-                HashMap<String, Object> varibalble = new HashMap<>();
-                varibalble.put("approvalStatus", op);
-                dto.setVariable(varibalble);
-                dto.setComment(comments);
-                //执行流程
-                Workflow.taskClient.completeByTask(taskId, dto);
-                // 查询下节点任务
-                Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
-                if ("0".equals(op) && ObjectUtils.isNotEmpty(params.get("originalDataId"))) {
-                    String originalDataId = params.get("originalDataId").toString();
-                    JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
-                    List<String> detectionRegion = (List<String>) params.get("detectionRegion");
-//                String detectionRegionName =  params.get("detectionRegionName").toString();
-                    if(!detectionRegion.isEmpty()){
-                        jyjcOpeningApplication.setDetectionRegion(detectionRegion);
-                    }
-//                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
-//                     if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
-//                         jyjcOpeningApplication.setAcceptDate(new Date());
-//                     }
-                    jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
-                }
-                role = (String) nextNodeInfo.get("role");
-                taskName = (String) nextNodeInfo.get("taskName");
-            }
-            String status;
-            if ("1".equals(op)) {
-                // 如果是回退, 则业务状态改为驳回
-                status = FlowStatusEnum.REJECTED.getCode() + "";
-                params.put("relationId",instanceId);
-                params.put("taskStatus",FlowStatusEnum.TO_BE_FINISHED.getCode());
-                params.put("taskStatusLabel",FlowStatusEnum.TO_BE_FINISHED.getName());
-                TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
-                String json = null;
-                try {
-                    json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                List<Map> list = parseArray(json, Map.class);
-                String url = null;
-                for (Map map : list) {
-                    if (map.get("type").equals("opening" )&& "edit".equals(map.get("pageType"))){
-                        url = map.get("url").toString();
-                    }
-                }
-                taskV2Model.setRoutePath(url);
-                Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
-                String roles = (String) nextNodeInfo.get("role");
-                taskV2Model.setExecuteUserIds(roles);
-
-                commonservice.buildTaskModel(BeanUtil.beanToMap(taskV2Model));
-            } else {
-                if ("流程结束".equals(taskName)) {
-                    status = FlowStatusEnum.TO_BE_FINISHED.getCode() + "";
-                    params.put("taskStatus",FlowStatusEnum.TO_BE_FINISHED.getCode());
-                    params.put("taskStatusLabel",FlowStatusEnum.TO_BE_FINISHED.getName());
-                    TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
-                } else {
-                    status = FlowStatusEnum.TO_BE_PROCESSED.getCode() + "";
+        JyjcOpeningApplication data = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
+        //组装信息
+        TaskResultDTO dto = new TaskResultDTO();
+        dto.setResultCode("approvalStatus");
+        dto.setTaskId(data.getNextTaskId());
+        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<>();
+        processTaskDTOS.add(complete);
+        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, op);
+                data.setNextTaskId(workflowResultDto.getNextTaskId());
+            }else {
+                // 流程结束
+                data.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+                // 更新代办
+                HashMap<String, Object> taskParams = new HashMap<>();
+                taskParams.put("relationId", data.getWorkflowProstanceId());
+                taskParams.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskParams.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                taskParams.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskParams.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                taskParams.put("model", data);
+                commonServiceImpl.updateTaskModel(taskParams);
+                data.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName());
             }
-            Boolean rollBack = "1".equals(op) ? true : false;
-            updateModelByInstanceId(sequenceNbr, instanceId, status, role, rollBack);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("execueFlow error:{}", e);
         }
+        jyjcOpeningApplicationMapper.updateById(data);
     }
 
 
@@ -594,24 +581,30 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 撤回流程办理单
      */
-    public JSONObject stopFlow(String sequenceNbr) {
-        JSONObject jsonObject= new JSONObject();
+    public JyjcOpeningApplication stopFlow(String sequenceNbr) {
         JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
-        try {
-            //撤回流程
-             jsonObject = workflowFeignClient.rollBack(jyjcOpeningApplication.getWorkflowProstanceId());
-            if (ObjectUtils.isEmpty(jsonObject)) {
-
-            }
-            Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(jyjcOpeningApplication.getWorkflowProstanceId());
-            String role = (String) nextNodeInfo.get("role");
-            Long id = Long.parseLong(sequenceNbr);
-            commonservice.deleteTaskModel(jyjcOpeningApplication.getWorkflowProstanceId());
-            updateModelByInstanceId(id, jyjcOpeningApplication.getWorkflowProstanceId(), FlowStatusEnum.ROLLBACK.getCode() + "", role, true);
-        } catch (Exception e) {
-            throw  new BadRequest("撤回流程失败，请联系管理员！");
+        //撤回流程
+        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());
         }
-        return jsonObject;
+        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;
     }
 
     private String getWorkflowStatus(JSONObject dataObject) {
@@ -672,4 +665,78 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     return     jyjcOpeningApplicationMapper.selectOverdueData();
 
     }
+
+
+    public void buildTask(JyjcOpeningApplicationModel model, WorkflowResultDto workflowResultDto) {
+        ReginParams reginParams = commonserviceImpl.getReginParamsOfCurrentUser();
+        // 代办消息
+        ArrayList<TaskModelDto> list = new ArrayList<>();
+        TaskModelDto dto = new TaskModelDto();
+        dto.setTaskType(BusinessTypeEnum.JY_OPENING_APPLICATION.getCode());
+        dto.setTaskTypeLabel(BizTypeEnum.BUSINESS_OPEN.getName());
+        dto.setFlowCreateDate(model.getRecDate());
+        dto.setTaskName(workflowResultDto.getNextTaskName());
+        dto.setTaskCode(workflowResultDto.getNextTaskCode());
+        dto.setTaskContent(String.format("检验检测业务开通办理，【申请单号：%s】", model.getApplicationSeq()));
+        dto.setRelationId(workflowResultDto.getInstanceId());
+        dto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+        dto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+        dto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        dto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+        dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        dto.setStartUserId(reginParams.getUserModel().getUserId());
+        dto.setStartUser(reginParams.getUserModel().getRealName());
+        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyCode());
+        dto.setStartDate(new Date());
+        model.setWorkflowProstanceId(workflowResultDto.getInstanceId());
+        model.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+        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, String op) {
+        // 更新代办状态
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("relationId", model.getWorkflowProstanceId());
+        params.put("flowStatus", model.getStatus());
+        params.put("flowStatusLabel", model.getStatus());
+        params.put("taskStatus", model.getStatus());
+        params.put("taskStatusLabel", model.getStatus());
+        TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
+        // 创建新的代办
+        if (!ObjectUtils.isEmpty(taskV2Model)) {
+            TaskModelDto taskModelDto = new TaskModelDto();
+            BeanUtils.copyProperties(taskV2Model, taskModelDto);
+            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 {
+            JyjcOpeningApplicationModel applicationModel = new JyjcOpeningApplicationModel();
+            BeanUtil.copyProperties(model, applicationModel);
+            buildTask(applicationModel, workflowResultDto);
+        }
+
+    }
 }
\ No newline at end of file

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

-[
+[ {
+  "type":"supervise",
+  "pageType": "draft",
+  "url": "/mixuap?appId=1742358052905971713&id=1734576595978448898&roleIds={roleIds}&userId={userId}&pageType=edit"
+},  {
+  "type":"firstinspect",
+  "pageType": "draft",
+  "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
+},  {
+  "type":"detection",
+  "pageType": "draft",
+  "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
+},
   {
     "type":"supervise",
     "pageType": "look",
@@ -24,15 +36,15 @@
     "pageType": "edit",
     "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
-  "type":"businessOpen",
+  "type":"114",
   "pageType": "draft",
-  "url": "/mixuap?appId=1742358052905971713&id=1734569644833927170&roleIds={roleIds}&userId={userId}&pageType=edit"
+  "url": "/mixuap?appId=1742358052905971713&id=1737319295022559234&roleIds={roleIds}&userId={userId}&pageType=edit"
 },  {
-  "type":"businessOpen",
+  "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":"businessOpen",
+  "type":"114",
   "pageType": "edit",
   "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit"
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/UseInfoMapper.xml

@@ -5,9 +5,9 @@
         UPDATE
             idx_biz_jg_use_info
         SET
-            NEXT_INSPECT_DATE = #{nextInspectDate},
-            LAST_INSPECT_TYPE = #{lastInspectType},
-            LAST_INSPECT_REPORT_NO = #{lastInspectReportNo}
+            "NEXT_INSPECT_DATE" = #{nextInspectDate},
+            "LAST_INSPECT_TYPE" = #{lastInspectType},
+            "LAST_INSPECT_REPORT_NO" = #{lastInspectReportNo}
         WHERE
             RECORD = #{record}