From ec54b4ff529b0bda0549781b645b208f9f4fc4f3 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Fri, 17 Oct 2025 15:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E3=80=81=E4=BA=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/out/domain/OutConstructionValue.java   |  5 +++++
 .../out/domain/vo/OutConstructionValueVo.java      | 10 ++++++++++
 .../impl/OutConstructionValueServiceImpl.java      |  9 ++++++++-
 .../impl/PgsProgressPlanDetailServiceImpl.java     |  2 ++
 .../safetyinspection/HseSafetyInspectionGis.java   | 10 ----------
 .../impl/HseSafetyInspectionServiceImpl.java       | 14 +++++++++++---
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutConstructionValue.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutConstructionValue.java
index 64ce212d..6ec3d0e5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutConstructionValue.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutConstructionValue.java
@@ -50,6 +50,11 @@ public class OutConstructionValue extends BaseEntity {
      */
     private Long progressCategoryId;
 
+    /**
+     * 分项工程名称
+     */
+    private String progressCategoryName;
+
     /**
      * 计划详情id
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java
index 9f52a4bc..578ab876 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java
@@ -176,4 +176,14 @@ public class OutConstructionValueVo implements Serializable {
      * 计量方式（0无 1数量 2百分比）
      */
     private String unitType;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 完成数量
+     */
+    private Integer completeNum;
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
index 87e5e8b8..1345fc84 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
@@ -110,7 +110,6 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
     private LambdaQueryWrapper<OutConstructionValue> buildQueryWrapper(OutConstructionValueBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<OutConstructionValue> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(OutConstructionValue::getId);
         Long projectId = bo.getProjectId();
         List<Long> ids = new ArrayList<>();
         if (projectId != null) {
@@ -150,6 +149,9 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
                 lqw.in(OutConstructionValue::getProgressCategoryId, categoryIds);
             }
         }
+        lqw.orderByAsc(OutConstructionValue::getProgressCategoryName);
+        lqw.orderByDesc(OutConstructionValue::getProgressCategoryId);
+        lqw.orderByDesc(OutConstructionValue::getReportDate);
         return lqw;
     }
 
@@ -357,6 +359,7 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
         vo.setProgressCategoryName(pgsProgressCategoryVo.getName());
         vo.setWorkType(pgsProgressCategoryVo.getWorkType());
         vo.setUnitType(pgsProgressCategoryVo.getUnitType());
+        vo.setUnit(pgsProgressCategoryVo.getUnit());
         PgsProgressCategoryVo pgsProgressCategoryVo1 = pgsProgressCategoryService.queryById(pgsProgressCategoryVo.getParentId());
         vo.setCategoryId(pgsProgressCategoryVo1.getId());
         vo.setCategoryName(pgsProgressCategoryVo1.getName());
@@ -368,10 +371,14 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
         if (vo.getMatrixId() != null && vo.getMatrixId() != 0) {
             FacMatrix facMatrix = facMatrixService.getById(vo.getMatrixId());
             vo.setMatrixName(facMatrix.getMatrixName());
+            vo.setCategoryName(facMatrix.getMatrixName() + "/" + pgsProgressCategoryVo1.getName());
         }
         BusProjectVo busProjectVo1 = busProjectService.queryById(pgsProgressCategoryVo.getProjectId());
         vo.setSubProjectId(busProjectVo1.getId());
         vo.setSubProjectName(busProjectVo1.getProjectName());
+
+        // 统计完成数量
+        vo.setCompleteNum(vo.getArtificialNum() + vo.getUavNum());
     }
 
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
index b51a55e5..cf57b98f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
@@ -971,6 +971,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
                     value.setRangeId(rangeId);
                     value.setMatrixId(category.getMatrixId());
                     value.setProgressCategoryId(progressCategoryId);
+                    value.setProgressCategoryName(category.getName());
                     value.setDetailId(planDetail.getId());
                     BigDecimal finishedNumber = planDetail.getFinishedNumber();
                     BigDecimal aiFill = planDetail.getAiFill();
@@ -1049,6 +1050,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
                     value.setRangeId(range.getId());
                     value.setMatrixId(category.getMatrixId());
                     value.setProgressCategoryId(progressCategoryId);
+                    value.setProgressCategoryName(category.getName());
                     value.setDetailId(planDetail.getId());
                     BigDecimal finishedNumber = planDetail.getFinishedNumber();
                     BigDecimal aiFill = planDetail.getAiFill();
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java
index 9c0fff89..2e3f74c2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java
@@ -20,21 +20,11 @@ public class HseSafetyInspectionGis implements Serializable {
      */
     private Long id;
 
-    /**
-     * 项目ID
-     */
-    private Long projectId;
-
     /**
      * 检查类型
      */
     private String checkType;
 
-    /**
-     * 检查项目
-     */
-    private String checkProject;
-
     /**
      * 违章类型
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
index f53ad932..3b8fbe22 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
@@ -234,9 +234,13 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
             .filter(q -> "1".equals(q.getIsReply()))
             .filter(q -> !q.getStatus().equals(HseSafetyInspectionStatusEnum.INFORM.getValue()))
             .toList();
-        List<HseSafetyInspectionGis> pass = passList.stream().map(s -> {
+        List<HseSafetyInspectionGis> pass = passList.stream().map(p -> {
             HseSafetyInspectionGis gis = new HseSafetyInspectionGis();
-            BeanUtils.copyProperties(s, gis);
+            gis.setId(p.getId());
+            gis.setCheckType(p.getCheckType());
+            gis.setViolationType(p.getViolationType());
+            gis.setInspectionResult(p.getInspectionResult());
+            gis.setStatus(p.getStatus());
             return gis;
         }).toList();
         gisVo.setTeamMeetingCount((long) teamMeetings.size());
@@ -245,7 +249,11 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
             .toList()
             .stream().map(p -> {
                 HseSafetyInspectionGis gis = new HseSafetyInspectionGis();
-                BeanUtils.copyProperties(p, gis);
+                gis.setId(p.getId());
+                gis.setCheckType(p.getCheckType());
+                gis.setViolationType(p.getViolationType());
+                gis.setInspectionResult(p.getInspectionResult());
+                gis.setStatus(p.getStatus());
                 return gis;
             }).toList();
         gisVo.setSafetyInspectionCount((long) inspections.size());