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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/CompanyBo.java

@@ -21,8 +21,17 @@ public class CompanyBo {
     private Long sequenceNbr;
     private String regionCode;
     private String companyCode;
+    private String companyType;
     private List<CompanyBo> children;
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
     public String getAddress() {
         return address;
     }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -28,8 +28,14 @@ public class BaseController {
     @Autowired
     protected HttpServletRequest request;
 
+    /**
+     * 企业
+     */
     public static final String COMPANY_TYPE_COMPANY = "company";
 
+    /**
+     * 监管/行政审批局
+     */
     public static final String COMPANY_TYPE_SUPERVISION = "supervision";
 
 

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

@@ -138,7 +138,7 @@ public class JgMaintenanceContractDto extends BaseDto {
     private List<String> roleIds;
 
     /**
-     *工作流下一节点任务id
+     * 工作流下一节点任务id
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
@@ -147,4 +147,14 @@ public class JgMaintenanceContractDto extends BaseDto {
      * 下一节点可执行人
      */
     private String nextExecuteUserIds;
+
+
+    @ApiModelProperty(value = "使用单位统一信用代码-数据隔离使用")
+    private String useUnitCodeFilter;
+
+    @ApiModelProperty(value = "维保单位统一信用代码-数据隔离使用")
+    private String maintenanceUnitCodeFilter;
+
+    @ApiModelProperty(value = "接收机构统一信用代码-数据隔离使用")
+    private String receiveOrgCodeFilter;
 }

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

@@ -24,5 +24,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     Map<String,Object> getEnterpriseInfo(String sequenceNbr);
 
     List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
+
+    String getOrgCodeByCompanyCode(String companyCode);
 }
 

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

@@ -20,7 +20,7 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
 
     void updatePromoter(@Param ("id")Long id);
 
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds, @Param("type") String type);
 
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);

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

@@ -28,7 +28,7 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
 
     Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, String equipId);
 
-    Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params);
+    Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String type);
 
     void flowExecute(Long sequenceNbr, String instanceId, String operate, String comment);
 

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

@@ -62,4 +62,8 @@
             unit_code = #{unitCode}
           AND is_delete = 0
     </select>
+
+<select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+    select org_code from privilege_company where company_code = #{companyCode} limit 1
+    </select>
 </mapper>

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

@@ -25,7 +25,8 @@
         re.equ_id as equipId,
         ur.apply_no as applyNo,
         ifnull(ur.next_executor_ids,'') as nextExecutorIds,
-        ur.promoter
+        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
@@ -45,16 +46,16 @@
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
-            <if test="roleIds != null and dto.dataType == 'jg'">
+            <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
-            <if test="dto.dataType == 'jg' ">
-                and  ur.receive_org_code = #{dto.unitCode}
+            <if test="dto.dataType != null and dto.dataType == 'supervision' ">
+                and  ur.receive_org_code = #{dto.receiveOrgCode}
             </if>
-            <if test="dto.dataType == 'company' ">
-                and  ur.use_unit_credit_code = #{dto.unitCode}
+            <if test="dto.dataType != null and dto.dataType == 'company' ">
+                and  ur.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
         </where>
         order by ur.rec_date desc

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

@@ -44,19 +44,22 @@
             <if test="dto.equCode != null and dto.equCode != ''">
                 and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
             </if>
-            <if test="dto.useUnitName != null and dto.useUnitName != ''">
-                and  crt.use_unit_name like concat('%',#{dto.useUnitName},'%')
+            <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
+                and  crt.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
-            <if test="roleIds != null and dto.dataType == 'jg'">
+            <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
+                and  crt.receive_company_code = #{dto.receiveOrgCode}
+            </if>
+            <if test="roleIds != null and type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     crt.execute_sequence like concat('%',#{role},'%')
                 </foreach>
             </if>
-            <if test="dto.dataType == 'jg' ">
-                and  crt.receive_company_code = #{dto.unitCode}
+            <if test="type == 'supervision'">
+                AND crt.receive_company_code = #{dto.unitCode}
             </if>
-            <if test="dto.dataType == 'company' ">
-                and  crt.use_unit_credit_code = #{dto.unitCode}
+            <if test="type == 'company'">
+                AND crt.use_unit_credit_code = #{dto.unitCode}
             </if>
         </where>
         order by crt.rec_date desc

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

@@ -133,6 +133,14 @@
             <if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
                 and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
             </if>
+            <if test="contractDto.roleIds != null">
+                <foreach collection='contractDto.roleIds' item='role' open='and (' close=')' separator='or'>
+                    instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+            <if test="contractDto.status != '' and contractDto.status != null">
+                and status = #{contractDto.status}
+            </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
                 and use_unit_code = #{contractDto.useUnitCode}
             </if>
@@ -142,14 +150,29 @@
             <if test="contractDto.receiveOrgCode != '' and contractDto.receiveOrgCode != null">
                 and receive_org_code = #{contractDto.receiveOrgCode}
             </if>
-            <if test="contractDto.roleIds != null">
-                <foreach collection='contractDto.roleIds' item='role' open='and (' close=')' separator='or'>
-                    instance_status like concat('%',#{role},'%')
-                </foreach>
-            </if>
-            <if test="contractDto.status != '' and contractDto.status != null">
-                and status = #{contractDto.status}
-            </if>
+            -- 数据过滤开始 ----------------------------------------------------
+            <choose>
+                <when test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null and
+                    contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
+                    -- 同时有使用单位和维保单位用
+                    and (use_unit_code = #{contractDto.useUnitCodeFilter}
+                        or maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter})
+                </when>
+                <otherwise >
+                    -- 只有使用单位或者维保单位用，或者都没有
+                    <if test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null">
+                        and use_unit_code = #{contractDto.useUnitCodeFilter}
+                    </if>
+                    <if test="contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
+                        and maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
+                    </if>
+                </otherwise>
+            </choose>
+            -- 监管单位用
+            <if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
+                and receive_org_code = #{contractDto.receiveOrgCodeFilter}
+            </if>
+            -- 数据过滤结束 ----------------------------------------------------
         </where>
         order by apply_no desc
     </select>

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

@@ -68,7 +68,7 @@
             <if test="dto.type == 'supervision'">
                 AND ur.receive_org_code = #{orgCode}
             </if>
-            <if test="dto.type == 'enterprise' ">
+            <if test="dto.type == 'company' ">
                 and ur.use_unit_code = #{orgCode}
             </if>
             <!--            <if test="dto.type == 'enterprise'">-->

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

@@ -57,7 +57,7 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/creatTree")
 	@ApiOperation(httpMethod = "GET", value = "获取管辖分局树", notes = "获取管辖分局树")
 	public ResponseModel<Object> creatTree() {
-		return ResponseHelper.buildResponse(commonService.getTree());
+		return ResponseHelper.buildResponse(commonService.getTree(getSelectedOrgInfo()));
 	}
 
 
@@ -70,7 +70,8 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/getApproveTree")
 	@ApiOperation(httpMethod = "GET", value = "获取行政审批局树", notes = "获取行政审批局树")
 	public ResponseModel<Object> getApproveTree() {
-		return ResponseHelper.buildResponse(commonService.getApproveTree());
+		ReginParams reginParams = getSelectedOrgInfo();
+		return ResponseHelper.buildResponse(commonService.getApproveTree(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/JgChangeRegistrationReformController.java

@@ -95,6 +95,14 @@ public class JgChangeRegistrationReformController extends BaseController {
 															@RequestParam(value = "current") int current,
 															@RequestParam(value = "size") int size) {
 		Page<Map<String, Object>> page = new Page<>(current, size);
+		ReginParams reginParams = getSelectedOrgInfo();
+		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
+			dto.setDataType(COMPANY_TYPE_COMPANY);
+			dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+		} else {
+			dto.setDataType(COMPANY_TYPE_SUPERVISION);
+			dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());
+		}
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getList(dto, page,  dto.getRoleIds()));
 	}
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.netflix.ribbon.proxy.annotation.Http;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -46,6 +47,8 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	
     @Autowired
 	IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
+	@Autowired
+	IJgInstallationNoticeService iJgInstallationNoticeService;
 
     /**
      * 新增移装变更登记登记
@@ -149,7 +152,8 @@ public class JgChangeRegistrationTransferController extends BaseController {
 																			 @RequestParam(value = "size") int size,
 																			 JgChangeRegistrationTransferDto params) {
 		Page<Map<String, Object>> page = new Page<>(current, size);
-	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.queryListForPage(page,params));
+		String type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
+		return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.queryListForPage(page,params, type));
 	}
 
 	@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/JgMaintenanceContractController.java

@@ -170,13 +170,12 @@ public class JgMaintenanceContractController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "维保合同备案分页查询", notes = "分页查询维保合同备案")
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
                                                                       @RequestParam(value = "size") int size,
-                                                                      @RequestParam(value = "phase") int phase,
                                                                       Map<String,Object> map) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         ReginParams reginParams = getSelectedOrgInfo();
-        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, map, reginParams);
+        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, map, reginParams);
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
@@ -11,7 +10,6 @@ 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.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeServiceImpl;
@@ -51,10 +49,13 @@ public class JgReformNoticeController extends BaseController {
         return ResponseHelper.buildResponse("");
     }
 
+
     /**
-     * 根据sequenceNbr更新
-     *
-     * @param model 改造告知
+     * 更新
+     * @param submitType 更新或提交
+     * @param installationInfo 改造告知信息
+     * @param op 参数
+     * @return JgReformNoticeDto
      */
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @PutMapping (value = "/update")

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgScrapCancelServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +34,9 @@ public class JgScrapCancelController extends BaseController {
     @Autowired
     JgScrapCancelServiceImpl jgScrapCancelService;
 
+    @Autowired
+    IJgInstallationNoticeService iJgInstallationNoticeService;
+
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
@@ -101,10 +105,11 @@ public class JgScrapCancelController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
     @PostMapping(value = "/getList")
-    public ResponseModel<Page<Map<String, Object>>> getList(@RequestBody JgScrapCancelDto dto,
+    public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
+        dto.setType(String.valueOf(iJgInstallationNoticeService.getCompanyType().get("companyLevel")));
         return ResponseHelper.buildResponse(jgScrapCancelService.getList(dto, page, dto.getRoleIds()));
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -3,10 +3,8 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,8 +21,8 @@ public interface ICommonService {
 
     List<LinkedHashMap> getRegion(String level, String parentId);
 
-    List<LinkedHashMap> getTree();
-    List<LinkedHashMap> getApproveTree();
+    List<LinkedHashMap> getTree(ReginParams selectedOrgInfo);
+    List<LinkedHashMap> getApproveTree(ReginParams reginParams);
 
     List<LinkedHashMap> creatTree();
 

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

@@ -7,6 +7,7 @@ import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -117,6 +118,8 @@ public class CommonServiceImpl implements ICommonService {
     private static final String basic = "basic";
     // 业务通用发起——告知单详情
     private static final String notice = "notice";
+    // 业务通用发起——技术参数-改造变更登记使用
+    private static final String techInfo = "techInfo";
     // 业务通用发起——安装告知表单key
     private static final String AZGZ_FORM_ID = "1734141426742095873";
     // 业务通用发起——移装变更表单key
@@ -259,10 +262,16 @@ public class CommonServiceImpl implements ICommonService {
 
 
     @Override
-    public List<LinkedHashMap> getTree() {
-        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
-        //判断redis是否存在管辖机构树
-        return !ObjectUtils.isEmpty(result) ? result : creatTree();
+    public List<LinkedHashMap> getTree(ReginParams reginParams) {
+        // 企业逻辑
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
+            //判断redis是否存在管辖机构树
+            return !ObjectUtils.isEmpty(result) ? result : creatTree();
+        } else {
+            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+        }
+
     }
 
     @Override
@@ -277,10 +286,17 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<LinkedHashMap> getApproveTree() {
-        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(ADMINISTRATION_UNIT_TREE);
-        //判断redis是否存在行政审批局树
-        return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
+    public List<LinkedHashMap> getApproveTree(ReginParams reginParams) {
+        // 企业逻辑
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(ADMINISTRATION_UNIT_TREE);
+            //判断redis是否存在行政审批局树
+            return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
+        } else {
+            // 监管单位逻辑
+            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+        }
+
     }
 
 
@@ -515,6 +531,7 @@ public class CommonServiceImpl implements ICommonService {
     public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
         Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
+        Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
         Map<String, Object> provideMap = new HashMap<>();
 
         String type = (String) basicObj.get("type");
@@ -559,6 +576,7 @@ public class CommonServiceImpl implements ICommonService {
                 noticeObj.put("submit", "true");
             }
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
+            noticeObj.put("techInfo",techInfoObj);
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgChangeRegistrationReformServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {
@@ -598,7 +616,7 @@ public class CommonServiceImpl implements ICommonService {
             jgChangeRegistrationNameService.save2(submitType, jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode()) || type.equals(ApplicationFormTypeEnum.SBTY.getBusinessCode())) {
             noticeObj.put("submit", submitType);
-            noticeObj.put("pageType", "add");
+            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);

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

@@ -89,6 +89,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
+    @Autowired
+    private CommonMapper commonMapper;
+
     /**
      * 分页查询
      */
@@ -205,7 +208,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
                 jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-                ProcessTaskDTO processTaskDTO = startByVariable();
+                ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
                 commonServiceImpl.buildTaskModel(taskModelDtoList);
@@ -220,7 +223,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
-    public ProcessTaskDTO startByVariable() {
+    public ProcessTaskDTO startByVariable(JgChangeRegistrationReform jgChangeRegistrationReform) {
         ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         //启动流程
         try {
@@ -228,6 +231,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setProcessDefinitionKey("renovationRegistrationReviewNew");
             dto.setBusinessKey("submit");
             dto.setCompleteFirstTask(Boolean.TRUE);
+            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
@@ -342,6 +346,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
+            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             //执行流程
             processTaskDTO = iCmWorkflowService.complete(taskId, dto);
         } catch (Exception e) {
@@ -407,7 +412,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> originalData = new HashMap<>();
 
         if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
-            originalData = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
             originalData.remove("sequenceNbr");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
@@ -464,7 +469,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             //当前数据
             String newData = jgRegistrationHistory.getChangeData();
             //将历史数据更新到技术参数表中
-            IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(newData, IdxBizJgTechParamsElevator.class);
+            JSONObject allData = JSONObject.parseObject(newData);
+            Map<String,Object> techInfo = (Map<String, Object>) allData.get("techInfo");
+            IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(JSONObject.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
             BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew, idxBizJgTechParamsElevator, "sequenceNbr", "record");
             idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
             //将历史数据回填到历史记录表中

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

@@ -188,7 +188,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 oldHistory = jgRegistrationHistoryService.getDteailByRecord(oldTransferEq.getEquId(), oldTransfer.getApplyNo());
                 useInfo = idxBizJgUseInfoService.getOneData(oldTransferEq.getEquId());
             }
-        }else {
+        } else {
             //查询申请单号
             ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(tableData.get("businessCode"))), 1);
             if (!result.getResult().isEmpty()) {
@@ -356,12 +356,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //执行流程
             ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
             workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
-
+            // 更新下一步执行人
+            this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        // 更新下一步执行人
-        this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
     }
 
     /**
@@ -380,7 +379,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
         String taskCode = "";
         String role = "";
-        if(!ValidationUtil.isEmpty(workflowResult)){
+        if (!ValidationUtil.isEmpty(workflowResult)) {
             taskCode = Optional.ofNullable(workflowResult.getNextTaskCode()).orElse("");
             role = Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
             jgTransfer.setNextTaskId(workflowResult.getNextTaskId());
@@ -395,12 +394,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         jgTransfer.setNextExecutorIds(role);
         this.update(jgTransfer, lambda);
         //待办 撤回
-        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
-        jsonObject.put("nextTaskId", data.getNextTaskId());
-        jsonObject.put("nextExecuteUser", data.getNextExecutorIds());
-        jsonObject.put("taskType",BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
-        commonService.rollbackTask(instanceId, JSON.parseObject(JSON.toJSONString(jgTransfer)));
+//        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
+        jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));
+        jsonObject.put("flowStatusLabel", jgTransfer.getAuditStatus());
+        jsonObject.put("nextTaskId", jgTransfer.getNextTaskId());
+        jsonObject.put("nextExecuteUser", jgTransfer.getNextExecutorIds());
+        jsonObject.put("taskType", BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+        commonService.rollbackTask(instanceId, jsonObject);
     }
 
 
@@ -556,8 +557,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param params
      * @return
      */
-    public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params) {
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, params.getRoleIds());
+    public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String type) {
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, params.getRoleIds(), type);
         listPage.getRecords().stream().forEach(item -> {
             // 流程未走完时，移装地址需从 历史表中获取
             if (item.containsKey("status") && !FlowStatusEnum.TO_BE_FINISHED.getName().equals(item.get("status").toString())) {
@@ -654,27 +655,32 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             if (updateTodoAndCreate) {
                 // 上个代办改为已办
                 HashMap<String, Object> map = new HashMap<>();
-                if("0".equals(operate)){
+                if ("0".equals(operate)) {
                     map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                     map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                }else {
+                } else {
                     map.put("taskStatus", FlowStatusEnum.REJECTED.getCode());
                     map.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
                 }
                 map.put("flowStatus", commonService.getDictionaryCodeByName(jgChangeRegistrationTransfer.getStatus()));
                 map.put("flowStatusLabel", jgChangeRegistrationTransfer.getStatus());
                 map.put("relationId", jgChangeRegistrationTransfer.getInstanceId());
-                TaskV2Model taskV2Model = commonService.updateTaskModel(map);
-                TaskModelDto taskModelDto = new TaskModelDto();
-                BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                // 创建新的代办
-                taskModelDto.setModel(jgChangeRegistrationTransfer);
-                taskModelDto.setTaskName(workflowResult.getNextTaskName());
-                taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskModelDto.setNextExecuteUser(workflowResult.getNextExecutorRoleIds());
-                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                TaskV2Model taskV2Model = commonService.updateTaskModelNew(map);
+                if (!ValidationUtil.isEmpty(taskV2Model)) {
+                    TaskModelDto taskModelDto = new TaskModelDto();
+                    BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                    // 创建新的代办
+                    taskModelDto.setModel(jgChangeRegistrationTransfer);
+                    taskModelDto.setTaskName(workflowResult.getNextTaskName());
+                    taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
+                    taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    taskModelDto.setNextExecuteUser(workflowResult.getNextExecutorRoleIds());
+                    taskModelDto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+                    taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
+                    taskModelDto.setRelationId(instanceId);
+                    commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                }
             }
 
         } else {

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
@@ -22,9 +23,12 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
 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.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 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.RegistrationInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.beans.BeanUtils;
@@ -32,12 +36,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -81,33 +87,88 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdate(JSONObject map, ReginParams reginParams) {
         JgEnableDisable jgEnableDisable = new JgEnableDisable();
-        jgEnableDisable.setApplyDate(new Date());
+        if(!"null".equals(String.valueOf(map.get("sequenceNbr")))){
+            jgEnableDisable = this.baseMapper.selectById(String.valueOf(map.get("sequenceNbr")));
+        }
+        jgEnableDisable.setCreateDate(new Date());
         String submit = String.valueOf(map.get("submit"));
-        String pageType = String.valueOf(map.get("pageType"));
+        String pageType = String.valueOf(map.get("formType"));
         String record = String.valueOf(map.get("record"));
-
+        String businessCode = String.valueOf(map.get("businessCode"));
         List<WorkflowResultDto> workflowResultList = new ArrayList<>();
 
+        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
+        WorkflowResultDto workflowResultDto = new WorkflowResultDto();
 
         String instanceId = "";
         if (map.containsKey("instanceId")) {
-            instanceId = map.get("instanceId").toString();
+            // 只调用执行API，返回下个节点信息，用于填充业务字段
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(jgEnableDisable.getNextTaskId());
+            HashMap<String, Object> commMap = new HashMap<>();
+            if (FlowStatusEnum.REJECTED.getName().equals(jgEnableDisable.getAuditStatus()) || FlowStatusEnum.ROLLBACK.getName().equals(jgEnableDisable.getAuditStatus())) {
+                commMap.put("approvalStatus", "提交");
+            } else {
+                commMap.put("approvalStatus", submit);
+            }
+            dto.setVariable(commMap);
+            processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+            // 提取节点等信息
+            workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+
+            if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
+                jgEnableDisable.setExecuteSequence(jgEnableDisable.getExecuteSequence() + "," + workflowResultDto.getNextExecutorRoleIds());
+            } else {
+                jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
+            }
+            jgEnableDisable.setEquList(map.get("equListDesc").toString());
+            jgEnableDisable.setSupervisoryCode(map.get("supervisoryCode").toString());
+            jgEnableDisable.setPromoter(RequestContext.getExeUserId());
+            jgEnableDisable.setNextExecutorIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+            jgEnableDisable.setNextTaskId(workflowResultDto.getNextTaskId());
+            this.baseMapper.updateById(jgEnableDisable);
+            // 上个代办改为已办
+            HashMap<String, Object> map1 = new HashMap<>();
+            map1.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+            map1.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+            map1.put("relationId", jgEnableDisable.getInstanceId());
+            map1.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+            map1.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+            TaskV2Model taskV2Model = commonService.updateTaskModel(map1);
+            if (ObjectUtils.isEmpty(taskV2Model)) {
+                // 如果为保存并提交，则创建代办
+                buildTask(Collections.singletonList(jgEnableDisable), businessCode, Collections.singletonList(workflowResultDto));
+            } else {
+                TaskModelDto taskModelDto = new TaskModelDto();
+                BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                // 创建新的代办
+                taskModelDto.setModel(jgEnableDisable);
+                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setFlowCode(jgEnableDisable.getNextTaskId());
+                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+            }
         } else {
+            // 获取申请编号
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+            jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
             // 启动工作流并返回信息
             workflowResultList = workFlowInfo(submit, record);
+            //业务数据组装等
+            businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
         }
-        // 获取申请编号
-        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
-        //业务数据组装等
-        if (!ObjectUtils.isEmpty(listResponseModel)) {
-            jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
-        }
-        String businessCode = String.valueOf(map.get("businessCode"));
-        businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
+
 
         // 仅保存
         if ("add".equals(pageType)) {
             this.save(jgEnableDisable);
+            buildTask(Arrays.asList(jgEnableDisable),businessCode, workflowResultList);
         } else {
             // 编辑
             jgEnableDisable.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -122,12 +183,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
         jgEnableDisableEqService.save(jgEnableDisableEq);
 
-
-        // 如果为保存并提交，则创建代办
-        if (SUBMIT_TYPE_FLOW.equals(submit)) {
-            buildTask(Arrays.asList(jgEnableDisable),businessCode, workflowResultList);
-        }
-
     }
 
     /**
@@ -136,6 +191,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     private void businessData(String submitType, ReginParams reginParams, JgEnableDisable jgEnableDisable, JSONObject map, List<WorkflowResultDto> workflowResultList) {
         // 接收机构
         String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
+        jgEnableDisable.setApplyDate(new Date());
         jgEnableDisable.setReceiveOrgCode(splitMaintenanceUnitCode[0]);
         jgEnableDisable.setReceiveOrgName(splitMaintenanceUnitCode[1]);
         jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -155,9 +211,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setSupervisoryCode(map.get("supervisoryCode").toString());
         if (!CollectionUtils.isEmpty(workflowResultList)) {
             jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
         } else {
-            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
         jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
         jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
@@ -249,72 +305,134 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     }
 
 
-
+    @Autowired
+    RegistrationInfoMapper tzsJgRegistrationInfoMapper;
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
-        try {
-            JgEnableDisable jgEnableDisable = this.baseMapper.selectById(id);
-            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
-            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
-            String taskId = taskMessage.getString("id");
-            //组装信息
-            TaskResultDTO dto = new TaskResultDTO();
-            dto.setResultCode("approvalStatus");
-            dto.setTaskId(taskId);
-            dto.setComment(comment);
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("approvalStatus", operate);
-            if (WorkFlowStatusEnum.ENABLE_SUBMIT.getReject().equals(jgEnableDisable.getAuditStatus()) || WorkFlowStatusEnum.ENABLE_SUBMIT.getRollBack().equals(jgEnableDisable.getAuditStatus())) {
-                map.put("approvalStatus", "提交");
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        JgEnableDisable jgEnableDisable = this.baseMapper.selectById(id);
+
+        // 执行工作流并返回组装好的工作流信息
+        WorkflowResultDto workflowResultDto = getWorkflowResultDto(operate, comment, jgEnableDisable);
+
+        jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
+        TaskV2Model taskV2Model = new TaskV2Model();
+        if ("0".equals(operate)) {
+            if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
+                jgEnableDisable.setPromoter("");
+                jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getName()));
+                // 上个代办改为已办
+                HashMap<String, Object> taskMap = new HashMap<>();
+                taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                taskMap.put("relationId", jgEnableDisable.getInstanceId());
+                taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                taskMap.put("model", jgEnableDisable);
+                commonService.updateTaskModel(taskMap);
+            } else {
+                jgEnableDisable.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
+                if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
+                    jgEnableDisable.setExecuteSequence(jgEnableDisable.getExecuteSequence() + "," + workflowResultDto.getNextExecutorRoleIds());
+                } else {
+                    jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
+                }
+                jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+                // 上个代办改为已办
+                HashMap<String, Object> taskMap = new HashMap<>();
+                taskMap.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskMap.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskMap.put("relationId", jgEnableDisable.getInstanceId());
+                taskV2Model = commonService.updateTaskModel(taskMap);
+                TaskModelDto taskModelDto = new TaskModelDto();
+                BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                // 创建新的代办
+                taskModelDto.setModel(jgEnableDisable);
+                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
+                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
             }
-            dto.setVariable(map);
-            //执行流程
-            Workflow.taskClient.completeByTask(taskId, dto);
-        } catch (Exception e) {
-            e.printStackTrace();
+        } else {
+            jgEnableDisable.setPromoter("");
+            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.REJECTED.getName()));
+            jgEnableDisable.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
+            // 上个代办改为已办
+            HashMap<String, Object> taskMap = new HashMap<>();
+            taskMap.put("taskStatus", FlowStatusEnum.REJECTED.getCode());
+            taskMap.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
+            taskMap.put("relationId", jgEnableDisable.getInstanceId());
+            taskMap.put("flowStatus", FlowStatusEnum.REJECTED.getCode());
+            taskMap.put("flowStatusLabel", FlowStatusEnum.REJECTED.getName());
+            taskV2Model = commonService.updateTaskModel(taskMap);
+            TaskModelDto taskModelDto = new TaskModelDto();
+            BeanUtils.copyProperties(taskV2Model, taskModelDto);
+            // 创建新的代办
+            taskModelDto.setModel(jgEnableDisable);
+            taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+            taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+            taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());
+            taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
+            taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
+            taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
-        // 更新下一步执行人
-        updateExecuteIds(instanceId, id, operate);
+        jgEnableDisable.setNextTaskId(workflowResultDto.getNextTaskId());
+        this.baseMapper.updateById(jgEnableDisable);
 
     }
 
-    public void withdraw(String instanceId) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String taskCode = "";
-        JgEnableDisable jgEnableDisable = new JgEnableDisable();
-        LambdaQueryWrapper<JgEnableDisable> lambda = new QueryWrapper<JgEnableDisable>().lambda();
-        lambda.eq(JgEnableDisable::getInstanceId, instanceId);
-        ArrayList<String> roleList = new ArrayList<>();
-        try {
-            workFlowFeginService.rollBack(instanceId);
-            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
 
-            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-                String nextTaskId = nextTask.getString("id");
-                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-                JSONObject result = nodeInfo.getResult();
-                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
-                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-                for (Object datum : data) {
-                    if (((Map<?, ?>) datum).containsKey("groupId")) {
-                        roleList.add(((Map<?, ?>) datum).get("groupId").toString());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (!ObjectUtils.isEmpty(taskCode)) {
 
-            jgEnableDisable.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
-        }
-        String join = String.join(",", roleList);
-        jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-        jgEnableDisable.setNextExecutorIds(join);
-        this.update(jgEnableDisable, lambda);
+
+    /**
+     * 执行工作流并返回组装好的工作流信息
+     * @param op 是否通过
+     * @param opinion 备注信息
+     * @param jgEnableDisable 业务信息
+     * @return 返回组装好的工作流信息
+     */
+    private WorkflowResultDto getWorkflowResultDto(String op, String opinion, JgEnableDisable jgEnableDisable) {
+        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
+        WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+        // 只调用执行API，返回下个节点信息，用于填充业务字段
+        //组装信息
+        TaskResultDTO workDto = new TaskResultDTO();
+        workDto.setResultCode("approvalStatus");
+        workDto.setTaskId(jgEnableDisable.getNextTaskId());
+        HashMap<String, Object> commMap = new HashMap<>();
+        commMap.put("approvalStatus", op);
+        workDto.setVariable(commMap);
+        workDto.setComment(opinion);
+        processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), workDto);
+        // 提取节点等信息
+        workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+        return workflowResultDto;
+    }
+
+
+    public void withdraw(String instanceId) {
+        JgEnableDisable jgEnableDisable = this.baseMapper.selectOne(new QueryWrapper<JgEnableDisable>().lambda().eq(JgEnableDisable::getInstanceId, instanceId));
+        ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(instanceId);
+        // 提取节点等信息
+        WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+        jgEnableDisable.setPromoter("");
+        jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
+        jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getName()));
+        jgEnableDisable.setNextTaskId(workflowResultDto.getNextTaskId());
+        updateById(jgEnableDisable);
+
+        // 删除待办
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgEnableDisable));
+        jsonObject.put("nextExecuteUser", jgEnableDisable.getNextExecutorIds());
+        jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
+        commonService.rollbackTask(jgEnableDisable.getInstanceId(), jsonObject);
     }
 
 

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -108,6 +109,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
 
+    @Autowired
+    private CommonMapper commonMapper;
+
 //    @Autowired
 //    private EquipmentCategoryServiceImpl equipmentCategoryService;
     @Autowired
@@ -230,6 +234,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(notice.getReceiveOrgCreditCode()));
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
                 processTaskDTO = iCmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
@@ -263,6 +268,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     commMap.put("approvalStatus", op);
                 }
                 dto.setVariable(commMap);
+                dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(notice.getReceiveOrgCreditCode()));
                 processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -482,7 +488,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
 
         // 启动工作流并返回信息
-        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList);
+        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, commonMapper.getOrgCodeByCompanyCode(model.getReceiveOrgCreditCode()));
 
         List<JgInstallationNotice> list = new ArrayList<>();
         List<JgInstallationNoticeEq> equipList = new ArrayList<>();
@@ -577,7 +583,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      * @param deviceList 设备信息
      * @return 工作流返回相关数据
      */
-    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList, String receiveOrgCreditCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -586,6 +592,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                dto.setNextExecuteUserOrgCode(receiveOrgCreditCode);
                 list.add(dto);
             });
             actWorkflowBatchDTO.setProcess(list);
@@ -879,6 +886,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
         workDto.setVariable(commMap);
         workDto.setComment(jgTransferNotice.getProcessAdvice());
+        workDto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(jgTransferNotice.getReceiveOrgCreditCode()));
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);

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

@@ -659,7 +659,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgMaintainNotice));
-        jsonObject.put("nextExecuteUser", jgMaintainNotice.getNextExecutorIds());
+        jsonObject.put("nextExecuteUser", jgMaintainNotice.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
 
         commonService.rollbackTask(jgMaintainNotice.getInstanceId(), jsonObject);

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
@@ -16,10 +15,11 @@ import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.MaintenanceEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -78,10 +78,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     CommonServiceImpl commonService;
 
+    @Autowired
+    IJgInstallationNoticeService jrmInstallationNoticeService;
+
+    @Autowired
+    private CommonMapper commonMapper;
+
     /**
      * 分页查询
      */
-    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, int phase,
+    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
                                                       Map<String, Object> map, ReginParams reginParams) {
         JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
         if (map.containsKey("jgMaintenanceContractDto")) {
@@ -90,20 +96,44 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
-        if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
-            //使用单位用"使用单位统一信用代码"匹配数据
-            dto.setUseUnitCode(company.getCompanyCode());
-            dto.setRoleIds(null);
-            contractList = maintenanceContractMapper.getContractList(page, dto);
-        } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
-            //维保单位用"维保单位统一信用代码"匹配数据
-            dto.setMaintenanceUnitCode(company.getCompanyCode());
-            contractList = maintenanceContractMapper.getContractList(page, dto);
-        } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
+        Map<String, Object> companyTypeMap = jrmInstallationNoticeService.getCompanyType();
+        String companyLevel = "";
+        String companyType = "";
+        if (companyTypeMap.containsKey("companyLevel")) {
+            companyLevel = companyTypeMap.get("companyLevel").toString();
+        }
+        if (companyTypeMap.containsKey("companyType")) {
+            companyType = companyTypeMap.get("companyType").toString();
+        }
+        if ("supervision".equals(companyLevel)) {
             //监管单位用"接收机构统一使用代码"匹配
-            dto.setReceiveOrgCode(company.getCompanyCode());
-            contractList = maintenanceContractMapper.getContractList(page, dto);
+            dto.setReceiveOrgCodeFilter(company.getCompanyCode());
+        } else if ("company".equals(companyLevel)) {
+            if (companyType.contains("use")) {
+                //使用单位用"使用单位统一信用代码"匹配数据
+                dto.setUseUnitCodeFilter(company.getCompanyCode());
+                dto.setRoleIds(null);
+            }
+            if (companyType.contains("construction")) {
+                //维保单位用"维保单位统一信用代码"匹配数据
+                dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
+            }
         }
+        contractList = maintenanceContractMapper.getContractList(page, dto);
+//        if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
+//            //使用单位用"使用单位统一信用代码"匹配数据
+//            dto.setUseUnitCode(company.getCompanyCode());
+//            dto.setRoleIds(null);
+//            contractList = maintenanceContractMapper.getContractList(page, dto);
+//        } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
+//            //维保单位用"维保单位统一信用代码"匹配数据
+//            dto.setMaintenanceUnitCode(company.getCompanyCode());
+//            contractList = maintenanceContractMapper.getContractList(page, dto);
+//        } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
+//            //监管单位用"接收机构统一使用代码"匹配
+//            dto.setReceiveOrgCode(company.getCompanyCode());
+//            contractList = maintenanceContractMapper.getContractList(page, dto);
+//        }
         BeanUtils.copyProperties(contractList, result);
         return result;
     }
@@ -135,8 +165,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
 
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update) {
         try {
-            JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(id);
-            String taskId = jgMaintenanceContract.getNextTaskId();
+            JgMaintenanceContract contract = this.getBaseMapper().selectById(id);
+            String taskId = contract.getNextTaskId();
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
             dto.setResultCode("approvalStatus");
@@ -144,7 +174,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
-            if (WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(jgMaintenanceContract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(jgMaintenanceContract.getStatus())) {
+            if (WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
@@ -154,7 +185,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 
     /**
@@ -352,7 +382,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 }
             } else {
                 // 有InstanceId，执行一步
-                ProcessTaskDTO processTaskDTO = this.submit("0", contract.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = this.submit("0", contract);
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -376,16 +406,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return true;
     }
 
-    public ProcessTaskDTO submit(String op, String taskId) {
+    public ProcessTaskDTO submit(String op, JgMaintenanceContract contract) {
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
-        dto.setTaskId(taskId);
+        dto.setTaskId(contract.getNextTaskId());
         dto.setComment("提交流程");
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);
-        return workflowService.complete(taskId, dto);
+        return workflowService.complete(contract.getNextTaskId(), dto);
     }
 
     private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {