|
|
@@ -808,35 +808,29 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
|
|
|
* @param managerId 主检人 ID
|
|
|
*/
|
|
|
private void updateReportInspector(String orderId, String managerId) {
|
|
|
+
|
|
|
List<PipeTaskOrderItemReportDO> reportDOs = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>()
|
|
|
.eq(PipeTaskOrderItemReportDO::getOrderId, orderId));
|
|
|
- if (!reportDOs.isEmpty()){
|
|
|
- List<String> reportIds = new ArrayList<>();
|
|
|
- for (PipeTaskOrderItemReportDO report : reportDOs) {
|
|
|
- reportIds.add(report.getId());
|
|
|
|
|
|
- //刷新报表数据
|
|
|
- BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
|
|
|
- syncReportVO.setRefId(report.getId());
|
|
|
- if (report.getTemplateId() != null){
|
|
|
- syncReportVO.setReportType("record");
|
|
|
- }else{
|
|
|
- syncReportVO.setReportType("report");
|
|
|
- }
|
|
|
- com.alibaba.fastjson2.JSONObject params = new com.alibaba.fastjson2.JSONObject();
|
|
|
- params.put("checkUserId",managerId);
|
|
|
- syncReportVO.setParams(params);
|
|
|
- syncReportData(syncReportVO);
|
|
|
+ if (!reportDOs.isEmpty()){
|
|
|
|
|
|
- }
|
|
|
- List<PipeTaskOrderItemReportUserDO> reportUserDOs = pipeTaskOrderItemReportUserMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportUserDO>()
|
|
|
+ //认领时修改所有检验项目的检验员
|
|
|
+ List<String> reportIds = reportDOs.stream().map(PipeTaskOrderItemReportDO::getId).toList();
|
|
|
+ pipeTaskOrderItemReportUserMapper.delete(new LambdaQueryWrapperX<PipeTaskOrderItemReportUserDO>()
|
|
|
.in(PipeTaskOrderItemReportUserDO::getReportId, reportIds));
|
|
|
- if (!reportUserDOs.isEmpty()){
|
|
|
- for (PipeTaskOrderItemReportUserDO reportUser : reportUserDOs) {
|
|
|
- reportUser.setUserId(managerId);
|
|
|
- pipeTaskOrderItemReportUserMapper.updateById(reportUser);
|
|
|
- }
|
|
|
- }
|
|
|
+ List<PipeTaskOrderItemReportUserDO> reportUserDOList = new ArrayList<>();
|
|
|
+ reportDOs.forEach(reportDO -> {
|
|
|
+
|
|
|
+ PipeTaskOrderItemReportUserDO reportUserDO = new PipeTaskOrderItemReportUserDO();
|
|
|
+ reportUserDO.setUserId(managerId);
|
|
|
+ reportUserDO.setReportId(reportDO.getId());
|
|
|
+ reportUserDOList.add(reportUserDO);
|
|
|
+
|
|
|
+ });
|
|
|
+ pipeTaskOrderItemReportUserMapper.insertBatch(reportUserDOList);
|
|
|
+
|
|
|
+ syncAllReportDataByOrderId(new PipeTaskOrderSyncReportVO().setOrderId(orderId));
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|