From 49fa80760fab64de71871dca938bd4ad53ebbd8e Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sat, 10 Jan 2026 15:51:12 +0800 Subject: [PATCH] 频次值增加公司 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java | 5 ++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java | 5 +++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java | 5 +++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java | 6 ++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java | 4 ++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateDetailMapper.java | 2 ++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java | 1 + urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java | 9 +++------ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java | 33 +++++++++++++++++++++++++++++++-- urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml | 15 +++++++++++++++ 12 files changed, 74 insertions(+), 15 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java index 39b585f..04edd1b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateController.java @@ -119,8 +119,7 @@ public class PlanRateController { @Operation(summary = "获得计划频次分页") @PreAuthorize("@ss.hasPermission('garden:plan-rate:query')") public CommonResult> getPlanRatePage(@Valid PlanRatePageReqVO pageReqVO) { - PageResult 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 list = planRateService.getPlanRatePage(pageReqVO).getList(); + List list = planRateService.getPlanRatePage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "计划频次.xls", "数据", PlanRateRespVO.class, BeanUtils.toBean(list, PlanRateRespVO.class)); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java index ffaf7dc..b5de6af 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java @@ -82,8 +82,9 @@ public class PlanRateDetailController { @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')") public CommonResult 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") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java index 761f594..2cf1642 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRatePageReqVO.java @@ -1,5 +1,6 @@ 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 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java index 4ad804d..bcb6b25 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/vo/PlanRateRespVO.java @@ -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 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java index f03fa8c..c811f1c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/planrate/PlanRateDO.java @@ -47,6 +47,10 @@ public class PlanRateDO extends BaseDO { * 类型：1:养护；2:巡查 */ private Integer type; + /** + * 公司ID + */ + private Long companyId; } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateDetailMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateDetailMapper.java index 890ed95..7092037 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateDetailMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateDetailMapper.java @@ -31,4 +31,6 @@ public interface PlanRateDetailMapper extends BaseMapperX { 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 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java index 73f6040..6817117 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java @@ -24,6 +24,7 @@ public interface PlanRateInterceptMapper extends BaseMapperX { .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 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java index 86e4344..e0cc774 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java @@ -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 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java index 21160c6..c2725b7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java @@ -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 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); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java index e020402..0d58fb6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateService.java @@ -64,7 +64,7 @@ public interface PlanRateService { * @param pageReqVO 分页查询 * @return 计划频次分页 */ - PageResult getPlanRatePage(PlanRatePageReqVO pageReqVO); + PageResult getPlanRatePage(PlanRatePageReqVO pageReqVO); /** * 获得计划频次明细 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 2cb2e9c..2882640 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 @@ -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 getPlanRatePage(PlanRatePageReqVO pageReqVO) { - return planRateInterceptMapper.selectForPage(pageReqVO); + public PageResult getPlanRatePage(PlanRatePageReqVO pageReqVO) { + Long companyId = SecurityFrameworkUtils.getCompanyId(); + if(companyId == 100L){ + companyId = null; + } + pageReqVO.setCompanyId(companyId); + PageResult pageResult = planRateInterceptMapper.selectForPage(pageReqVO); + if(CollectionUtils.isEmpty(pageResult.getList())){ + return PageResult.empty(); + } + PageResult result = BeanUtils.toBean(pageResult, PlanRateRespVO.class); + List companyIds = result.getList().stream().map(PlanRateRespVO::getCompanyId).collect(Collectors.toList()); + Map deptMap = deptApi.getDeptMap(companyIds); + result.getList().forEach(planRate -> { + DeptRespDTO deptRespDTO = deptMap.get(planRate.getCompanyId()); + if(deptRespDTO !=null){ + planRate.setCompanyName(deptRespDTO.getName()); + } + + }); + + return result; } @Override 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 cb72a7f..82ef3df 100644 --- a/urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/planrate/PlanRateDetailMapper.xml @@ -12,4 +12,19 @@ delete from garden_plan_rate_detail where rate_no=#{rateNo} + + \ No newline at end of file -- libgit2 0.21.4