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/dto/JgEquipTransferDto.java

@@ -85,6 +85,9 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "任务名称")
     private String taskName;
 
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
     @ApiModelProperty(value = "流程执行角色")
     private String instanceRoles;
 
@@ -104,6 +107,9 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "设备注册代码")
     private String equCode;
 
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useOrgCode;
+
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
@@ -114,7 +120,7 @@ public class JgEquipTransferDto  extends BaseDto {
     private String useInnerCode;
 
     @ApiModelProperty(value = "设备地址")
-    private String concatenatedAddress;
+    private String equAddress;
 
     @ApiModelProperty(value = "流程建议")
     private String processAdvice;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -103,4 +104,6 @@ public class JgUseRegistrationDto  extends BaseDto {
     private  String dataType  ;
 
     private String unitCode;
+
+    private String isXixian;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -183,4 +183,7 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField(value = "next_execute_user_ids")
     private String nextExecuteUserIds;
+
+    @TableField(value = "is_xixian")
+    private String isXixian;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.java

@@ -33,4 +33,6 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
 
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);
+
+    List<Map<String, Object>> getDetailById(@Param("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -30,4 +30,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
 
     void updatePromoter(@Param("id")Long id);
+
+    List<Map<String, Object>> getDetailById(@Param("id") Long id);
 }

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

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationReformService {
     Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds);
-    JgChangeRegistrationReform save(JSONObject map);
+    List<Map<String, Object>> save(JSONObject map);
     void updateExecuteIds(String instanceId, JgChangeRegistrationReform jgChangeRegistrationReform, String operate, ProcessTaskDTO processTaskDTO);
     void flowExecute(Long id, String instanceId, String operate, String comment);
     void withdraw(String instanceId);

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

@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
-import jdk.nashorn.api.scripting.JSObject;
-
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -57,7 +56,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
+    List<JgMaintainNotice> saveNotice(String submitType, Map<String, Object> 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/IJgReformNoticeService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -56,7 +57,7 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
+    List<JgReformNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
 
     /**
      * 打印告知单

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -20,7 +20,7 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
         ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -140,4 +140,33 @@
         </where>
     </select>
 
+
+        <select id="getDetailById" resultType="java.util.Map">
+            select ur.sequence_nbr as sequenceNbr,
+            ur.audit_status as auditStatus,
+            ur.use_unit_name as useUnitName,
+            ur.use_registration_code as useRegistrationCode,
+            ur.status,
+            ur.receive_org_name as receiveOrgName,
+            DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+            DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+            (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
+            jri.PRODUCT_NAME as productName,
+            jri.EQU_CODE as equCode,
+            use.USE_INNER_CODE as innerCode,
+            concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+            ifnull(ur.instance_id, '') as instanceId,
+            re.equ_id as equipId,
+            ur.apply_no as applyNo,
+            ifnull(ur.next_executor_ids,'') as nextExecutorIds,
+            ur.promoter,
+            ur.next_execute_user_ids as nextExecuteUserIds
+            from tzs_jg_change_registration_reform ur
+            LEFT JOIN tzs_jg_change_registration_reform_eq re  on ur.sequence_nbr = re.equip_transfer_id
+            LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
+            LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
+            LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
+            where ur.sequence_nbr = #{id}
+        </select>
+
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml

@@ -16,7 +16,7 @@
                jri.PRODUCT_NAME                                                                              as productName,
                use.USE_UNIT_NAME                                                                             as useUnitName,
                jed.receive_org_name                                                                          as receiveOrgName,
-               concat(use."PROVINCE_NAME", '-', use."CITY_NAME", '-', use."COUNTY_NAME", '-', use."STREET_NAME", '-', use."ADDRESS") as address,
+               concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME", '', use."ADDRESS") as address,
                use."USE_INNER_CODE"                                                                          as useInnerCode,
                jed.audit_status                                                                              as auditStatus,
                date_format(jed.audit_pass_date, '%Y-%m-%d')                                                  as auditPassDate,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -19,15 +19,13 @@
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
             jet.task_name AS taskName,
-            ri.EQU_LIST AS equList,
-            ri.EQU_CATEGORY AS equCategory,
-            ri.EQU_DEFINE AS equDefine,
             ri.PRODUCT_NAME AS productName,
             ri.BRAND_NAME AS brandName,
             ri.EQU_TYPE AS equType,
             ri.EQU_PRICE AS equPrice,
             ri.PRODUCT_PHOTO AS productPhoto,
             ri.EQU_CODE,
+            ri.use_org_code AS useOrgCode,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -50,9 +48,13 @@
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
             ui.safety_manager AS safetyManager,
             ui.phone AS safetyManagerPhone,
-            CONCAT_WS(', ',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS concatenatedAddress,
+            CONCAT_WS('',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS equAddress,
             ui.USE_INNER_CODE AS useInnerCode,
-            oi.SUPERVISORY_CODE AS supervisoryCode
+            oi.SUPERVISORY_CODE AS supervisoryCode,
+            tec2.name AS equCategory,
+            tec1.name AS equList,
+            tec.name AS equDefine,
+            jet.create_date AS createDate
         FROM
             tzs_jg_equip_transfer jet
             LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
@@ -62,6 +64,9 @@
             LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
             LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
             LEFT JOIN idx_biz_jg_other_info oi ON oi.record = ete.equ_id
+            LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+            LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+            LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
         <where>
             jet.is_delete = false
             <if test="param != null ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -19,7 +19,7 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -161,5 +161,36 @@
         from idx_biz_jg_design_info
         where RECORD = #{id}
     </select>
+    <select id="getDetailById" resultType="java.util.Map">
+        select ur.sequence_nbr                                                        as sequenceNbr,
+               ur.audit_status                                                        as auditStatus,
+               date_format(reg_date, '%Y-%m-%d')                                      as regDate,
+               ur.use_unit_name                                                       as useUnitName,
+               ur.status,
+               other.CODE96333                                                           code96333,
+               ur.receive_org_name                                                    as receiveOrgName,
+               (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+               jri.PRODUCT_NAME                                                       as productName,
+               jri.EQU_CODE                                                           as equCode,
+               use.USE_INNER_CODE                                                     as innerCode,
+               concat(use.PROVINCE_NAME, use.CITY_NAME, use.COUNTY_NAME)    as place,
+               ur.instance_id                                                         as instanceId,
+               re.equ_id                                                              as equipId,
+               ur.apply_no                                                            as applyNo,
+               ur.next_execute_ids                                                    as nextExecuteIds,
+               ur.promoter,
+               ur.supervisory_code                                                    as supervisoryCode,
+               ur.use_registration_code                                               as useRegistrationCode,
+               date_format(ur.audit_pass_date, '%Y-%m-%d')                            as auditPassDate,
+               ur.receive_org_name                                                    as receiveOrgName,
+               ur.next_execute_user_ids                                               as nextExecuteUserIds
+        from tzs_jg_use_registration ur
+                 LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
+                 LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
+                 LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
+                 LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
+        where ur.sequence_nbr = #{id}
+
+    </select>
 
 </mapper>

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

@@ -49,7 +49,7 @@ public class JgChangeRegistrationReformController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增改造变更登记", notes = "新增改造变更登记")
-	public ResponseModel<JgChangeRegistrationReform> save(@RequestBody JSONObject map) {
+	public ResponseModel<Object> save(@RequestBody JSONObject map) {
 	    return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.save(map));
 	}
 	@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/controller/JgEnableDisableController.java

@@ -4,25 +4,17 @@ import com.alibaba.fastjson.JSONObject;
 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.module.jg.api.dto.JgUseRegistrationEqDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.List;
 import java.util.Map;
-
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEnableDisableServiceImpl;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
@@ -54,8 +46,7 @@ public class JgEnableDisableController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        jgEnableDisableServiceImpl.saveOrUpdate(map, reginParams);
-        return ResponseHelper.buildResponse("ok");
+        return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.saveOrUpdate(map, reginParams));
     }
 
     @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/controller/JgEquipTransferController.java

@@ -46,15 +46,14 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
-    public ResponseModel<String> save(@RequestParam("submitType") String submitType, @RequestBody JSONObject model) {
-        jgEquipTransferServiceImpl.saveTransfer(submitType, model, getSelectedOrgInfo());
-        return ResponseHelper.buildResponse("ok");
+    public ResponseModel<Object> save(@RequestParam("submitType") String submitType, @RequestBody JSONObject model) {
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.saveTransfer(submitType, model, getSelectedOrgInfo()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备移交", notes = "根据sequenceNbr更新设备移交")
-    public ResponseModel<JgEquipTransferDto> updateBySequenceNbr(@RequestParam("submitType") String submitType,
+    public ResponseModel<Object> updateBySequenceNbr(@RequestParam("submitType") String submitType,
                                                                  @RequestBody JgEquipTransferDto equipTransferDto,
                                                                  @RequestParam(value = "op", required = false) String op) {
         return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.updateEquipTransfer(submitType, equipTransferDto, op));

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

@@ -47,11 +47,9 @@ public class JgMaintainNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增维修告知", notes = "新增维修告知")
-    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
+    public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
         ReginParams reginParams = getSelectedOrgInfo();
-
-        iJgMaintainNoticeService.saveNotice(submitType, model, reginParams);
-        return ResponseHelper.buildResponse("");
+        return ResponseHelper.buildResponse(iJgMaintainNoticeService.saveNotice(submitType, model, reginParams));
     }
 
     /**

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

@@ -47,10 +47,9 @@ public class JgReformNoticeController extends BaseController {
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/save")
     @ApiOperation (httpMethod = "POST", value = "新增改造告知", notes = "新增改造告知")
-    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
+    public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
         ReginParams reginParams = getSelectedOrgInfo();
-        jgReformNoticeService.saveNotice(submitType, model, reginParams);
-        return ResponseHelper.buildResponse("");
+        return ResponseHelper.buildResponse(jgReformNoticeService.saveNotice(submitType, model, reginParams));
     }
 
 

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

@@ -38,8 +38,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
-        JgUseRegistration data = jgUseRegistrationServiceImpl.save(map);
-        return ResponseHelper.buildResponse(Collections.singletonList(data));
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.save(map));
     }
 
     @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

@@ -110,6 +110,12 @@ public class CommonServiceImpl implements ICommonService {
     //行政审批局redis缓存key
     private static final String ADMINISTRATION_UNIT_TREE = "ADMINISTRATION_UNIT_TREE";
 
+    //管辖机构
+    private static final String REGULATOR_UNIT = "监管机构";
+    //行政审批局
+    private static final String ADMINISTRATION_UNIT = "行政审批局";
+
+
     @Value("${regulator.unit.code}")
     private String code;
 
@@ -280,7 +286,7 @@ public class CommonServiceImpl implements ICommonService {
     public List<LinkedHashMap> creatTree() {
         FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
-        List<LinkedHashMap> treeData = deleteRegulatorTreeData(result);
+        List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
         List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
         List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
         redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
@@ -307,7 +313,7 @@ public class CommonServiceImpl implements ICommonService {
         FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
         List<LinkedHashMap> children = (List<LinkedHashMap>) result.get(0).get("children");
-        List<LinkedHashMap> treeData = deleteTreeData(children);
+        List<LinkedHashMap> treeData = deleteTreeData(children,REGULATOR_UNIT);
         List<LinkedHashMap> resultTree = updateNullChildren(treeData);
         redisUtils.set(ADMINISTRATION_UNIT_TREE, resultTree);
         return resultTree;
@@ -319,16 +325,16 @@ public class CommonServiceImpl implements ICommonService {
         return resourceJson.get(type);
     }
 
-    private List<LinkedHashMap> deleteTreeData(List<LinkedHashMap> result) {
+    private List<LinkedHashMap> deleteTreeData(List<LinkedHashMap> result,String companyType) {
         Iterator it = result.iterator();
         while (it.hasNext()) {
             LinkedHashMap e = (LinkedHashMap) it.next();
             // 删除非行政审批局
-            if (!e.get("companyType").toString().contains("行政审批局")) {
+            if (!e.get("companyType").toString().contains(companyType)) {
                 it.remove();
             }
             if (!ObjectUtils.isEmpty(e.get("children"))) {
-                deleteTreeData((List<LinkedHashMap>) e.get("children"));
+                deleteTreeData((List<LinkedHashMap>) e.get("children"),companyType);
             }
         }
         return result;
@@ -551,13 +557,13 @@ 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(GZGZ_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgReformNoticeService.saveNotice(submitType, jsonObject, reginParams);
+            return jgReformNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.WXGZ.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(WXGZ_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            iJgMaintainNoticeService.saveNotice(submitType, jsonObject, reginParams);
+            return iJgMaintainNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.YZGZ.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -580,7 +586,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             noticeObj.put("techInfo", techInfoObj);
             JSONObject jsonObject = new JSONObject(noticeObj);
-            jgChangeRegistrationReformServiceImpl.save(jsonObject);
+           return jgChangeRegistrationReformServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -592,7 +598,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(DWBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jsonObject, reginParams);
+            return jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.WBBA.getBusinessCode())) {
             noticeObj.put("pageType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -603,7 +609,7 @@ public class CommonServiceImpl implements ICommonService {
             JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
             jsonObject.put("businessCode", type);
-            jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
+            return jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
         } else if (type.contains(ApplicationFormTypeEnum.YZBF.getBusinessCode()) || type.contains(ApplicationFormTypeEnum.ZXBF.getBusinessCode())) {
             noticeObj.put("cancelType", type.equals("BF_ZX") ? "1" : "2");
             noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -621,7 +627,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("formType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
-            jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);
+            return jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);
         }
         return null;
     }

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

@@ -929,6 +929,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+        meBuilder.should(QueryBuilders.matchQuery("STATUS", "已认领"));
         meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
         meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
         meBuilder.minimumShouldMatch(1);

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,10 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
-import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
+import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
@@ -91,7 +93,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
     @Autowired
-    private CommonMapper commonMapper;
+    IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
+    @Autowired
+    IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
+    @Autowired
+    IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
+    @Autowired
+    IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
+    @Autowired
+    IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
+    @Autowired
+    IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
+    @Autowired
+    IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
+    @Autowired
+    IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
 
     /**
      * 分页查询
@@ -106,7 +122,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Transactional
-    public JgChangeRegistrationReform save(JSONObject map) {
+    public List<Map<String, Object>> save(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         UseInfo useInfo = new UseInfo();
         String equipId = map.get("record").toString();
@@ -159,8 +175,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //修改数据
         jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
         //保存历史数据
-        IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
-        jgRegistrationHistory.setOldData(JSONObject.toJSONString(idxBizJgTechParamsElevator));
+//        IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
+//        jgRegistrationHistory.setOldData(JSONObject.toJSONString(idxBizJgTechParamsElevator));
         //设备监管码
         jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
         //数据状态
@@ -229,7 +245,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 //                updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
 //            }
         }
-        return jgChangeRegistrationReform;
+
+        return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
     }
 
     public ProcessTaskDTO startByVariable(JgChangeRegistrationReform jgChangeRegistrationReform) {
@@ -479,9 +496,130 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             //将历史数据更新到技术参数表中
             JSONObject allData = JSONObject.parseObject(newData);
             Map<String, Object> techInfo = (Map<String, Object>) allData.get("techInfo");
+            String equList = techInfo.get("EQU_LIST").toString();
+            //电梯
+            if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
                 IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(JSONObject.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
-            BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew, idxBizJgTechParamsElevator, "sequenceNbr", "record");
-            idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
+
+                IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
+                if (!ValidationUtil.isEmpty(elevator)) {
+                    elevator.setSequenceNbr( String.valueOf(techInfo.get("ELEVATOR_SEQ")));
+                    iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
+                }
+            }
+            // 厂车
+            else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
+                IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class);
+                if (!ValidationUtil.isEmpty(vehicle)) {
+                    vehicle.setSequenceNbr( String.valueOf(techInfo.get("VEHICLE_SEQ")));
+                    iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
+                }
+
+                //主要零部件
+//                List<String> subFormMainPartsList = new ArrayList<>();
+//                subFormMainPartsList.add("subForm_sey164b51a");
+//                subFormMainPartsList.add("subForm_tef7yf5fbr");
+//                mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+            }
+            // 索道
+            else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
+                IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class);
+                if (!ValidationUtil.isEmpty(ropeway)) {
+                    ropeway.setSequenceNbr( String.valueOf(techInfo.get("ROPEWAY_SEQ")));
+                    iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway);
+                }
+
+//                //主要零部件
+//                List<String> subFormMainPartsList = new ArrayList<>();
+//                subFormMainPartsList.add("subForm_5fi0jewuyh");
+//                mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+            }
+            // 游乐设施
+            else if (EquipmentClassifityEnum.YLSS.getCode().equals(equList)) {
+                IdxBizJgTechParamsRides rides = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRides.class);
+                if (!ValidationUtil.isEmpty(rides)) {
+                    rides.setSequenceNbr(String.valueOf(techInfo.get("RIDES_SEQ")));
+                    iIdxBizJgTechParamsRidesService.saveOrUpdateData(rides);
+                }
+            }
+            // 锅炉
+            else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
+                IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class);
+                if (!ValidationUtil.isEmpty(boiler)) {
+                    boiler.setSequenceNbr( String.valueOf(techInfo.get("BOILER_SEQ")));
+                    iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
+                }
+
+                //主要零部件
+//                List<String> subFormMainPartsList = new ArrayList<>();
+//                subFormMainPartsList.add("subForm_1hh88r4m69");
+//                mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+            }
+            // 压力容器
+            else if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
+                IdxBizJgTechParamsVessel vessel = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVessel.class);
+                if (!ValidationUtil.isEmpty(vessel)) {
+                    vessel.setSequenceNbr(String.valueOf(techInfo.get("VESSEL_SEQ")));
+                    iIdxBizJgTechParamsVesselService.saveOrUpdateData(vessel);
+                }
+
+//                //主要零部件
+//                List<String> subFormMainPartsList = new ArrayList<>();
+//                subFormMainPartsList.add("subForm_fie04854f2");
+//                mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+//
+//                //安全附件
+//                List<String> subFormProtectionDevicesList = new ArrayList<>();
+//                subFormProtectionDevicesList.add("subForm_d4xdzhsgdj");
+//                protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
+
+            }
+            // 压力管道
+            else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
+                IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class);
+                if (!ValidationUtil.isEmpty(pipeline)) {
+                    pipeline.setSequenceNbr( String.valueOf(techInfo.get("PIPELINE_SEQ")));
+                    iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
+                }
+
+//                //主要零部件
+//                List<String> subFormMainPartsList = new ArrayList<>();
+//                subFormMainPartsList.add("subForm_9n7nu55z8r");
+//                mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+            }
+            // 起重机械
+            else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
+                IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class);
+                if (!ValidationUtil.isEmpty(lifting)) {
+                    lifting.setSequenceNbr( String.valueOf(techInfo.get("LIFTING_SEQ")));
+                    iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
+                }
+
+//                //主要零部件
+//                List<String> subFormMainPartsList = new ArrayList<>();
+//                subFormMainPartsList.add("subForm_bqirdyvztt");
+//                mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+//
+//                //安全附件
+//                List<String> subFormProtectionDevicesList = new ArrayList<>();
+//                subFormProtectionDevicesList.add("subForm_29yy3pdzhl");
+//                subFormProtectionDevicesList.add("subForm_h5h4x0zhur");
+//                protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
+
+            }
+
+            //八大类技术参数和主要零部件和安全附件表
+//            if (!ValidationUtil.isEmpty(mainPartsList)) {
+//                iIdxBizJgMainPartsService.saveOrUpdateBatchData(mainPartsList);
+//            }
+//            if (!ValidationUtil.isEmpty(protectionDevicesList)) {
+//                iIdxBizJgProtectionDevicesService.saveOrUpdateBatchData(protectionDevicesList);
+//            }
+
+
             //将历史数据回填到历史记录表中
             jgRegistrationHistory.setChangeData(newData);
             jgRegistrationHistory.setOldData(historyData);

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

@@ -86,7 +86,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     ICmWorkflowService iCmWorkflowService;
 
     @Transactional(rollbackFor = Exception.class)
-    public void saveOrUpdate(JSONObject map, ReginParams reginParams) {
+    public List<JgEnableDisable> saveOrUpdate(JSONObject map, ReginParams reginParams) {
         JgEnableDisable jgEnableDisable = new JgEnableDisable();
         if (!"null".equals(String.valueOf(map.get("sequenceNbr")))) {
             jgEnableDisable = this.baseMapper.selectById(String.valueOf(map.get("sequenceNbr")));
@@ -211,7 +211,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
             jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
         }
-
+        return Collections.singletonList(jgEnableDisable);
     }
 
     /**

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

@@ -69,7 +69,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @param reginParams   redis信息
      */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
-    public void saveTransfer(String submitType, JSONObject jsonObjectMap, ReginParams reginParams) {
+    public List<JgEquipTransfer> saveTransfer(String submitType, JSONObject jsonObjectMap, ReginParams reginParams) {
         JgEquipTransferDto model = JSON.parseObject(JSONObject.toJSONString(jsonObjectMap), JgEquipTransferDto.class);
 
         convertField(model);
@@ -111,6 +111,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
         List<JgEquipTransferEq> jgEquipTransferEqList = this.buildJgEquipTransferEqList(equipTransferEqList, transferList);
         jgEquipTransferEqMapper.insertBatchSomeColumn(jgEquipTransferEqList);
+        return transferList;
     }
 
     /**
@@ -215,7 +216,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())
                 .startDate(taskV2Model.getStartDate())
-                //.pageType("edit")
+                .pageType(statusEnum.getCode() == 6614 ? "edit" : "look")
                 .model(taskMessageDto)
                 .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
                 .build();

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

@@ -397,7 +397,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, Object> jgMaintainNoticeDtoMap, ReginParams reginParams) {
+    public List<JgMaintainNotice> saveNotice(String submitType, Map<String, Object> jgMaintainNoticeDtoMap, ReginParams reginParams) {
 
         JgMaintainNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgMaintainNoticeDtoMap.get(TABLE_PAGE_ID)), JgMaintainNoticeDto.class);
 
@@ -470,6 +470,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
         }).collect(Collectors.toList());
         jgMaintainNoticeEqMapper.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/JgReformNoticeServiceImpl.java

@@ -376,7 +376,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, Object> JgReformNoticeDtoMap, ReginParams reginParams) {
+    public List<JgReformNotice> saveNotice(String submitType, Map<String, Object> JgReformNoticeDtoMap, ReginParams reginParams) {
         JgReformNoticeDto model = JSON.parseObject(JSONObject.toJSONString(JgReformNoticeDtoMap.get(TABLE_PAGE_ID)), JgReformNoticeDto.class);
         convertField(model);
         // 获取告知设备列表
@@ -459,7 +459,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }).collect(Collectors.toList());
 
         jgReformNoticeEqMapper.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/JgScrapCancelServiceImpl.java

@@ -667,12 +667,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
         JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
 
-        ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(jgScrapCancelEq.getEquId()));
-        String newUseRegistrationCertificateNumber = responseModel.getResult().split("-")[0];
+//        ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(jgScrapCancelEq.getEquId()));
+//        String newUseRegistrationCertificateNumber = responseModel.getResult().split("-")[0];
 
         Map<String, Map<String, Object>> resultMap = new HashMap<>();
         Map<String, Object> map1 = new HashMap<>();
-        map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
+//        map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
         if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
             IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
             idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));

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

@@ -26,19 +26,10 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 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.IdxBizJgRegisterInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
+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;
@@ -74,7 +65,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
     @Autowired
-    private OtherInfoMapper otherInfoMapper;
+    private IdxBizJgOtherInfoMapper otherInfoMapper;
     @Autowired
     private JgUseRegistrationEqMapper jgRelationEquipMapper;
     @Autowired
@@ -129,6 +120,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
         // 更新设备使用登记证
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
+        // 更新es
+        createCode(String.valueOf(map.get("equipId")), map);
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
@@ -154,14 +147,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     @Transactional
-    public JgUseRegistration save(JSONObject map) {
+    public List<Map<String, Object>> save(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
         jgUseRegistration.setRegDate(new Date());
-        LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
-        otherLambda.eq(OtherInfo::getRecord, map.get("equipId"));
-        OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+        LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+        otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
+        IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
         String supervisoryCode = otherInfo.getSupervisoryCode();
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
@@ -182,6 +175,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
             jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
         }
+        // 是否西咸
+        if (!ObjectUtils.isEmpty(map.get("isXixian"))){
+            jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
+        }
 
 
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
@@ -260,7 +257,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             list.add(dto);
             commonServiceImpl.buildTaskModel(list);
         }
-        return jgUseRegistration;
+        return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
     }
 
     public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {
@@ -648,4 +645,51 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         //调用生成使用登记证
         commonService.generateCertificateReport(exportParamsMap, response);
     }
+
+    /**
+     * 生成监管码、96333码
+     *
+     * @param record
+     */
+    public void createCode(String record, JSONObject dataMap) {
+        // 其他信息
+        LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+        lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
+        IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
+        if (ObjectUtils.isEmpty(otherInfo.getCode96333()) || ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
+            // 使用信息
+            LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
+            lambda.eq(UseInfo::getRecord, record);
+            UseInfo useInfo = useInfoMapper.selectOne(lambda);
+            // 注册信息
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
+            IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
+            // 生成监管码、96333码
+            Map<String, Object> map = new HashMap<>();
+            map.put("cityCode", useInfo.getCity());
+            map.put("countyCode", useInfo.getCounty());
+            map.put("equCategory", registerInfo.getEquCategory());
+            map.put("isXiXian", dataMap.get("isXixian"));
+            ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
+            Map<String, Object> result = code.getResult();
+            if (!ObjectUtils.isEmpty(result)) {
+                otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
+                otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
+                otherInfo.setClaimStatus("已认领");
+                otherInfoMapper.updateById(otherInfo);
+            }
+        }
+        // 更新es
+        HashMap<String, Map<String, Object>> objMap = new HashMap<>();
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
+        param.put("CODE96333", otherInfo.getCode96333());
+        param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
+        param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
+        param.put("CITY", dataMap.get("city"));
+        param.put("COUNTY", dataMap.get("county"));
+        objMap.put(record, param);
+        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java

@@ -29,6 +29,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("inspection_unit_code")
     private String inspectionUnitCode;
 
+	@TableField("inspection_unit_name")
+    private String inspectionUnitName;
+
     /**
      * 检验检测类型
      */
@@ -83,6 +86,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("inspection_charge_person")
     private String inspectionChargePerson;
 
+	@TableField("inspection_charge_person_name")
+    private String inspectionChargePersonName;
+
     /**
      * 项目负责人联系电话（检验员联系电话）
      */
@@ -113,6 +119,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("application_unit_code")
     private String applicationUnitCode;
 
+	@TableField("application_unit_name")
+    private String applicationUnitName;
+
 	/**
      * 内部人员代码
      * */
@@ -187,5 +196,5 @@ public class JyjcInspectionApplication extends BaseEntity {
     private String nextTaskId;
 
     @TableField(value = "next_execute_user_ids")
-    private String nextExcuteUserIds;
+    private String nextExecuteUserIds;
 }

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

@@ -57,6 +57,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "项目负责人(检验员)")
     private String inspectionChargePerson;
+    @ApiModelProperty(value = "项目负责人(检验员)")
+    private String inspectionChargePersonName;
 
     @ApiModelProperty(value = "项目负责人联系电话（检验员联系电话）")
     private String inspectionChargePhone;
@@ -115,38 +117,6 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "内部人员代码")
     private String innerPersonCode;
 
-    @ApiModelProperty(value = "告知书")
-    private List<Map<String, Object>> gzs;
-    @ApiModelProperty(value = "产品质量证明书")
-    private List<Map<String, Object>> cpzl;
-    @ApiModelProperty(value = "施工自行检查报告")
-    private List<Map<String, Object>> sgzxbg;
-    @ApiModelProperty(value = "施工合同或证明")
-    private List<Map<String, Object>> sght;
-    @ApiModelProperty(value = "施工方案/施工设计文件")
-    private List<Map<String, Object>> sgfa;
-    @ApiModelProperty(value = "施工单位许可证书")
-    private List<Map<String, Object>> sgdwxk;
-    @ApiModelProperty(value = "型式试验证书")
-    private List<Map<String, Object>> xssy;
-    @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
-    private List<Map<String, Object>> xsqts;
-    @ApiModelProperty(value = "土建声明")
-    private List<Map<String, Object>> tjsm;
-    @ApiModelProperty(value = "质量保证手册和程序文件")
-    private List<Map<String, Object>> zlbz;
-    @ApiModelProperty(value = "施工作业文件")
-    private List<Map<String, Object>> sgzy;
-    @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
-    private List<Map<String, Object>> sgry;
-    @ApiModelProperty(value = "产品技术文件")
-    private List<Map<String, Object>> cpjs;
-    @ApiModelProperty(value = "施工设计文件")
-    private List<Map<String, Object>> sgsj;
-    @ApiModelProperty(value = "施工分包方目录")
-    private List<Map<String, Object>> sgfb;
-    @ApiModelProperty(value = "分包方评价资料")
-    private List<Map<String, Object>> fbspj;
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private List<Map<String, Object>> equip;
 
@@ -176,6 +146,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String supervisoryCode;
 
 
+
+
     private String instanceId;
 
     public String getInstanceId() {

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

@@ -60,4 +60,9 @@ public class TaskMessageDto {
     String equipId;
 
     String processKey;
+
+    String processInstanceId;
+
+    String inspectionUnitCode;
+    String bizType;
 }

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

@@ -5,7 +5,7 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        tzjia.*
+        tzjia.*,
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
         cdd.NAME AS equipClassify,
@@ -68,17 +68,13 @@
 
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        tzjia.*
+        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'
@@ -103,6 +99,9 @@
             <if test="jyjcInspectionApplicationModel.inspectionChargePerson != null and jyjcInspectionApplicationModel.inspectionChargePerson != ''">
                 and tzjia.inspection_charge_person like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePerson},'%')
             </if>
+            <if test="jyjcInspectionApplicationModel.inspectionChargePersonName != null and jyjcInspectionApplicationModel.inspectionChargePersonName != ''">
+                and tzjia.inspection_charge_person_name like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePersonName},'%')
+            </if>
             <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
                 and tzjia.status = #{jyjcInspectionApplicationModel.status}
             </if>

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

@@ -54,6 +54,9 @@ public class CommonController extends BaseController {
     @PostMapping(value = "/getUserPhonesByPersonCode")
     @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员联系电话", notes = "根据公司的unitCode获取检测检验人员联系电话")
     public ResponseModel<Map<String,Object>> getUserPhonesByPersonCode(@RequestParam String unitCode) {
+        if (unitCode.contains("_")) {
+            unitCode = unitCode.split("_")[0];
+        }
         List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
         if (CollectionUtils.isEmpty(userPhones)){
             return null;
@@ -70,6 +73,9 @@ public class CommonController extends BaseController {
     @PostMapping(value = "/getInnerPersonCodeByPersonCode")
     @ApiOperation(httpMethod = "POST", value = "根据公司的unitCode获取检测检验人员内部编号", notes = "根据公司的unitCode获取检测检验人员内部编号")
     public ResponseModel<Map<String,Object>> getInnerPersonCodeByPersonCode(@RequestParam String unitCode) {
+        if (unitCode.contains("_")) {
+            unitCode = unitCode.split("_")[0];
+        }
         List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
         if (CollectionUtils.isEmpty(userPhones)){
             return null;

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 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;
@@ -24,9 +26,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author system_generator
@@ -55,7 +55,7 @@ public class JyjcInspectionApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JyjcInspectionApplicationModel> save(@RequestBody JSONObject model) {
+	public ResponseModel<List<JyjcInspectionApplicationModel>> save(@RequestBody JSONObject model) {
     	if (model.containsKey(basic)) {
 			JSONObject finallyJson = new JSONObject();
 			Map<String, Object> basicObj = (Map<String, Object>) model.get(basic);
@@ -76,7 +76,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 					return CommonResponseUtil.failure("未选择报检设备时不可提交");
 			}
 		}
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.save(model));
+		return ResponseHelper.buildResponse(Collections.singletonList(jyjcInspectionApplicationServiceImpl.save(model)));
     }
 
 

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

@@ -69,6 +69,9 @@ public class TaskModelServiceImpl {
             if (flag){
                 List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
                 if (CollectionUtil.isNotEmpty(result) && result.size() > 0){
+                    TaskV2Model taskV2Model = result.get(0);
+                    taskV2Model.setTaskContent(obj.getTaskContent());
+                    Systemctl.taskV2Client.update(taskV2Model,taskV2Model.getSequenceNbr());
                     break;
                 }
             }
@@ -129,6 +132,15 @@ public class TaskModelServiceImpl {
     }
 
 
+    public void updateTaskContentById(Map<String, Object> params){
+        List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
+        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(collect)) {
+            collect.get(0).setTaskContent(params.getOrDefault("taskContent", "").toString());
+            Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
+        }
+    }
+
     /**
      * 待办编辑接口
      * 参数

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSON;
@@ -135,6 +136,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 dto.setBusinessKey(String.valueOf(new Date().getTime()));
                 dto.setCompleteFirstTask(true);
                 list.add(dto);
+                String[] inspectionUnit = model.getInspectionUnitCode().split("_");
+                model.setInspectionUnitCode(inspectionUnit[0]);
+                model.setInspectionUnitName(inspectionUnit[1]);
+
                 actWorkflowBatchDTO.setProcess(list);
                 dto.setNextExecuteUserCompanyCode(model.getInspectionUnitCode());
                 processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -175,7 +180,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
             model.setPromoter(reginParams.getUserModel().getUserId());
-
+            model.setApplicationUnitName(reginParams.getCompany().getCompanyName());
 
             jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             List<JyjcInspectionApplicationEquip>  equipInfos = new ArrayList<>();
@@ -198,14 +203,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
             if (null == model.getSequenceNbr()){
                 model = this.createWithModel(model);
-            }else {
-                model = this.updateWithModel(model);
-            }
-
-
                 if (StringUtils.isNotBlank(model.getProcessInstanceId())){
                     this.createdTaskModel(model);
-            }else {
+                } else {
                     TaskModelDto dto = new TaskModelDto();
                     TaskMessageDto ta = new TaskMessageDto();
                     ta.setInstanceId(model.getProcessInstanceId());
@@ -213,6 +213,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     ta.setPromoter(model.getPromoter());
                     ta.setNextExecuteUserIds(model.getNextExecuteUserIds());
                     ta.setSequenceNbr(model.getSequenceNbr());
+                    ta.setProcessInstanceId(model.getProcessInstanceId());
+                    ta.setProcessKey(model.getProcessKey());
+                    ta.setCreateUserId(RequestContext.getExeUserId());
                     dto.setModel(ta);
                     //摘要 按原有规则组装
                     dto.setTaskContent("来自"+model.getEquList()+"【"+model.getSupervisoryCode()+"】的业务办理,【申请单号:"+model.getApplicationNo()+"】");
@@ -224,6 +227,21 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     dto.setRelationId(model.getSequenceNbr()+"");
                     taskModelService.buildTaskModel(Arrays.asList(dto));
                 }
+            }else {
+                model = this.updateWithModel(model);
+
+                if (StringUtils.isNotBlank(model.getProcessInstanceId()) && model.getOperationType().equals("0")){
+                    taskModelService.deleteTaskModel(model.getSequenceNbr()+"");
+                    this.createdTaskModel(model);
+                } else {
+
+                    String taskContent="来自"+model.getEquList()+"【"+model.getSupervisoryCode()+"】的业务办理,【申请单号:"+model.getApplicationNo()+"】";
+                    taskModelService.updateTaskContentById(MapBuilder.<String,Object>create().put("taskContent",taskContent).
+                            put("relationId",model.getSequenceNbr()+"").build());
+                }
+            }
+
+
 
             //保存报检装备监管码
             for (JyjcInspectionApplicationEquip equipInfo : equipInfos) {
@@ -310,6 +328,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
             List<WorkflowResultDto> workflowResultDtos = taskModelService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
             String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+            String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
             if(processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() >0){
                 taskCode = processTaskDTO.getNextTask().get(0).getKey();
                 taskName1 = processTaskDTO.getNextTask().get(0).getName();
@@ -326,8 +345,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode()));
             model.setStatusName(FlowStatusEnum.TO_SUBMITTED.getName());
             model.setNextTaskName(taskName1);
+            model.setNextExecuteIds(executorRoleIds);
             executeOneStep(model, taskName1, nextUserIds);
-            model.setNextExecuteIds(nextUserIds);
             this.updateWithModel(model);
         }
         return model;
@@ -486,25 +505,70 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      */
     @Transactional(rollbackFor = Exception.class)
     public void doReceive(Map<String, Object> params) {
-        execueFlow(params);
+
+        Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
+        LambdaQueryWrapper<JyjcInspectionApplication> lambda = new QueryWrapper<JyjcInspectionApplication>().lambda();
+        lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr);
+        JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda);
+
+        ArrayList<String> roleList = new ArrayList<>();
+        String taskId = entity.getNextTaskId();
+        //组装信息
+        TaskResultDTO task = new TaskResultDTO();
+        task.setResultCode("approvalStatus");
+        task.setTaskId(taskId);
+        task.setComment("");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("approvalStatus", "0");
+        task.setVariable(map);
+        //执行流程
+        task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode());
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+        entity.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+        JyjcInspectionApplicationModel model = new JyjcInspectionApplicationModel();
+        model.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName());
+        entity.setAcceptDate(new Date());
+        entity.setInnerPersonCode(params.getOrDefault("innerPersonCode","").toString());
+        String processDescription =  (String)params.get("comments");
+        if (StringUtils.isNotBlank(processDescription)) {
+            entity.setProcessDescription(processDescription);
+        }
+        List<String> persons = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePerson")), String.class);
+        if (CollectionUtil.isNotEmpty(persons)){
+
+            List<String> personCodes = new ArrayList<>();
+            List<String> personNames = new ArrayList<>();
+            for (String person : persons) {
+                String[] s = person.split("_");
+                personCodes.add(s[0]);
+                personNames.add(s[1]);
+            }
+            String inspectionChargePerson = persons == null?"":String.join(",",persons);
+            if (StringUtils.isNotBlank(inspectionChargePerson)) {
+                entity.setInspectionChargePerson(String.join(",",personCodes));
+                entity.setInspectionChargePersonName(String.join(",",personNames));
+            }
+        }
+
+        String inspectionChargePhone = (String)params.get("inspectionChargePhone");
+        if (StringUtils.isNotBlank(inspectionChargePhone)) {
+            entity.setInspectionChargePhone(inspectionChargePhone);
+        }
+        this.updateById(entity);
+
+        BeanUtils.copyProperties(entity,model);
+        updateTaskModel(model);
+
         // 执行接收业务
         String type = (String) params.get("type");
-        Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
-        params.put("status", FlowStatusEnum.TO_BE_FINISHED.getCode() + "");
-        String op = params.get("op").toString();
-        Boolean rollBack = "1".equals(op) ? true : false;
-        updateModelByInstanceId(sequenceNbr, inspectionApplicationModel.getProcessInstanceId(), params, rollBack);
+
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {
             log.warn("JyjcInspectionApplicationModel Not Found！");
             return;
         }
 
-        params.put("relationId",inspectionApplicationModel.getProcessInstanceId());
-        params.put("taskStatus",FlowStatusEnum.TO_BE_FINISHED.getCode());
-        params.put("taskStatusLabel",FlowStatusEnum.TO_BE_FINISHED.getName());
-        TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
 
         List<JyjcInspectionResult> resultModels = new ArrayList(applicationEquipModels.size());
         //List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size());
@@ -546,44 +610,63 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      * @date 2023/12/15 15:14
      */
     public Boolean doReject(Map<String, Object> params) {
-        execueFlow(params);
-        String instanceId = Optional.ofNullable(params.get("instanceId")).orElse("").toString();
-        String op = params.get("op").toString();
+
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
+        LambdaQueryWrapper<JyjcInspectionApplication> lambda = new QueryWrapper<JyjcInspectionApplication>().lambda();
+        lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr);
+        JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda);
+        ArrayList<String> roleListAll = new ArrayList<>();
+        ArrayList<String> roleListNext = new ArrayList<>();
+        ArrayList<String> roleList = new ArrayList<>();
+        String taskId = entity.getNextTaskId();
+        //组装信息
+        TaskResultDTO task = new TaskResultDTO();
+        task.setResultCode("approvalStatus");
+        task.setTaskId(taskId);
+        task.setComment("");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("approvalStatus", "1");
+        task.setVariable(map);
+        //执行流程
+        task.setNextExecuteUserCompanyCode(entity.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));
 
-        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);
-        JyjcInspectionApplicationModel model = this.queryBySeq(sequenceNbr);
-        String json = null;
-        try {
-            json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
-        } catch (IOException e) {
-            e.printStackTrace();
+        entity.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+        JyjcInspectionApplicationModel model = new JyjcInspectionApplicationModel();
+        BeanUtils.copyProperties(entity,model);
+        model.setStatusName(FlowStatusEnum.REJECTED.getName());
+        String processDescription =  (String)params.get("comments");
+        if (StringUtils.isNotBlank(processDescription)) {
+            entity.setProcessDescription(processDescription);
         }
-        List<Map> list = parseArray(json, Map.class);
-        String url = null;
-        for (Map map : list) {
-            if (map.get("type").equals(model.getBizType() )&& "edit".equals(map.get("pageType"))){
-                url = map.get("url").toString();
+        String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+        String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
+        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() + "," + String.join(",", roleList));
+        } else {
+            model.setWorkflowRole(String.join(",", roleList));
         }
-        taskV2Model.setRoutePath(url);
-        Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
-        String role = (String) nextNodeInfo.get("role");
-        taskV2Model.setExecuteUserIds(role);
-        Map<String, Object> map = BeanUtil.beanToMap(taskV2Model);
-        map.put("instanceId",taskV2Model.getRelationId());
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-
-        map.put("userId",reginParams.getUserModel().getUserId());
-        map.put("executeUserIds",taskV2Model.getStartUserId());
-        commonservice.buildTaskModel(map);
+        model.setNextTaskId(nextTaskId);
+        model.setPromoter(RequestContext.getExeUserId());
+        model.setNextTaskName(taskName1);
+        model.setNextExecuteIds(executorRoleIds);
+        model.setNextExecuteUserIds(nextUserIds);
+        executeOneStep(model, taskName1, nextUserIds);
+        BeanUtils.copyProperties(model,entity);
+        this.updateById(entity);
 
-        params.put("status", FlowStatusEnum.REJECTED.getCode() + "");
-        Boolean rollBack = "1".equals(op) ? true : false;
-        updateModelByInstanceId(sequenceNbr, instanceId, params, rollBack);
+      //  updateModelByInstanceId(sequenceNbr, instanceId, params, rollBack);
         return true;
     }
 
@@ -684,17 +767,19 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
        // List<String> phones = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePhone")), String.class);
 
         String inspectionChargePerson = persons == null?"":String.join(",",persons);
-        String inspectionChargePhone = (String)params.get("inspectionChargePhone");
-        String processDescription =  (String)params.get("comments");
         if (StringUtils.isNotBlank(inspectionChargePerson)) {
             entity.setInspectionChargePerson(inspectionChargePerson);
         }
-        if (StringUtils.isNotBlank(inspectionChargePhone)) {
-            entity.setInspectionChargePhone(inspectionChargePhone);
-        }
+
+        String processDescription =  (String)params.get("comments");
         if (StringUtils.isNotBlank(processDescription)) {
             entity.setProcessDescription(processDescription);
         }
+        String inspectionChargePhone = (String)params.get("inspectionChargePhone");
+        if (StringUtils.isNotBlank(inspectionChargePhone)) {
+            entity.setInspectionChargePhone(inspectionChargePhone);
+        }
+
         Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
         String role = (String) nextNodeInfo.get("role");
         entity.setNextExecuteIds(role);
@@ -736,9 +821,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         ta.setInstanceId(model.getProcessInstanceId());
         ta.setStatus(model.getStatus());
         ta.setPromoter(model.getPromoter());
-        ta.setNextExecuteUserIds(model.getNextExecuteUserIds());
+        ta.setNextExecuteIds(model.getNextExecuteIds());
         ta.setSequenceNbr(model.getSequenceNbr());
+        ta.setProcessInstanceId(model.getProcessInstanceId());
         ta.setProcessKey(model.getProcessKey());
+        ta.setInspectionUnitCode(model.getInspectionUnitCode());
+        ta.setBizType(model.getBizType());
         dto.setModel(ta);
         dto.setFlowCreateDate(new Date());
         dto.setTaskName(model.getNextTaskName());
@@ -753,7 +841,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         dto.setFlowStatus(Integer.valueOf(model.getStatus()));
         dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         dto.setStartUserId(RequestContext.getExeUserId());
-        dto.setStartUser(model.getCreateUserId());
+        dto.setStartUser(reginParams.getUserModel().getRealName());
         dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
         dto.setStartDate(new Date());
         dto.setNextExecuteUser(model.getNextExecuteIds());
@@ -780,11 +868,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         //  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())){
+        if (model.getStatus().equals(FlowStatusEnum.REJECTED.getCode()+"")){
             modelDto.setPageType("edit");
         }
         TaskMessageDto obj = new TaskMessageDto();
@@ -793,6 +880,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         obj.setPromoter(model.getPromoter());
         obj.setNextExecuteUserIds(model.getNextExecuteUserIds());
         obj.setSequenceNbr(model.getSequenceNbr());
+        obj.setNextExecuteIds(model.getNextExecuteIds());
+        obj.setProcessInstanceId(model.getProcessInstanceId());
+        obj.setProcessKey(model.getProcessKey());
+        obj.setInspectionUnitCode(model.getInspectionUnitCode());
+        obj.setBizType(model.getBizType());
+        obj.setCreateUserId(model.getCreateUserId());
         modelDto.setModel(obj);
         // 再插入新代办、数据待定
         taskModelService.buildTaskModel(Collections.singletonList(modelDto));
@@ -801,7 +894,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     private TaskV2Model updateTaskModel(JyjcInspectionApplicationModel model) {
         Map<String, Object> params = new HashMap<>();
-        params.put("relationId",model.getInstanceId());
+        params.put("relationId",model.getProcessInstanceId());
         params.put("taskStatus", model.getStatus());
         params.put("taskStatusLabel", model.getStatusName());
         params.put("flowStatus",model.getStatus());

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

@@ -106,7 +106,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             model.setApplicationUnitCode(reginParams.getCompany().getCompanyCode());
         }
         Page<JyjcInspectionResultModel> resultPage = resultMapper.selectJyjcInspectionResultpPage(page, model);
-        resultPage.getRecords().stream().forEach(v -> {
+        resultPage.getRecords().forEach(v -> {
             if (ResultStatusEnum.NO_RESULT.getCode().equals(v.getResultStatus())) {
                 v.setResultStatusName(ResultStatusEnum.NO_RESULT.getName());
             }

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

@@ -170,7 +170,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 map.put("sequenceNbr",model.getSequenceNbr());
                 map.put("op", "0");
                 map.put("comments", "提交");
-                execueFlow(map);
+                JyjcOpeningApplication jyjcOpeningApplication = execueFlow(map);
+                model.setNextTaskId(jyjcOpeningApplication.getNextTaskId());
 //                TaskResultDTO dto = new TaskResultDTO();
 //                dto.setResultCode("approvalStatus");
 //                dto.setTaskId(model.getNextTaskId());
@@ -521,7 +522,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
-    public void execueFlow(Map<String, Object> params) {
+    public JyjcOpeningApplication execueFlow(Map<String, Object> params) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         String op = params.get("op").toString();
@@ -559,8 +560,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 updateTask(data, workflowResultDto, op);
                 data.setNextTaskId(workflowResultDto.getNextTaskId());
             }else {
+
                 // 流程结束
                 data.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+                //更新办理日期
+                data.setAcceptDate( new Date());
                 // 更新代办
                 HashMap<String, Object> taskParams = new HashMap<>();
                 taskParams.put("relationId", data.getWorkflowProstanceId());
@@ -574,6 +578,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             }
         }
         jyjcOpeningApplicationMapper.updateById(data);
+        // 已完成 作废逻辑
+        if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(data.getStatus())){
+            doDiscard(data.getUnitCode(), data.getSequenceNbr());
+        }
+        return data;
     }
 
 
@@ -686,7 +695,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         dto.setStartUserId(reginParams.getUserModel().getUserId());
         dto.setStartUser(reginParams.getUserModel().getRealName());
-        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyCode());
+        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
         dto.setStartDate(new Date());
         model.setWorkflowProstanceId(workflowResultDto.getInstanceId());
         model.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());

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

 [ {
-  "type":"supervise",
+  "type":"115",
   "pageType": "draft",
   "url": "/mixuap?appId=1742358052905971713&id=1734576595978448898&roleIds={roleIds}&userId={userId}&pageType=edit"
 },  {
-  "type":"firstinspect",
+  "type":"116",
   "pageType": "draft",
   "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
 },  {
-  "type":"detection",
+  "type":"117",
   "pageType": "draft",
   "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
 },
   {
-    "type":"supervise",
+    "type":"115",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
-    "type":"firstinspect",
+    "type":"116",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
-    "type":"detection",
+    "type":"117",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
-    "type":"supervise",
+    "type":"115",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
-    "type":"firstinspect",
+    "type":"116",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
-    "type":"detection",
+    "type":"117",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
   "type":"114",
   "pageType": "draft",

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

@@ -365,6 +365,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     private final static String CHECK_CODE_EQU_CODE = "EQU_CODE_";
     //一码通checkCode中使用登记证编号redis key
     private final static String CHECK_CODE_USE_ORG_CODE = "USE_ORG_CODE_";
+
+    //管辖机构
+    private static final String REGULATOR_UNIT = "监管机构";
     //一码通checkCode中redis key过期时间
     private long time = 300l;
 
@@ -524,13 +527,28 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     public List<LinkedHashMap> creatTree() {
         FeignClientResult tree = privilegeFeginService.tree(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
-        List<LinkedHashMap> treeData = deleteRegulatorTreeData(result);
+        List<LinkedHashMap> treeData = deleteTreeData(result,REGULATOR_UNIT);
         List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
         List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
         redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
         return resultTree;
     }
 
+    private List<LinkedHashMap> deleteTreeData(List<LinkedHashMap> result,String companyType) {
+        Iterator it = result.iterator();
+        while (it.hasNext()) {
+            LinkedHashMap e = (LinkedHashMap) it.next();
+            // 删除非对应类型
+            if (!e.get("companyType").toString().contains(companyType)) {
+                it.remove();
+            }
+            if (!ObjectUtils.isEmpty(e.get("children"))) {
+                deleteTreeData((List<LinkedHashMap>) e.get("children"),companyType);
+            }
+        }
+        return result;
+    }
+
     /**
      * 将管辖机构树中children为[]的修改为null
      *