From 3d3df168172cf833fd00099d194d4c0aae98cfe7 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Sun, 28 Sep 2025 17:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FacPhotovoltaicPanelServiceImpl.java        |  4 ++--
 .../service/impl/PgsProgressCategoryServiceImpl.java |  1 -
 .../impl/PgsProgressPlanDetailServiceImpl.java       | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
index 647e1d85..0d553e2d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
@@ -312,10 +312,10 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
                                 }
                                 Long matrixId = matrix.getId();*/
                                 // 去掉首字母 (T/G)
-                                String withoutPrefix = name.substring(1);
+                                String withoutPrefix = name.substring(2);
 
                                 // 如果包含"."，只取第一个"."前的数字
-                                int dotIndex = withoutPrefix.indexOf(".");
+                                int dotIndex = withoutPrefix.indexOf("#");
                                 if (dotIndex != -1) {
                                     withoutPrefix = withoutPrefix.substring(0, dotIndex);
                                 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
index fe7db813..dc44122c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
@@ -308,7 +308,6 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
                 // 取分组中的第一条记录的排序字段作为当前VO的排序值
                 List<PgsProgressCategory> value = entry.getValue();
                 PgsProgressCategory first = value.getFirst();
-                topVo.setId(first.getId());
                 topVo.setSort(first.getSort());
                 // 转换为方阵结构的VO列表
                 List<PgsProgressCategoryMatrixStructureTopVo> matrixVoList = value.stream().map(category -> {
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 0df26f5d..486ca87f 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
@@ -174,11 +174,11 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
             throw new ServiceException("进度计划信息不存在", HttpStatus.NOT_FOUND);
         }
         BigDecimal oldFinishedNumber = progressPlan.getFinishedNumber();
-        // 判断完成时间是否大于当前时间
+        // todo 判断完成时间是否大于当前时间
         LocalDate planDate = progressPlanDetail.getDate();
-        if (planDate.isAfter(LocalDate.now())) {
+/*        if (planDate.isAfter(LocalDate.now())) {
             throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST);
-        }
+        }*/
         Long projectId = progressPlanDetail.getProjectId();
         Long progressCategoryId = progressPlanDetail.getProgressCategoryId();
         PgsProgressCategory progressCategory = progressCategoryService.getById(progressCategoryId);
@@ -361,11 +361,11 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
         if (progressPlanDetail == null) {
             throw new ServiceException("进度计划详情信息不存在", HttpStatus.NOT_FOUND);
         }
-        // 判断完成时间是否大于当前时间
+        // todo 判断完成时间是否大于当前时间
         LocalDate date = progressPlanDetail.getDate();
-        if (date.isAfter(LocalDate.now())) {
+/*        if (date.isAfter(LocalDate.now())) {
             throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST);
-        }
+        }*/
         // 判断当前详情是否已提交
         if (progressPlanDetail.getStatus().equals("3")) {
             throw new ServiceException("当前详情已在施工产值中提交，无法提交", HttpStatus.BAD_REQUEST);