修改道路及增加道路频次

王富生
1 parent f78a867b
Showing 7 changed files with 84 additions and 23 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateUpdateRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java
 package com.zteits.urbanops.module.garden.controller.admin.planrate;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -85,6 +86,15 @@ public class PlanRateController {
         return success(BeanUtils.toBean(planRate, PlanRateRespVO.class));
     }
+    @GetMapping("/get-rateNo")
+    @Operation(summary = "获得计划频次明细")
+    @Parameter(name = "rate_no", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')")
+    public CommonResult<PlanRateUpdateRespVO> getPlanRateDetail(@RequestParam("rate_no") @NotBlank String rateNo) {
+        return success(planRateService.getPlanRateDetailByRateNo(rateNo));
+    }
+
+
     @GetMapping("/page")
     @Operation(summary = "获得计划频次分页")
     @PreAuthorize("@ss.hasPermission('garden:plan-rate:query')")
@@ -71,15 +71,6 @@ public class PlanRateDetailController {
         return success(true);
     }
-    @GetMapping("/get-rateNo")
-    @Operation(summary = "获得计划频次明细")
-    @Parameter(name = "rateNo", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')")
-    public CommonResult<List<PlanRateDetailRespVO>> getPlanRateDetail(@RequestParam("rateNo") @NotBlank String rateNo) {
-        List<PlanRateDetailDO> detailList = planRateDetailService.getPlanRateDetailByRateNo(rateNo);
-        return success(BeanUtils.toBean(detailList, PlanRateDetailRespVO.class));
-    }
-
     @GetMapping("/get-rate-value")
     @Operation(summary = "获得计划频次明细")
     @Parameter(name = "busi_Line", description = "业务线", required = true, example = "1024")
+package com.zteits.urbanops.module.garden.controller.admin.planrate.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 计划频次 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PlanRateUpdateRespVO {
+
+    @Schema(description = "频次编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("频次编号")
+    private String rateNo;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政")
+    private String busiLine;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "16546")
+    @ExcelProperty("养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;")
+    private Integer planTypeId;
+
+    @Schema(description = "是否为标准计划: 1:是；2:否", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否为标准计划: 1:是；2:否")
+    private Integer stdPlan;
+
+    @Schema(description = "明细", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("明细")
+    private List<PlanRateDetailRespVO> details;
+
+}
 \ No newline at end of file
@@ -59,14 +59,6 @@ public interface PlanRateDetailService {
     PageResult<PlanRateDetailDO> getPlanRateDetailPage(PlanRateDetailPageReqVO pageReqVO);
     /**
-     * 获得计划频次明细
-     *
-     * @param rateNo 编号
-     * @return 计划频次明细列表
-     */
-    List<PlanRateDetailDO> getPlanRateDetailByRateNo(String  rateNo);
-
-    /**
      * 获取养护频次值对象
      * @param busiLine 业务线
      * @param planTypeId 计划类型
 package com.zteits.urbanops.module.garden.service.planrate;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO;
+import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateMapper;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -26,6 +28,9 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA
 public class PlanRateDetailServiceImpl implements PlanRateDetailService {
     @Resource
+    private PlanRateMapper planRateMapper;
+
+    @Resource
     private PlanRateDetailMapper planRateDetailMapper;
     @Override
@@ -78,12 +83,6 @@ public class PlanRateDetailServiceImpl implements PlanRateDetailService {
         return planRateDetailMapper.selectPage(pageReqVO);
     }
-    @Override
-    public List<PlanRateDetailDO> getPlanRateDetailByRateNo(String rateNo) {
-        QueryWrapper<PlanRateDetailDO> sql = new QueryWrapper<>();
-        sql.lambda().eq(PlanRateDetailDO::getRateNo, rateNo);
-        return planRateDetailMapper.selectList(sql);
-    }
     @Override
     public PlanRateDetailDO getPlanRateValue(String busiLine, Integer planTypeId, Integer levelId) {
@@ -66,4 +66,13 @@ public interface PlanRateService {
      */
     PageResult<PlanRateDO> getPlanRatePage(PlanRatePageReqVO pageReqVO);
+    /**
+     * 获得计划频次明细
+     *
+     * @param rateNo 编号
+     * @return 计划频次明细列表
+     */
+    PlanRateUpdateRespVO getPlanRateDetailByRateNo(String  rateNo);
+
+
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDetailDO;
 import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateDetailMapper;
@@ -155,4 +156,27 @@ public class PlanRateServiceImpl implements PlanRateService {
         return planRateMapper.selectPage(pageReqVO);
     }
+    @Override
+    public PlanRateUpdateRespVO getPlanRateDetailByRateNo(String rateNo) {
+        PlanRateUpdateRespVO respVO = new PlanRateUpdateRespVO();
+        QueryWrapper<PlanRateDO> sql = new QueryWrapper<>();
+        sql.lambda().eq(PlanRateDO::getRateNo, rateNo);
+        /*1.查询对象*/
+        PlanRateDO planRateDO = planRateMapper.selectOne(sql);
+        if(null == planRateDO) {
+            return respVO;
+        }
+        respVO.setRateNo(planRateDO.getRateNo());
+        respVO.setBusiLine(planRateDO.getBusiLine());
+        respVO.setStdPlan(planRateDO.getStdPlan());
+        respVO.setPlanTypeId(planRateDO.getPlanTypeId());
+        /*2.查询明细*/
+        QueryWrapper<PlanRateDetailDO> sqlDetail = new QueryWrapper<>();
+        sqlDetail.lambda().eq(PlanRateDetailDO::getRateNo, rateNo);
+        List<PlanRateDetailDO> detail = planRateDetailMapper.selectList(sqlDetail);
+        List<PlanRateDetailRespVO> list = BeanUtils.toBean(detail, PlanRateDetailRespVO.class);
+        respVO.setDetails(list);
+        return respVO;
+    }
+
 }
 \ No newline at end of file