From 2b5c73f6ee66601f3386ce43f92acfbb51a10758 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sat, 10 Jan 2026 17:02:27 +0800
Subject: [PATCH] 增加finishTime

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java | 3 +++
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java           | 3 +++
 urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml                                         | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java
index c5f248a..f8d3153 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java
@@ -29,6 +29,9 @@ public class PlanRateSaveReqVO {
     @NotNull(message = "类型：1:养护；2:巡查不能为空")
     private Integer type;
 
+    @Schema(description = "公司ID")
+    private Long companyId;
+
     @NotNull@NotNull(message = "频次明细不能为空")
     @Size(min = 1)
     @Valid
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java
index 2882640..f7436a7 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java
@@ -65,6 +65,9 @@ public class PlanRateServiceImpl implements PlanRateService {
         validatePlanRateExists(createReqVO.getPlanTypeId(), createReqVO.getBusiLine());
         LocalDateTime now = LocalDateTime.now();
         Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if(createReqVO.getCompanyId() != null){
+            companyId = createReqVO.getCompanyId();
+        }
         String userName = SecurityFrameworkUtils.getLoginUserId() + "";
         String rateNo = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS") + RandomUtil.randomInt(1000);
         PlanRateDO planRate = new PlanRateDO();
diff --git a/urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml
index 82ef3df..ba43caa 100644
--- a/urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml
@@ -20,7 +20,7 @@
             garden_plan_rate a,
             garden_plan_rate_detail b
         WHERE
-            a.rate_no=b.rate
+            a.rate_no=b.rate_no
           and b.busi_line=#{busiLine}
           and b.level_id=#{levelId}
           and b.plan_type_id=#{planTypeId}
--
libgit2 0.21.4