From 660925df3135c240231162600242241b0536b878 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 10 Jul 2025 13:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=9C=88=E6=8A=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapping/CsEquipmentDeliveryMapper.xml     | 20 +++++++++++--------
 .../impl/StatisticsDataDataServiceImpl.java   | 12 +++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
index 961580a..672ada1 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
@@ -111,13 +111,17 @@
             count(1)
         from
             cs_equipment_delivery
-        where
-            process = #{queryParam.process}
-        <if test="queryParam.runStatus != null and queryParam.runStatus !=''">
-            and run_status = #{queryParam.runStatus}
-        </if>
-        <if test="queryParam.searchValue != null and queryParam.searchValue !=''">
-            and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
-        </if>
+        <where>
+            1=1
+            <if test="queryParam.process != null and queryParam.process !=''">
+                and process = #{queryParam.process}
+            </if>
+            <if test="queryParam.runStatus != null and queryParam.runStatus !=''">
+                and run_status = #{queryParam.runStatus}
+            </if>
+            <if test="queryParam.searchValue != null and queryParam.searchValue !=''">
+                and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
index 6f6bef2..6d4fec4 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
@@ -3,10 +3,8 @@ package com.njcn.csharmonic.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.access.api.CsLineLatestDataFeignClient;
 import com.njcn.access.pojo.po.CsLineLatestData;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.api.IntegrityFeignClient;
-import com.njcn.csdevice.api.OnlineRateFeignClient;
+import com.njcn.csdevice.api.*;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.po.RStatIntegrityD;
@@ -43,6 +41,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
     private final IntegrityFeignClient integrityFeignClient;
     private final OnlineRateFeignClient onlineRateFeignClient;
     private final CsLineLatestDataFeignClient csLineLatestDataFeignClient;
+    private final CsLedgerFeignClient csLedgerFeignClient;
 
     @Override
     public List<DataVo> getLineIntegrity(StatisticsDataParam param) {
@@ -111,11 +110,12 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
 
                 equipmentDeliveryList.forEach(dev->{
                     List<CsLinePO> list = devMap.get(dev.getId());
+                    DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(dev.getId()).getData();
                     if (CollectionUtil.isNotEmpty(list)) {
                         list.forEach(line->{
                             HalfMonthReportVO vo = new HalfMonthReportVO();
-                            vo.setEngineeringName("工程名称");
-                            vo.setProjectName("项目名称");
+                            vo.setEngineeringName(devDetail.getEngineeringName());
+                            vo.setProjectName(devDetail.getProjectName());
                             vo.setDevName(dev.getName());
                             vo.setDevType(dev.getDevModel());
                             vo.setMac(dev.getMac());