xuzhancheng 1 kuukausi sitten
vanhempi
commit
c145dcd15f

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemPageRespVO.java

@@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -195,6 +196,8 @@ public class BoilerOrderItemPageRespVO {
     @Schema(description = "报告列表")
     private List<BoilerTaskOrderItemReportDO> reportDOList;
 
+    private Map<String,String> idToPartName;
+
     private String enterName;
 
     private String prepareName;

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -899,6 +899,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 long remainingDays = java.time.temporal.ChronoUnit.DAYS.between(java.time.LocalDate.now(), targetDate);
                 item.setRemainingDays((int) remainingDays);
             }
+
+            List<String> ids = item.getReportDOList().stream().map(BoilerTaskOrderItemReportDO::getItemPartId).toList();
+            item.setIdToPartName(boilerTaskOrderItemPartMapper.selectByIds(ids).stream().collect(Collectors.toMap(BoilerTaskOrderItemPartDO::getId, BoilerTaskOrderItemPartDO::getPartName)));
         });
 
         pageResult.setList(boilerOrderItemPageRespVOS);

+ 2 - 2
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitempart/BoilerTaskOrderItemPartServiceImpl.java

@@ -113,8 +113,8 @@ public class BoilerTaskOrderItemPartServiceImpl extends ServiceImpl<BoilerTaskOr
                 String[] parts = templateDetailRespVO.getPart().split("/");
                 for (String part : parts) {
                     BoilerOrderItemAddReportV2VO boilerOrderItemAddReportV2VO = new BoilerOrderItemAddReportV2VO();
-                    boilerOrderItemAddReportV2VO.setPartType(part);
-                    boilerOrderItemAddReportV2VO.setItemPartId(partIdMap.get(part));
+                    boilerOrderItemAddReportV2VO.setPartType(partIdMap.get(part));
+//                    boilerOrderItemAddReportV2VO.setItemPartId(partIdMap.get(part));
                     boilerOrderItemAddReportV2VO.setType(200);
                     BoilerOrderItemAddReportVO boilerOrderItemAddReportVO = new BoilerOrderItemAddReportVO();
                     String templateId = templateDetailRespVO.getTemplateId();