BJ_FS / urbanops

Commit 96792960ded8ec47117dbfe947bcc78d8e250801

Authored by 王彪总
2 parents b3c0caf4 05c0f455

Merge branch 'dev' into de_wangfs_202511

Inline Side-by-side
Showing 17 changed files with 65 additions and 28 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java
  View file @9679296
... ... @@ -13,7 +13,7 @@ public class TeamBizdomainRelVo {
13 13 /**
14 14 * 班组编码
15 15 */
16   - private String teamId;
  16 + private Long teamId;
17 17 /**
18 18 * 班组名称
19 19 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java
  View file @9679296
1 1 package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost;
2 2  
  3 +import com.fhs.core.trans.anno.TransMethodResult;
3 4 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
4 5 import com.zteits.urbanops.framework.common.pojo.CommonResult;
5 6 import com.zteits.urbanops.framework.common.pojo.PageParam;
... ... @@ -82,6 +83,7 @@ public class MechanicalCostController {
82 83 @GetMapping("/page")
83 84 @Operation(summary = "获得自有机械费用录入分页")
84 85 @PreAuthorize("@ss.hasPermission('garden:mechanical-cost:query')")
  86 + @TransMethodResult
85 87 public CommonResult<PageResult<MechanicalCostRespVO>> getMechanicalCostPage(@Valid MechanicalCostPageReqVO pageReqVO) {
86 88 PageResult<MechanicalCostDO> pageResult = mechanicalCostService.getMechanicalCostPage(pageReqVO);
87 89 return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class));
... ... @@ -90,6 +92,7 @@ public class MechanicalCostController {
90 92 @GetMapping("/list")
91 93 @Operation(summary = "自有机械费用录入-列表(兼容旧路径)")
92 94 @PreAuthorize("@ss.hasPermission('garden:mechanical-cost:query')")
  95 + @TransMethodResult
93 96 public CommonResult<PageResult<MechanicalCostRespVO>> list(@Valid MechanicalCostPageReqVO pageReqVO) {
94 97 PageResult<MechanicalCostDO> pageResult = mechanicalCostService.getMechanicalCostPage(pageReqVO);
95 98 return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class));
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java
  View file @9679296
... ... @@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo;
3 3 import cn.hutool.core.annotation.Alias;
4 4 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
5 5 import cn.idev.excel.annotation.ExcelProperty;
  6 +import com.fhs.core.trans.anno.Trans;
  7 +import com.fhs.core.trans.constant.TransType;
6 8 import io.swagger.v3.oas.annotations.media.Schema;
7 9 import lombok.Data;
8 10  
... ... @@ -85,8 +87,10 @@ public class MechanicalCostRespVO {
85 87 private LocalDateTime createTime;
86 88  
87 89 @Schema(description = "班组", example = "班组")
88   - @ExcelProperty("班组")
89   - @Alias("deptId")
90   - private List<String> teamIdList;
  90 + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
  91 + key = "id", fields = "name", ref = "deptNames")
  92 + private List<Long> deptId;
  93 +
  94 + private String deptNames;
91 95  
92 96 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java
  View file @9679296
... ... @@ -20,7 +20,7 @@ import jakarta.validation.Valid;
20 20 import org.springframework.security.access.prepost.PreAuthorize;
21 21 import org.springframework.validation.annotation.Validated;
22 22 import org.springframework.web.bind.annotation.*;
23   -
  23 +import com.fhs.core.trans.anno.TransMethodResult;
24 24 import java.io.IOException;
25 25 import java.util.List;
26 26  
... ... @@ -81,6 +81,7 @@ public class PersonalCostController {
81 81 @GetMapping("/page")
82 82 @Operation(summary = "获得人员费用录入 - 个人费用分页")
83 83 @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')")
  84 + @TransMethodResult
84 85 public CommonResult<PageResult<PersonalCostRespVO>> getPersonalCostPage(@Valid PersonalCostPageReqVO pageReqVO) {
85 86 PageResult<PersonalCostDO> pageResult = personalCostService.getPersonalCostPage(pageReqVO);
86 87 return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class));
... ... @@ -89,6 +90,7 @@ public class PersonalCostController {
89 90 @GetMapping("/list")
90 91 @Operation(summary = "获得人员费用录入 - 个人费用分页")
91 92 @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')")
  93 + @TransMethodResult
92 94 public CommonResult<PageResult<PersonalCostRespVO>> list(@Valid PersonalCostPageReqVO pageReqVO) {
93 95 PageResult<PersonalCostDO> pageResult = personalCostService.getPersonalCostPage(pageReqVO);
94 96 return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class));
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java
  View file @9679296
1 1 package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo;
2 2  
3   -import cn.hutool.core.annotation.Alias;
4 3 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
5 4 import cn.idev.excel.annotation.ExcelProperty;
  5 +import com.fhs.core.trans.anno.Trans;
  6 +import com.fhs.core.trans.constant.TransType;
  7 +import com.fhs.core.trans.vo.VO;
6 8 import io.swagger.v3.oas.annotations.media.Schema;
7 9 import lombok.Data;
8 10  
... ... @@ -13,7 +15,7 @@ import java.util.List;
13 15 @Schema(description = "管理后台 - 人员费用录入 - 个人费用 Response VO")
14 16 @Data
15 17 @ExcelIgnoreUnannotated
16   -public class PersonalCostRespVO {
  18 +public class PersonalCostRespVO implements VO {
17 19  
18 20 @Schema(description = "记录ID，自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14090")
19 21 @ExcelProperty("记录ID，自增主键")
... ... @@ -56,7 +58,9 @@ public class PersonalCostRespVO {
56 58 private LocalDateTime createTime;
57 59  
58 60 @Schema(description = "班组", example = "班组")
59   - @ExcelProperty("班组")
60   - @Alias("deptId")
61   - private List<String> teamIdList;
  61 + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
  62 + key = "id", fields = "name", ref = "deptNames")
  63 + private List<Long> deptId;
  64 +
  65 + private String deptNames;
62 66 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java
  View file @9679296
1 1 package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost;
2 2  
  3 +import com.fhs.core.trans.anno.TransMethodResult;
3 4 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
4 5 import com.zteits.urbanops.framework.common.pojo.CommonResult;
5 6 import com.zteits.urbanops.framework.common.pojo.PageParam;
... ... @@ -81,6 +82,7 @@ public class RentalMechanicalCostController {
81 82 @GetMapping("/page")
82 83 @Operation(summary = "获得租赁机械费用录入分页")
83 84 @PreAuthorize("@ss.hasPermission('garden:rental-mechanical-cost:query')")
  85 + @TransMethodResult
84 86 public CommonResult<PageResult<RentalMechanicalCostRespVO>> getRentalMechanicalCostPage(@Valid RentalMechanicalCostPageReqVO pageReqVO) {
85 87 PageResult<RentalMechanicalCostDO> pageResult = rentalMechanicalCostService.getRentalMechanicalCostPage(pageReqVO);
86 88 return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class));
... ... @@ -89,6 +91,7 @@ public class RentalMechanicalCostController {
89 91 @GetMapping("/list")
90 92 @Operation(summary = "租赁机械费用录入-列表(兼容旧路径)")
91 93 @PreAuthorize("@ss.hasPermission('garden:rental-mechanical-cost:query')")
  94 + @TransMethodResult
92 95 public CommonResult<PageResult<RentalMechanicalCostRespVO>> list(@Valid RentalMechanicalCostPageReqVO pageReqVO) {
93 96 PageResult<RentalMechanicalCostDO> pageResult = rentalMechanicalCostService.getRentalMechanicalCostPage(pageReqVO);
94 97 return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class));
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java
  View file @9679296
... ... @@ -2,6 +2,8 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.
2 2  
3 3 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
4 4 import cn.idev.excel.annotation.ExcelProperty;
  5 +import com.fhs.core.trans.anno.Trans;
  6 +import com.fhs.core.trans.constant.TransType;
5 7 import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
6 8 import io.swagger.v3.oas.annotations.media.Schema;
7 9 import lombok.Data;
... ... @@ -71,10 +73,6 @@ public class RentalMechanicalCostRespVO {
71 73 @ExcelProperty("归属公司ID")
72 74 private String companyId;
73 75  
74   - @Schema(description = "部门id", example = "25446")
75   - @ExcelProperty("部门id")
76   - private Long deptId;
77   -
78 76 @Schema(description = "道路ID数组（多选）")
79 77 @ExcelProperty("道路ID数组（多选）")
80 78 private String roadIds;
... ... @@ -89,5 +87,10 @@ public class RentalMechanicalCostRespVO {
89 87  
90 88 @ExcelProperty("班组")
91 89 private List<TeamBizdomainRelVo> teamIds;
  90 + @Schema(description = "班组", example = "班组")
  91 + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
  92 + key = "id", fields = "name", ref = "deptNames")
  93 + private List<Long> deptId;
92 94  
  95 + private String deptNames;
93 96 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java
  View file @9679296
1 1 package com.zteits.urbanops.module.garden.controller.admin.wasterecord;
2 2  
  3 +import com.fhs.core.trans.anno.TransMethodResult;
3 4 import org.springframework.web.bind.annotation.*;
4 5 import jakarta.annotation.Resource;
5 6 import org.springframework.validation.annotation.Validated;
... ... @@ -83,6 +84,7 @@ public class WasteRecordController {
83 84 @GetMapping("/page")
84 85 @Operation(summary = "获得园林废弃物录入分页")
85 86 @PreAuthorize("@ss.hasPermission('garden:waste-record:query')")
  87 + @TransMethodResult
86 88 public CommonResult<PageResult<WasteRecordRespVO>> getWasteRecordPage(@Valid WasteRecordPageReqVO pageReqVO) {
87 89 PageResult<WasteRecordDO> pageResult = wasteRecordService.getWasteRecordPage(pageReqVO);
88 90 return success(BeanUtils.toBean(pageResult, WasteRecordRespVO.class));
... ... @@ -91,6 +93,7 @@ public class WasteRecordController {
91 93 @GetMapping("/list")
92 94 @Operation(summary = "园林废弃物录入-列表(兼容旧路径)")
93 95 @PreAuthorize("@ss.hasPermission('garden:waste-record:query')")
  96 + @TransMethodResult
94 97 public CommonResult<PageResult<WasteRecordRespVO>> list(@Valid WasteRecordPageReqVO pageReqVO) {
95 98 PageResult<WasteRecordDO> pageResult = wasteRecordService.getWasteRecordPage(pageReqVO);
96 99 return success(BeanUtils.toBean(pageResult, WasteRecordRespVO.class));
... ... @@ -109,4 +112,4 @@ public class WasteRecordController {
109 112 BeanUtils.toBean(list, WasteRecordRespVO.class));
110 113 }
111 114  
112   -}
113 115 \ No newline at end of file
  116 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java
  View file @9679296
... ... @@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo;
3 3 import cn.hutool.core.annotation.Alias;
4 4 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
5 5 import cn.idev.excel.annotation.ExcelProperty;
  6 +import com.fhs.core.trans.anno.Trans;
  7 +import com.fhs.core.trans.constant.TransType;
6 8 import io.swagger.v3.oas.annotations.media.Schema;
7 9 import lombok.Data;
8 10  
... ... @@ -65,8 +67,10 @@ public class WasteRecordRespVO {
65 67 private LocalDateTime createTime;
66 68  
67 69 @Schema(description = "班组", example = "班组")
68   - @ExcelProperty("班组")
69   - @Alias("deptId")
70   - private List<String> teamIdList;
  70 + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
  71 + key = "id", fields = "name", ref = "deptNames")
  72 + private List<Long> deptId;
  73 +
  74 + private String deptNames;
71 75  
72 76 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java
  View file @9679296
... ... @@ -92,7 +92,7 @@ public class MechanicalCostDO extends BaseDO {
92 92 * 部门id
93 93 */
94 94 @TableField(typeHandler = JacksonTypeHandler.class)
95   - private List<String> deptId;
  95 + private List<Long> deptId;
96 96 /**
97 97 * 备注
98 98 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java
  View file @9679296
... ... @@ -63,7 +63,7 @@ public class PersonalCostDO extends BaseDO {
63 63 * 部门id
64 64 */
65 65 @TableField(typeHandler = JacksonTypeHandler.class)
66   - private List<String> deptId;
  66 + private List<Long> deptId;
67 67 /**
68 68 * 备注
69 69 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java
  View file @9679296
... ... @@ -84,7 +84,8 @@ public class RentalMechanicalCostDO extends BaseDO {
84 84 /**
85 85 * 部门id
86 86 */
87   - private Long deptId;
  87 + @TableField(typeHandler = JacksonTypeHandler.class)
  88 + private List<Long> deptId;
88 89 /**
89 90 * 班组ID数组（多选）
90 91 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java
  View file @9679296
... ... @@ -72,7 +72,7 @@ public class WasteRecordDO extends BaseDO {
72 72 * 部门id
73 73 */
74 74 @TableField(typeHandler = JacksonTypeHandler.class)
75   - private List<String> deptId;
  75 + private List<Long> deptId;
76 76 /**
77 77 * 状态（0正常 1停用）
78 78 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java
  View file @9679296
... ... @@ -40,7 +40,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
40 40 // 插入
41 41 MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class);
42 42  
43   - List<String> deptIds = createReqVO.getTeamIds().stream()
  43 + List<Long> deptIds = createReqVO.getTeamIds().stream()
44 44 .map(TeamBizdomainRelVo::getTeamId)
45 45 .collect(Collectors.toList());
46 46 mechanicalCost.setDeptId(deptIds);
... ... @@ -57,7 +57,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
57 57 // 更新
58 58 MechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, MechanicalCostDO.class);
59 59  
60   - List<String> deptIds = updateReqVO.getTeamIds().stream()
  60 + List<Long> deptIds = updateReqVO.getTeamIds().stream()
61 61 .map(TeamBizdomainRelVo::getTeamId)
62 62 .collect(Collectors.toList());
63 63 updateObj.setDeptId(deptIds);
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java
  View file @9679296
... ... @@ -40,7 +40,7 @@ public class PersonalCostServiceImpl implements PersonalCostService {
40 40 public Long createPersonalCost(PersonalCostSaveReqVO createReqVO) {
41 41 // 插入
42 42 PersonalCostDO personalCost = BeanUtils.toBean(createReqVO, PersonalCostDO.class);
43   - List<String> deptIds = createReqVO.getTeamIds().stream()
  43 + List<Long> deptIds = createReqVO.getTeamIds().stream()
44 44 .map(TeamBizdomainRelVo::getTeamId)
45 45 .collect(Collectors.toList());
46 46 personalCost.setDeptId(deptIds);
... ... @@ -56,7 +56,7 @@ public class PersonalCostServiceImpl implements PersonalCostService {
56 56 validatePersonalCostExists(updateReqVO.getId());
57 57 // 更新
58 58 PersonalCostDO updateObj = BeanUtils.toBean(updateReqVO, PersonalCostDO.class);
59   - List<String> deptIds = updateReqVO.getTeamIds().stream()
  59 + List<Long> deptIds = updateReqVO.getTeamIds().stream()
60 60 .map(TeamBizdomainRelVo::getTeamId)
61 61 .collect(Collectors.toList());
62 62 updateObj.setDeptId(deptIds);
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java
  View file @9679296
... ... @@ -2,6 +2,7 @@ package com.zteits.urbanops.module.garden.service.rentalmechanicalcost;
2 2  
3 3 import com.zteits.urbanops.framework.common.pojo.PageResult;
4 4 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  5 +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
5 6 import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostPageReqVO;
6 7 import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostSaveReqVO;
7 8 import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO;
... ... @@ -11,6 +12,7 @@ import org.springframework.stereotype.Service;
11 12 import org.springframework.validation.annotation.Validated;
12 13  
13 14 import java.util.List;
  15 +import java.util.stream.Collectors;
14 16  
15 17 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
16 18 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.RENTAL_MECHANICAL_COST_NOT_EXISTS;
... ... @@ -31,6 +33,10 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ
31 33 public Long createRentalMechanicalCost(RentalMechanicalCostSaveReqVO createReqVO) {
32 34 // 插入
33 35 RentalMechanicalCostDO rentalMechanicalCost = BeanUtils.toBean(createReqVO, RentalMechanicalCostDO.class);
  36 + List<Long> deptIds = createReqVO.getTeamIds().stream()
  37 + .map(TeamBizdomainRelVo::getTeamId)
  38 + .collect(Collectors.toList());
  39 + rentalMechanicalCost.setDeptId(deptIds);
34 40 rentalMechanicalCostMapper.insert(rentalMechanicalCost);
35 41 // 返回
36 42 return rentalMechanicalCost.getId();
... ... @@ -42,6 +48,10 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ
42 48 validateRentalMechanicalCostExists(updateReqVO.getId());
43 49 // 更新
44 50 RentalMechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, RentalMechanicalCostDO.class);
  51 + List<Long> deptIds = updateReqVO.getTeamIds().stream()
  52 + .map(TeamBizdomainRelVo::getTeamId)
  53 + .collect(Collectors.toList());
  54 + updateObj.setDeptId(deptIds);
45 55 rentalMechanicalCostMapper.updateById(updateObj);
46 56 }
47 57  
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java
  View file @9679296
... ... @@ -35,7 +35,7 @@ public class WasteRecordServiceImpl implements WasteRecordService {
35 35 public Long createWasteRecord(WasteRecordSaveReqVO createReqVO) {
36 36 // 插入
37 37 WasteRecordDO wasteRecord = BeanUtils.toBean(createReqVO, WasteRecordDO.class);
38   - List<String> deptIds = createReqVO.getTeamIds().stream()
  38 + List<Long> deptIds = createReqVO.getTeamIds().stream()
39 39 .map(TeamBizdomainRelVo::getTeamId)
40 40 .collect(Collectors.toList());
41 41 wasteRecord.setDeptId(deptIds);
... ... @@ -52,7 +52,7 @@ public class WasteRecordServiceImpl implements WasteRecordService {
52 52 // 更新
53 53 WasteRecordDO updateObj = BeanUtils.toBean(updateReqVO, WasteRecordDO.class);
54 54  
55   - List<String> deptIds = updateReqVO.getTeamIds().stream()
  55 + List<Long> deptIds = updateReqVO.getTeamIds().stream()
56 56 .map(TeamBizdomainRelVo::getTeamId)
57 57 .collect(Collectors.toList());
58 58 updateObj.setDeptId(deptIds);
... ...