增加finishTime

王富生
1 parent 81e72cd3
Showing 3 changed files with 7 additions and 1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml
@@ -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
@@ -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();
@@ -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}