fix(jg && 96333)：bug修改,维保过后的设备在进行96333应急管理时，带出俩维保负责人信息

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java

@@ -8,12 +8,10 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.elevator.api.dto.*;
-import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.elevator.api.entity.EnterpriseInfo;
 import com.yeejoin.amos.boot.module.elevator.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.elevator.api.service.IEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.elevator.api.service.IMaintenanceUnitService;
-import com.yeejoin.amos.boot.module.elevator.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
@@ -30,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -131,6 +128,7 @@ public class MaintenanceUnitController extends BaseController {
         Map<String, Object> objectMap = iMaintenanceUnitService.selectMessage(id);
         return ResponseHelper.buildResponse(objectMap);
     }
+
     /**
      * 列表分页查询
      *
@@ -143,7 +141,7 @@ public class MaintenanceUnitController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<IPage<MaintenanceUnitDto>> listPage(String pageNum, String pageSize,
-                                                            MaintenanceUnit maintenanceUnitDto) {
+                                                             MaintenanceUnit maintenanceUnitDto) {
         MaintenanceUnit maintenanceUnit = BeanDtoVoUtils.convert(maintenanceUnitDto, MaintenanceUnit.class);
         Page<MaintenanceUnit> pageBean;
         QueryWrapper<MaintenanceUnit> maintenanceUnitQueryWrapper = new QueryWrapper<>();
@@ -196,7 +194,7 @@ public class MaintenanceUnitController extends BaseController {
     @RequestMapping(value = "/query_maintenance_unit_list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页查询维保单位信息", notes = "分页查询维保单位信息")
     public ResponseModel<IPage<MaintenanceUnitDto>> queryMaintenanceUnitList(String pageNum, String pageSize,
-                                                                            MaintenanceUnit maintenanceUnitDto) {
+                                                                             MaintenanceUnit maintenanceUnitDto) {
         MaintenanceUnit maintenanceUnit = BeanDtoVoUtils.convert(maintenanceUnitDto, MaintenanceUnit.class);
         Page<MaintenanceUnit> pageBean;
         QueryWrapper<MaintenanceUnit> maintenanceUnitQueryWrapper = new QueryWrapper<>();
@@ -236,8 +234,8 @@ public class MaintenanceUnitController extends BaseController {
     /**
      * 分页查询维保单位/使用单位信息
      *
-     * @param pageNum            当前页
-     * @param pageSize           每页大小
+     * @param pageNum  当前页
+     * @param pageSize 每页大小
      * @return 返回结果
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -256,9 +254,9 @@ public class MaintenanceUnitController extends BaseController {
         }
         String orgCode = companyModels.get(0).getOrgCode();
         if ("50*18667".equals(orgCode)) {
-            enterpriseInfoQueryWrapper.likeRight("supervise_org_code","50*52").or().likeRight("supervise_org_code","50*73");
+            enterpriseInfoQueryWrapper.likeRight("supervise_org_code", "50*52").or().likeRight("supervise_org_code", "50*73");
         } else {
-            enterpriseInfoQueryWrapper.likeRight("supervise_org_code",orgCode);
+            enterpriseInfoQueryWrapper.likeRight("supervise_org_code", orgCode);
         }
 
         Class<? extends EnterpriseInfo> aClass = enterpriseInfo.getClass();
@@ -268,7 +266,7 @@ public class MaintenanceUnitController extends BaseController {
                 Object o = field.get(enterpriseInfo);
                 if (o != null) {
                     String name = NameUtils.camel2Underline(field.getName());
-                    if ("city".equalsIgnoreCase(name) ) {
+                    if ("city".equalsIgnoreCase(name)) {
                         String fileValue = (String) o;
                         enterpriseInfoQueryWrapper.eq(name, fileValue);
                     } else if ("credit_level".equalsIgnoreCase(name)) {
@@ -318,7 +316,7 @@ public class MaintenanceUnitController extends BaseController {
                 Object o = field.get(enterpriseInfo);
                 if (o != null) {
                     String name = NameUtils.camel2Underline(field.getName());
-                    if ("city".equalsIgnoreCase(name) ) {
+                    if ("city".equalsIgnoreCase(name)) {
                         String fileValue = (String) o;
                         enterpriseInfoQueryWrapper.eq(name, fileValue);
                     } else if ("credit_level".equalsIgnoreCase(name)) {
@@ -342,18 +340,19 @@ public class MaintenanceUnitController extends BaseController {
                 logger.error(e.getMessage());
             }
         });
-        if (!ObjectUtils.isEmpty(enterpriseInfoDto.getIds())){
-            enterpriseInfoQueryWrapper.lambda().in(EnterpriseInfo :: getSequenceNbr, enterpriseInfo.getIds());
+        if (!ObjectUtils.isEmpty(enterpriseInfoDto.getIds())) {
+            enterpriseInfoQueryWrapper.lambda().in(EnterpriseInfo::getSequenceNbr, enterpriseInfo.getIds());
         }
         ArrayList<EnterpriseInfoExportDto> list = new ArrayList<>();
         List<EnterpriseInfo> enterpriseInfos = iEnterpriseInfoService.getBaseMapper().selectList(enterpriseInfoQueryWrapper);
-        enterpriseInfos.forEach(item ->{
+        enterpriseInfos.forEach(item -> {
             EnterpriseInfoExportDto dto = new EnterpriseInfoExportDto();
             BeanUtils.copyProperties(item, dto);
             list.add(dto);
         });
         ExcelUtil.createTemplate(response, "单位信息", "单位信息", list, EnterpriseInfoExportDto.class, null, false);
     }
+
     /**
      * 根据名称查询维保单位列表
      *
@@ -367,7 +366,7 @@ public class MaintenanceUnitController extends BaseController {
             false) String unitName) {
         QueryWrapper<EnterpriseInfo> enterpriseInfoQueryWrapper = new QueryWrapper<>();
         enterpriseInfoQueryWrapper.select("distinct sequence_nbr,use_unit").like(StringUtils.isNotEmpty(unitName),
-                "use_unit", unitName).like("unit_type","安装改造维修单位");
+                "use_unit", unitName).like("unit_type", "安装改造维修单位");
         Page<EnterpriseInfo> pageBean = new Page<>(0, Long.MAX_VALUE);
         IPage<EnterpriseInfo> page = iEnterpriseInfoService.page(pageBean, enterpriseInfoQueryWrapper);
         IPage<MaintenanceUnitNameDto> maintenanceUnitVoIPage = BeanDtoVoUtils.iPageVoStream(page,
@@ -377,6 +376,7 @@ public class MaintenanceUnitController extends BaseController {
 
     /**
      * 根据警情id 查找设备维保单位信息
+     *
      * @param alertId
      * @return
      */
@@ -385,32 +385,32 @@ public class MaintenanceUnitController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据警情id 查找设备维保单位信息", notes = "根据警情id 查找设备维保单位信息")
     public ResponseModel<MaintenanceUnitDto> selectByAlertId(@PathVariable Long alertId) {
         // 获取根据警情获取电梯信息
-        Map<String,Object> map  = elevatorServiceImpl.selectByAlertId(alertId);
+        Map<String, Object> map = elevatorServiceImpl.selectByAlertId(alertId);
         if (ObjectUtils.isEmpty(map)) {
             throw new BadRequest("设备未找到");
         }
         // 根据设备使用id 获取维保单位信息
-        List<Map<String,Object>> list = elevatorServiceImpl.selectMtByAlertId(String.valueOf(map.get("sequenceNbr")));
+        List<Map<String, Object>> list = elevatorServiceImpl.selectMtByAlertId(String.valueOf(map.get("sequenceNbr")));
         if (ObjectUtils.isEmpty(list)) {
             throw new BadRequest("维保单位未找到");
         }
         MaintenanceUnitDto maintenanceUnitVo = new MaintenanceUnitDto();
-        maintenanceUnitVo.setUnitName(ObjectUtils.isEmpty(list.get(0).get("unitName")) ? null :String.valueOf(list.get(0).get("unitName")));
-        maintenanceUnitVo.setAddress(ObjectUtils.isEmpty(list.get(0).get("address")) ? null :String.valueOf(list.get(0).get("address")));
+        maintenanceUnitVo.setUnitName(ObjectUtils.isEmpty(list.get(0).get("unitName")) ? null : String.valueOf(list.get(0).get("unitName")));
+        maintenanceUnitVo.setAddress(ObjectUtils.isEmpty(list.get(0).get("address")) ? null : String.valueOf(list.get(0).get("address")));
         maintenanceUnitVo.setId(ObjectUtils.isEmpty(list.get(0).get("sequenceNbr")) ? null : String.valueOf(list.get(0).get("sequenceNbr")));
         maintenanceUnitVo.setSocialCreditCode(ObjectUtils.isEmpty(list.get(0).get("useCode")) ? null : String.valueOf(list.get(0).get("useCode")));
         List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
         DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人1");
-        principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone")) ? null :String.valueOf(list.get(0).get("phone")));
+        principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone")) ? null : String.valueOf(list.get(0).get("phone")));
         principal.setUserId(null);
         principal.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName")) ? null : String.valueOf(list.get(0).get("userName")));
         dutyPersonList.add(principal);
         DutyPersonDto manager = new DutyPersonDto();
         manager.setDeptName("主要负责人2");
-//        manager.setPhone(list.size() == 2 ? String.valueOf(list.get(0).get("phone")) : null);
-//        manager.setUserId(null);
-//        manager.setUserName(list.size() == 2 ? String.valueOf(list.get(0).get("userName")) : null);
+        manager.setPhone(list.size() == 2 ? String.valueOf(list.get(0).get("phone")) : null);
+        manager.setUserId(null);
+        manager.setUserName(list.size() == 2 ? String.valueOf(list.get(0).get("userName")) : null);
         dutyPersonList.add(manager);
         maintenanceUnitVo.setDutyPersonList(dutyPersonList);
 

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

@@ -67,29 +67,26 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     RestHighLevelClient restHighLevelClient;
     @Autowired
-    private JgMaintenanceContractMapper maintenanceContractMapper;
-    @Autowired
-    private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
-    @Autowired
-    private JgMaintenanceContractEqServiceImpl jgMaintenanceContractEqService;
-    @Autowired
     RedisUtils redisUtils;
     @Autowired
     ICmWorkflowService workflowService;
     @Autowired
     CommonServiceImpl commonService;
-
     @Autowired
     IJgInstallationNoticeService jrmInstallationNoticeService;
-
+    @Autowired
+    private JgMaintenanceContractMapper maintenanceContractMapper;
+    @Autowired
+    private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
+    @Autowired
+    private JgMaintenanceContractEqServiceImpl jgMaintenanceContractEqService;
     @Autowired
     private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
 
     /**
      * 分页查询
      */
-    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
-                                                      Map<String, Object> map, ReginParams reginParams) {
+    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, Map<String, Object> map, ReginParams reginParams) {
         JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
         if (map.containsKey("jgMaintenanceContractDto")) {
             dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
@@ -107,16 +104,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             companyType = companyTypeMap.get("companyType").toString();
         }
         if ("supervision".equals(companyLevel)) {
-            //监管单位用"接收机构统一使用代码"匹配
+            // 监管单位用"接收机构统一使用代码"匹配
             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());
             }
         }
@@ -167,19 +164,18 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update) {
         JgMaintenanceContract contract = this.getBaseMapper().selectById(id);
         String taskId = contract.getNextTaskId();
-        //组装信息
+        // 组装信息
         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.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
-                WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
+        if (WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
             map.put("approvalStatus", "提交");
         }
         dto.setVariable(map);
-        //下一节点执行人单位（下节点接收机构code）
+        // 下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, contract));
         ProcessTaskDTO complete = workflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
@@ -189,18 +185,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public String getNextUserOrgCode(String operate, JgMaintenanceContract contract) {
         String code = null;
         if ("0".equals(operate)) {
-            //通过
-            if (WorkFlowStatusEnum.MAIN_SUBMIT.getPass().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
+            // 通过
+            if (WorkFlowStatusEnum.MAIN_SUBMIT.getPass().equals(contract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
                 code = contract.getMaintenanceUnitCode();
-            } else if (WorkFlowStatusEnum.MAIN_RECEIVE.getPass().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_RECEIVE.getReject().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack().equals(contract.getStatus())) {
+            } else if (WorkFlowStatusEnum.MAIN_RECEIVE.getPass().equals(contract.getStatus()) || WorkFlowStatusEnum.MAIN_RECEIVE.getReject().equals(contract.getStatus()) || WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack().equals(contract.getStatus())) {
                 code = contract.getReceiveOrgCode();
             }
         } else {
-            //驳回
+            // 驳回
             if (WorkFlowStatusEnum.MAIN_PRELIMINARY.getPass().equals(contract.getStatus())) {
                 code = contract.getMaintenanceUnitCode();
             }
@@ -218,11 +210,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             QueryWrapper<JgMaintenanceContract> wrapper = new QueryWrapper<>();
             wrapper.eq("sequence_nbr", x);
             JgMaintenanceContract jgMaintenanceContract = maintenanceContractMapper.selectOne(wrapper);
-            LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>()
-                    .eq(JgMaintenanceContractEq::getEquipTransferId, jgMaintenanceContract.getApplyNo())
-                    .eq(JgMaintenanceContractEq::getIsDelete, false);
-            List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream()
-                    .map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
+            LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>().eq(JgMaintenanceContractEq::getEquipTransferId, jgMaintenanceContract.getApplyNo()).eq(JgMaintenanceContractEq::getIsDelete, false);
+            List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream().map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
 
             commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()));
             maintenanceContractEqMapper.deleteForBatch(listSeq);
@@ -297,7 +286,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(contract.getStatus()));
         jsonObject.put("flowStatusLabel", contract.getStatus());
-        jsonObject.put("maintenanceContract", null);//不传合同照片附件信息
+        jsonObject.put("maintenanceContract", null);// 不传合同照片附件信息
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -314,7 +303,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         CompanyBo company = reginParams.getCompany();
         contractDto.setCreateDate(new Date());
         contractDto.setPromoter(reginParams.getUserModel().getUserId());
-        //获取维保备案编号
+        // 获取维保备案编号
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1);
         if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
             log.error("告知单获取失败");
@@ -324,19 +313,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         contractDto.setApplyNo(wbApplyNo);
         contractDto.setUseUnitCode(company.getCompanyCode());
         contractDto.setUseUnitName(company.getCompanyName());
-        //管理员信息
+        // 管理员信息
         if (!StringUtils.isEmpty(contractDto.getMaintenanceManagerId())) {
             String[] MaintenanceManager = contractDto.getMaintenanceManagerId().split("_");
             contractDto.setMaintenanceManagerId(MaintenanceManager[0]);
             contractDto.setMaintenanceManagerName(MaintenanceManager[1]);
         }
-        //接收机构信息
+        // 接收机构信息
         if (!StringUtils.isEmpty(contractDto.getReceiveOrgCode())) {
             String[] splitReceiveOrgCode = contractDto.getReceiveOrgCode().split("_");
             contractDto.setReceiveOrgCode(splitReceiveOrgCode[0]);
             contractDto.setReceiveOrgName(splitReceiveOrgCode[1]);
         }
-        //维保单位信息
+        // 维保单位信息
         if (!StringUtils.isEmpty(contractDto.getMaintenanceUnitCode())) {
             String[] splitMaintenanceUnitCode = contractDto.getMaintenanceUnitCode().split("_");
             contractDto.setMaintenanceUnitCode(splitMaintenanceUnitCode[0]);
@@ -344,7 +333,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         }
         contractDto.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
         JgMaintenanceContract contract = new JgMaintenanceContract();
-        boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());//没有id说明是新增
+        boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());// 没有id说明是新增
         BeanUtils.copyProperties(contractDto, contract);
         contract.setCreateUserId(reginParams.getUserModel().getUserId());
         contract.setCreateUserName(reginParams.getUserModel().getRealName());
@@ -352,7 +341,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
             this.save(contract);
         } else {
-            //删除以前设备关联关系
+            // 删除以前设备关联关系
             this.getBaseMapper().updateById(contract);
             LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
             lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
@@ -376,16 +365,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
             List<String> roleListNext = new ArrayList<>();
             List<String> roleListAll = new ArrayList<>();
-            //新增提交
+            // 新增提交
             if (StringUtils.isEmpty(contract.getInstanceId())) {
-                //没有InstanceId需要发起流程
+                // 没有InstanceId需要发起流程
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(contract.getApplyNo());
                 dto.setCompleteFirstTask(true);
-                //下一节点执行人单位（下节点接收机构code）
+                // 下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(contract.getMaintenanceUnitCode());
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
@@ -445,12 +434,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     public ProcessTaskDTO submit(String op, JgMaintenanceContract contract) {
-        //组装信息
+        // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(contract.getNextTaskId());
         dto.setComment("提交流程");
-        //下一节点执行人单位（下节点接收机构code）
+        // 下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(contract.getMaintenanceUnitCode());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
@@ -524,21 +513,32 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     private void updateEquipMessage(Long id) {
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(id);
+        ArrayList<String[]> maintenanceManager = new ArrayList<>();
+        maintenanceManager.add(new String[]{jgMaintenanceContract.getMaintenanceManagerOneName(), jgMaintenanceContract.getMaintenanceManagerOnePhone()});
+        maintenanceManager.add(new String[]{jgMaintenanceContract.getMaintenanceManagerTwoName(), jgMaintenanceContract.getMaintenanceManagerTwoPhone()});
+
+
         LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
         lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
         List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
+
         ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
+        // 循环设备
         list.forEach(item -> {
-            IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
-            info.setRecord(item.getEquId());
-            info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
-            info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
-            info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
-            info.setEmergencycall(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
-            info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
-            info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
-            info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
-            data.add(info);
+            // 循环添加两条维保备案信息表数据，存储两个维保负责人
+            for (int i = 0; i < 2; i++) {
+                IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+                info.setRecord(item.getEquId());
+                info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
+                info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
+                String[] manager = maintenanceManager.get(i);
+                info.setMeMaster(ObjectUtils.isEmpty(manager[0]) ? null : manager[0]);
+                info.setEmergencycall(ObjectUtils.isEmpty(manager[1]) ? null : manager[1]);
+                info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
+                info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
+                info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
+                data.add(info);
+            }
         });
         idxBizJgMaintenanceRecordInfoService.saveBatch(data);
     }