From 4c363857cfe8f2e0ed0a2fc08f6f3d2c7395a136 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Thu, 4 Dec 2025 21:04:52 +0800 Subject: [PATCH] 机械修改 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java index bcab493..d7db311 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java @@ -75,7 +75,7 @@ public class MechanicalCostSaveReqVO { private String companyId; @Schema(description = "部门id", example = "13645") - private Long deptId; + private List deptId; @Schema(description = "备注", example = "随便") private String remark; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java index 2379eea..fdc0e34 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java @@ -66,7 +66,7 @@ public class RentalMechanicalCostSaveReqVO { private String companyId; @Schema(description = "部门id", example = "25446") - private Long deptId; + private List deptId; @Schema(description = "道路ID数组（多选）") private String roadIds; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java index 1101ea3..f9489c3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java @@ -60,16 +60,6 @@ public class DepartmentCostServiceImpl implements DepartmentCostService { // 更新 DepartmentCostDO updateObj = BeanUtils.toBean(updateReqVO, DepartmentCostDO.class); - // add bt wq 20251119 插入增加校验 - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(DepartmentCostDO::getSalaryMonth, updateObj.getSalaryMonth()); - queryWrapper.eq(DepartmentCostDO::getExpenseName, updateObj.getExpenseName()); - queryWrapper.eq(DepartmentCostDO::getCompanyId, updateObj.getCompanyId()); - List list = departmentCostMapper.selectList(queryWrapper); - if (!CollectionUtils.isEmpty(list)) { - throw exception(COST_FEE_NOT_EXISTS); - } - // add bt wq 20251119 插入增加校验 departmentCostMapper.updateById(updateObj); } -- libgit2 0.21.4