计划表复制出来的数据

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboilerscheduling/vo/BoilerCalendarItemRespVO.java

@@ -59,4 +59,7 @@ public class BoilerCalendarItemRespVO {
 
     @Schema(description = "任务状态")
     private Integer taskStatus;
+
+    @Schema(description = "确认id")
+    private String confirmOrderId;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -498,6 +498,28 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
                     status = 600; // 已办结
                 }
             }
+            // 复制出来的行没有约检确认单，通过 confirmOrderId 找源排期，用源排期的关联状态
+            if (status == 100 && StringUtils.isNotBlank(item.getConfirmOrderId())) {
+                PipeShiftScheduleReqVO r = new PipeShiftScheduleReqVO();
+                r.setConfirmOrderId(item.getConfirmOrderId());
+                PipeShiftScheduleRespVO sourceItem = equipPipeSchedulingMapper.getShiftScheduleById(r);
+                if (sourceItem != null) {
+                    if (sourceItem.getAppointmentId() != null) {
+                        status = 200; // 待约检
+                    }
+                    if (sourceItem.getAcceptStatus() != null && sourceItem.getAcceptStatus() == 200) {
+                        status = 300; // 已受理
+                    }
+                    if (sourceItem.getTaskStatus() != null) {
+                        status = 400; // 检测中
+                        if (sourceItem.getTaskStatus() >= 800) {
+                            status = 600;
+                        } else if (sourceItem.getTaskStatus() >= 710) {
+                            status = 500;
+                        }
+                    }
+                }
+            }
             item.setStatus(status);
         });
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipescheduling/EquipPipeSchedulingMapper.xml

@@ -529,7 +529,7 @@
     <select id="selectPlanCalendar">
         select a.ID task_id,a.TYPE check_type,b.unit_code,b.unit_name,b.unit_address,a.plan_date,count(distinct c.ID) equip_count,
         b.equip_district,b.equip_street,a.source,FIRST_VALUE(b.lng) lng,FIRST_VALUE(b.lat) lat,
-        e.id APPOINTMENT_ID,f.id ACCEPT_ORDER_ID,f.STATUS accept_status, g.TASK_STATUS
+        e.id APPOINTMENT_ID,f.id ACCEPT_ORDER_ID,f.STATUS accept_status, g.TASK_STATUS,a.confirm_order_id
         from PRESSURE2_EQUIP_PIPE_SCHEDULING a
         inner join PRESSURE2_EQUIP_PIPE_SCHEDULING_ITEM c on c.SCHEDULING_ID = a.ID and c.DELETED = 0
         inner join PRESSURE2_EQUIP_PIPE b on b.ID = c.equip_id and b.DELETED = 0