Commit eba00c52 authored by 刘林's avatar 刘林

fix(jg):监管业务系统,电梯设备在维保合同备案时,申请页面添加设备履历信息不合适,如果多各电梯设备时无法确定是哪个电梯设备的变更履历,去掉维保合同备案申请…

fix(jg):监管业务系统,电梯设备在维保合同备案时,申请页面添加设备履历信息不合适,如果多各电梯设备时无法确定是哪个电梯设备的变更履历,去掉维保合同备案申请单的设备履历信息标签,通过查看设备详情去查看设备履历
parent 6725cbf9
...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; ...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -32,6 +33,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient; ...@@ -32,6 +33,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService; import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis; import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; 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.enums.FlowStatusEnum;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model; import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
...@@ -106,6 +108,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -106,6 +108,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
private ICmWorkflowService iCmWorkflowService; private ICmWorkflowService iCmWorkflowService;
@Autowired @Autowired
EventPublisher eventPublisher; EventPublisher eventPublisher;
@Autowired
private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
/** /**
* 分页查询 * 分页查询
...@@ -723,6 +728,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -723,6 +728,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
maintenanceRecordInfoList.add(info); maintenanceRecordInfoList.add(info);
}); });
List<String> equIds = list.stream()
.map(JgMaintenanceContractEq::getEquId)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
if (!equIds.isEmpty()) {
idxBizJgUseInfoService.update(new LambdaUpdateWrapper<IdxBizJgUseInfo>()
.in(IdxBizJgUseInfo::getRecord, equIds)
.set(IdxBizJgUseInfo::getSafetyManager, jgMaintenanceContract.getMaintenanceManagerName())
.set(IdxBizJgUseInfo::getPhone, jgMaintenanceContract.getMaintenanceManagerPhone()));
}
jgResumeInfoService.saveBatchResume( jgResumeInfoService.saveBatchResume(
list.stream() list.stream()
.map(v -> JgResumeInfoDto.builder() .map(v -> JgResumeInfoDto.builder()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment