频次值增加公司

王富生
1 parent a7160ef9
Showing 12 changed files with 74 additions and 15 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/PlanRatePageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.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
urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml
@@ -119,8 +119,7 @@ public class PlanRateController {
     @Operation(summary = "获得计划频次分页")
     @PreAuthorize("@ss.hasPermission('garden:plan-rate:query')")
     public CommonResult<PageResult<PlanRateRespVO>> getPlanRatePage(@Valid PlanRatePageReqVO pageReqVO) {
-        PageResult<PlanRateDO> pageResult = planRateService.getPlanRatePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PlanRateRespVO.class));
+        return success(planRateService.getPlanRatePage(pageReqVO));
     }
     @GetMapping("/export-excel")
@@ -130,7 +129,7 @@ public class PlanRateController {
     public void exportPlanRateExcel(@Valid PlanRatePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PlanRateDO> list = planRateService.getPlanRatePage(pageReqVO).getList();
+        List<PlanRateRespVO> list = planRateService.getPlanRatePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "计划频次.xls", "数据", PlanRateRespVO.class,
                         BeanUtils.toBean(list, PlanRateRespVO.class));
@@ -82,8 +82,9 @@ public class PlanRateDetailController {
     @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')")
     public CommonResult<PlanRateDetailRespVO> getPlanRateValue(@RequestParam("busi_Line") @NotBlank String busiLine,
                                                                @RequestParam("plan_type_id") @NotNull Integer planTypeId,
-                                                               @RequestParam("level_id") @NotNull Integer levelId) {
-        return success(planRateDetailService.getPlanRateValue(busiLine, planTypeId, levelId));
+                                                               @RequestParam("level_id") @NotNull Integer levelId,
+                                                               @RequestParam("company_id")  Long companyId) {
+        return success(planRateDetailService.getPlanRateValue(busiLine, planTypeId, levelId, companyId));
     }
     @GetMapping("/page")
 package com.zteits.urbanops.module.garden.controller.admin.planrate.vo;
+import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import java.util.*;
@@ -30,4 +31,8 @@ public class PlanRatePageReqVO extends PageParam {
     @NotNull(message = "类型：1:养护；2:巡查不能为空")
     private Integer type;
+    @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Hidden
+    private Long companyId;
+
 }
 \ No newline at end of file
@@ -36,4 +36,10 @@ public class PlanRateRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
+    @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long companyId;
+
+    @Schema(description = "公司", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String companyName;
+
 }
 \ No newline at end of file
@@ -47,6 +47,10 @@ public class PlanRateDO extends BaseDO {
      * 类型：1:养护；2:巡查
      */
     private Integer type;
+    /**
+     * 公司ID
+     */
+    private Long companyId;
 }
 \ No newline at end of file
@@ -31,4 +31,6 @@ public interface PlanRateDetailMapper extends BaseMapperX&lt;PlanRateDetailDO&gt; {
     int deleteByRateNo(@Param("rateNo") String rateNo);
+    PlanRateDetailDO getPlanRateDetail(@Param("busiLine") String busiLine, @Param("planTypeId")  Integer planTypeId, @Param("levelId")  Integer levelId, @Param("companyId")  Long companyId);
+
 }
 \ No newline at end of file
@@ -24,6 +24,7 @@ public interface PlanRateInterceptMapper extends BaseMapperX&lt;PlanRateDO&gt; {
                 .eqIfPresent(PlanRateDO::getPlanTypeId, reqVO.getPlanTypeId())
                 .eqIfPresent(PlanRateDO::getStdPlan, reqVO.getStdPlan())
                 .eq(PlanRateDO::getType, reqVO.getType())
+                .eqIfPresent(PlanRateDO::getCompanyId, reqVO.getCompanyId())
                 .orderByDesc(PlanRateDO::getId));
     }
 }
 \ No newline at end of file
@@ -65,6 +65,6 @@ public interface PlanRateDetailService {
      * @param levelId 道路等级
      * @return 对象
      */
-    PlanRateDetailRespVO getPlanRateValue(String busiLine,Integer planTypeId,Integer levelId);
+    PlanRateDetailRespVO getPlanRateValue(String busiLine,Integer planTypeId,Integer levelId, Long companyId);
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO;
 import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateMapper;
 import com.zteits.urbanops.module.system.api.dict.DictDataApi;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,12 +93,8 @@ public class PlanRateDetailServiceImpl implements PlanRateDetailService {
     @Override
-    public PlanRateDetailRespVO getPlanRateValue(String busiLine, Integer planTypeId, Integer levelId) {
-        QueryWrapper<PlanRateDetailDO> sql =  new QueryWrapper<>();
-        sql.lambda().eq(PlanRateDetailDO::getBusiLine, busiLine)
-                        .eq(PlanRateDetailDO::getPlanTypeId, planTypeId)
-                        .eq(PlanRateDetailDO::getLevelId, levelId);
-        PlanRateDetailDO planRateDetailDO = planRateDetailMapper.selectOne(sql);
+    public PlanRateDetailRespVO getPlanRateValue(String busiLine, Integer planTypeId, Integer levelId, Long companyId) {
+        PlanRateDetailDO planRateDetailDO = planRateDetailMapper.getPlanRateDetail(busiLine, planTypeId, levelId, companyId);
         if (planRateDetailDO == null) {
             throw exception(PLAN_RATE_NOT_EXISTS);
         }
@@ -64,7 +64,7 @@ public interface PlanRateService {
      * @param pageReqVO 分页查询
      * @return 计划频次分页
      */
-    PageResult<PlanRateDO> getPlanRatePage(PlanRatePageReqVO pageReqVO);
+    PageResult<PlanRateRespVO> getPlanRatePage(PlanRatePageReqVO pageReqVO);
     /**
      * 获得计划频次明细
@@ -12,13 +12,17 @@ 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;
 import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateInterceptMapper;
+import com.zteits.urbanops.module.system.api.dept.DeptApi;
+import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO;
@@ -51,12 +55,16 @@ public class PlanRateServiceImpl implements PlanRateService {
     @Resource
     private DictDataCommonApi dictDataCommonApi;
+    @Resource
+    private DeptApi deptApi;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Long createPlanRate(PlanRateSaveReqVO createReqVO) {
         // 校验存在
         validatePlanRateExists(createReqVO.getPlanTypeId(), createReqVO.getBusiLine());
         LocalDateTime now = LocalDateTime.now();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         String userName = SecurityFrameworkUtils.getLoginUserId() + "";
         String rateNo = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS") + RandomUtil.randomInt(1000);
         PlanRateDO planRate = new PlanRateDO();
@@ -65,6 +73,7 @@ public class PlanRateServiceImpl implements PlanRateService {
         planRate.setBusiLine(createReqVO.getBusiLine());
         planRate.setPlanTypeId(createReqVO.getPlanTypeId());
         planRate.setType(createReqVO.getType());
+        planRate.setCompanyId(companyId);
         planRate.setCreator(userName);
         planRate.setCreateTime(now);
         planRate.setUpdater(userName);
@@ -181,8 +190,28 @@ public class PlanRateServiceImpl implements PlanRateService {
     }
     @Override
-    public PageResult<PlanRateDO> getPlanRatePage(PlanRatePageReqVO pageReqVO) {
-        return planRateInterceptMapper.selectForPage(pageReqVO);
+    public PageResult<PlanRateRespVO> getPlanRatePage(PlanRatePageReqVO pageReqVO) {
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if(companyId == 100L){
+            companyId = null;
+        }
+        pageReqVO.setCompanyId(companyId);
+        PageResult<PlanRateDO> pageResult = planRateInterceptMapper.selectForPage(pageReqVO);
+        if(CollectionUtils.isEmpty(pageResult.getList())){
+            return PageResult.empty();
+        }
+        PageResult<PlanRateRespVO> result = BeanUtils.toBean(pageResult, PlanRateRespVO.class);
+        List<Long> companyIds = result.getList().stream().map(PlanRateRespVO::getCompanyId).collect(Collectors.toList());
+        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(companyIds);
+        result.getList().forEach(planRate -> {
+            DeptRespDTO deptRespDTO = deptMap.get(planRate.getCompanyId());
+            if(deptRespDTO !=null){
+                planRate.setCompanyName(deptRespDTO.getName());
+            }
+
+        });
+
+        return result;
     }
     @Override
@@ -12,4 +12,19 @@
     <delete id="deleteByRateNo">
         delete from garden_plan_rate_detail where rate_no=#{rateNo}
     </delete>
+
+    <select id="getPlanRateDetail" resultType="com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDetailDO">
+        SELECT
+            b.*
+        FROM
+            garden_plan_rate a,
+            garden_plan_rate_detail b
+        WHERE
+            a.rate_no=b.rate
+          and b.busi_line=#{busiLine}
+          and b.level_id=#{levelId}
+          and b.plan_type_id=#{planTypeId}
+          and a.company_id= #{companyId}
+	      limit 1
+    </select>
 </mapper>
 \ No newline at end of file