diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/TeamBizdomainRelVo.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java index 36773ba..612f8a7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/TeamBizdomainRelVo.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java @@ -1,4 +1,4 @@ -package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo; +package com.zteits.urbanops.module.garden.controller.admin.costfee.vo; import lombok.Data; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java index ce66744..9541f66 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java @@ -10,10 +10,7 @@ import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.Person import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.PersonalCostRespVO; import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.PersonalCostSaveReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import com.zteits.urbanops.module.garden.enums.CostFeeConstants; import com.zteits.urbanops.module.garden.service.personalcost.PersonalCostService; -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -26,8 +23,6 @@ import org.springframework.web.bind.annotation.*; import java.io.IOException; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostSaveReqVO.java index f618eaa..2d4cee6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostSaveReqVO.java @@ -1,12 +1,14 @@ package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo; import cn.idev.excel.annotation.ExcelProperty; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + import java.math.BigDecimal; +import java.util.List; @Schema(description = "管理后台 - 人员费用录入 - 个人费用新增/修改 Request VO") @Data @@ -44,6 +46,6 @@ public class PersonalCostSaveReqVO { @Schema(description = "备注", example = "随便") private String remark; @ExcelProperty("班组") - private List teamIds; + private List teamIds; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java index 93adbfc..2d163ed 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java @@ -1,38 +1,31 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost; -import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostRespVO; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import com.zteits.urbanops.module.garden.enums.CostFeeConstants; -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; -import java.util.stream.Collectors; - +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; - import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; - -import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; -import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.*; +import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostRespVO; +import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostSaveReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO; import com.zteits.urbanops.module.garden.service.rentalmechanicalcost.RentalMechanicalCostService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 租赁机械费用录入") @RestController diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java index b5ea97c..35b8608 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java @@ -1,17 +1,20 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo; import cn.idev.excel.annotation.ExcelProperty; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import lombok.*; - -import java.time.LocalDate; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; +import com.fasterxml.jackson.annotation.JsonFormat; import com.zteits.urbanops.framework.common.pojo.PageParam; -import java.math.BigDecimal; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 租赁机械费用录入分页 Request VO") @@ -21,55 +24,14 @@ public class RentalMechanicalCostPageReqVO extends PageParam { @Schema(description = "机械名称", example = "张三") private String mechName; - @Schema(description = "机械类型", example = "2") - private String mechType; - @Schema(description = "租赁总价格", example = "316") - private BigDecimal rentalTotalPrice; - - @Schema(description = "数量") - private Integer quantity; - - @Schema(description = "车牌号") - private String licensePlate; - - @Schema(description = "车辆类别（如汽油、纯电新能源等）") - private String vehicleCategory; - - @Schema(description = "车辆类型（如大型客车、轻型栏板货车等）", example = "2") - private String vehicleType; + private BigDecimal[] rentalTotalPrice; @Schema(description = "开始使用时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDate[] startUseTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startUseTime; @Schema(description = "使用时长（天）") private Integer useDuration; - @Schema(description = "结束使用时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDate[] endUseTime; - - @Schema(description = "归属公司", example = "李四") - private String companyName; - - @Schema(description = "归属公司ID", example = "25530") - private String companyId; - - @Schema(description = "部门id", example = "25446") - private Long deptId; - - @Schema(description = "道路ID数组（多选）") - private String roadIds; - - @Schema(description = "备注", example = "你说的对") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @ExcelProperty("班组") - private List teamIds; - } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java index 3fe9f0d..03c2b07 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java @@ -1,15 +1,18 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; -import java.util.*; import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; +import java.util.List; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @Schema(description = "管理后台 - 租赁机械费用录入 Response VO") @Data 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 bcd231f..2379eea 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 @@ -1,14 +1,17 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo; import cn.idev.excel.annotation.ExcelProperty; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; -import java.util.*; -import jakarta.validation.constraints.*; import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Date; +import java.util.List; @Schema(description = "管理后台 - 租赁机械费用录入新增/修改 Request VO") @Data @@ -43,14 +46,16 @@ public class RentalMechanicalCostSaveReqVO { @Schema(description = "开始使用时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "开始使用时间不能为空") - private LocalDate startUseTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startUseTime; @Schema(description = "使用时长（天）") private Integer useDuration; @Schema(description = "结束使用时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "结束使用时间不能为空") - private LocalDate endUseTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endUseTime; @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @NotEmpty(message = "归属公司不能为空") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/TeamBizdomainRelController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/TeamBizdomainRelController.java deleted file mode 100644 index 5831cf0..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/TeamBizdomainRelController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel; - -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zteits.urbanops.framework.common.pojo.PageParam; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.util.object.BeanUtils; -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; - -import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; - -import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; -import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService; - -@Tag(name = "管理后台 - 班组关联") -@RestController -@RequestMapping("/garden/team-bizdomain-rel") -@Validated -public class TeamBizdomainRelController { - - @Resource - private TeamBizdomainRelService teamBizdomainRelService; - - @PostMapping("/create") - @Operation(summary = "创建班组关联") - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:create')") - public CommonResult createTeamBizdomainRel(@Valid @RequestBody TeamBizdomainRelSaveReqVO createReqVO) { - return success(teamBizdomainRelService.createTeamBizdomainRel(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新班组关联") - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:update')") - public CommonResult updateTeamBizdomainRel(@Valid @RequestBody TeamBizdomainRelSaveReqVO updateReqVO) { - teamBizdomainRelService.updateTeamBizdomainRel(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除班组关联") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:delete')") - public CommonResult deleteTeamBizdomainRel(@RequestParam("id") Long id) { - teamBizdomainRelService.deleteTeamBizdomainRel(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除班组关联") - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:delete')") - public CommonResult deleteTeamBizdomainRelList(@RequestParam("ids") List ids) { - teamBizdomainRelService.deleteTeamBizdomainRelListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得班组关联") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:query')") - public CommonResult getTeamBizdomainRel(@RequestParam("id") Long id) { - TeamBizdomainRelDO teamBizdomainRel = teamBizdomainRelService.getTeamBizdomainRel(id); - return success(BeanUtils.toBean(teamBizdomainRel, TeamBizdomainRelRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得班组关联分页") - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:query')") - public CommonResult> getTeamBizdomainRelPage(@Valid TeamBizdomainRelPageReqVO pageReqVO) { - PageResult pageResult = teamBizdomainRelService.getTeamBizdomainRelPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, TeamBizdomainRelRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出班组关联 Excel") - @PreAuthorize("@ss.hasPermission('garden:team-bizdomain-rel:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportTeamBizdomainRelExcel(@Valid TeamBizdomainRelPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = teamBizdomainRelService.getTeamBizdomainRelPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "班组关联.xls", "数据", TeamBizdomainRelRespVO.class, - BeanUtils.toBean(list, TeamBizdomainRelRespVO.class)); - } - -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelPageReqVO.java deleted file mode 100644 index 81118db..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelPageReqVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo; - -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zteits.urbanops.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 班组关联分页 Request VO") -@Data -public class TeamBizdomainRelPageReqVO extends PageParam { - - @Schema(description = "业务表主键", example = "4740") - private String busiId; - - @Schema(description = "班组编码", example = "27533") - private String teamId; - - @Schema(description = "班组名称", example = "王五") - private String teamName; - - @Schema(description = "班组名称") - private Long weight; - - @Schema(description = "归属公司", example = "张三") - private String companyName; - - @Schema(description = "归属公司ID", example = "29798") - private String companyId; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @Schema(description = "业务类型", example = "1") - private String busiType; - -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelRespVO.java deleted file mode 100644 index 6768b91..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelRespVO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; - -@Schema(description = "管理后台 - 班组关联 Response VO") -@Data -@ExcelIgnoreUnannotated -public class TeamBizdomainRelRespVO { - - @Schema(description = "记录ID，自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14177") - @ExcelProperty("记录ID，自增主键") - private Long id; - - @Schema(description = "业务表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4740") - @ExcelProperty("业务表主键") - private String busiId; - - @Schema(description = "班组编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "27533") - @ExcelProperty("班组编码") - private String teamId; - - @Schema(description = "班组名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") - @ExcelProperty("班组名称") - private String teamName; - - @Schema(description = "班组名称") - @ExcelProperty("班组名称") - private Long weight; - - @Schema(description = "归属公司", example = "张三") - @ExcelProperty("归属公司") - private String companyName; - - @Schema(description = "归属公司ID", example = "29798") - @ExcelProperty("归属公司ID") - private String companyId; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "业务类型", example = "1") - @ExcelProperty("业务类型") - private String busiType; - -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelSaveReqVO.java deleted file mode 100644 index f4f5eb8..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/teambizdomainrel/vo/TeamBizdomainRelSaveReqVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; - -@Schema(description = "管理后台 - 班组关联新增/修改 Request VO") -@Data -public class TeamBizdomainRelSaveReqVO { - - @Schema(description = "记录ID，自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14177") - private Long id; - - @Schema(description = "业务表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4740") - @NotEmpty(message = "业务表主键不能为空") - private String busiId; - - @Schema(description = "班组编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "27533") - @NotEmpty(message = "班组编码不能为空") - private String teamId; - - @Schema(description = "班组名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") - @NotEmpty(message = "班组名称不能为空") - private String teamName; - - @Schema(description = "班组名称") - private Long weight; - - @Schema(description = "归属公司", example = "张三") - private String companyName; - - @Schema(description = "归属公司ID", example = "29798") - private String companyId; - - @Schema(description = "业务类型", example = "1") - private String busiType; - -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordSaveReqVO.java index 1428f52..3948ab7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordSaveReqVO.java @@ -1,14 +1,15 @@ package com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo; import cn.idev.excel.annotation.ExcelProperty; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; -import java.time.LocalDate; -import java.util.*; -import jakarta.validation.constraints.*; import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.List; @Schema(description = "管理后台 - 园林废弃物录入新增/修改 Request VO") @Data @@ -59,5 +60,5 @@ public class WasteRecordSaveReqVO { private String remark; @ExcelProperty("班组") - private List teamIds; + private List teamIds; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java index b9820f0..251d502 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; -import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.TeamBizdomainRelVo; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import lombok.*; import java.math.BigDecimal; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/teambizdomainrel/TeamBizdomainRelDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/teambizdomainrel/TeamBizdomainRelDO.java deleted file mode 100644 index 7d9b2e8..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/teambizdomainrel/TeamBizdomainRelDO.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; - -/** - * 班组关联 DO - * - * @author 超级管理员 - */ -@TableName("garden_team_bizdomain_rel") -@KeySequence("garden_team_bizdomain_rel_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class TeamBizdomainRelDO extends BaseDO { - - /** - * 记录ID，自增主键 - */ - @TableId - private Long id; - /** - * 业务表主键 - */ - private String busiId; - /** - * 班组编码 - */ - private String teamId; - /** - * 班组名称 - */ - private String teamName; - /** - * 班组名称 - */ - private Long weight; - /** - * 归属公司 - */ - private String companyName; - /** - * 归属公司ID - */ - private String companyId; - /** - * 业务类型 - */ - private String busiType; - - -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java index 84ec663..69860a7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java @@ -20,23 +20,23 @@ public interface RentalMechanicalCostMapper extends BaseMapperX selectPage(RentalMechanicalCostPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(RentalMechanicalCostDO::getMechName, reqVO.getMechName()) - .eqIfPresent(RentalMechanicalCostDO::getMechType, reqVO.getMechType()) - .eqIfPresent(RentalMechanicalCostDO::getRentalTotalPrice, reqVO.getRentalTotalPrice()) - .eqIfPresent(RentalMechanicalCostDO::getQuantity, reqVO.getQuantity()) - .eqIfPresent(RentalMechanicalCostDO::getLicensePlate, reqVO.getLicensePlate()) - .eqIfPresent(RentalMechanicalCostDO::getVehicleCategory, reqVO.getVehicleCategory()) - .eqIfPresent(RentalMechanicalCostDO::getVehicleType, reqVO.getVehicleType()) - .betweenIfPresent(RentalMechanicalCostDO::getStartUseTime, reqVO.getStartUseTime()) + //.eqIfPresent(RentalMechanicalCostDO::getMechType, reqVO.getMechType()) + .betweenIfPresent(RentalMechanicalCostDO::getRentalTotalPrice, reqVO.getRentalTotalPrice()) + //.eqIfPresent(RentalMechanicalCostDO::getQuantity, reqVO.getQuantity()) + //.eqIfPresent(RentalMechanicalCostDO::getLicensePlate, reqVO.getLicensePlate()) + //.eqIfPresent(RentalMechanicalCostDO::getVehicleCategory, reqVO.getVehicleCategory()) + // .eqIfPresent(RentalMechanicalCostDO::getVehicleType, reqVO.getVehicleType()) + //.betweenIfPresent(RentalMechanicalCostDO::getStartUseTime, reqVO.getStartUseTime()) + .eqIfPresent(RentalMechanicalCostDO::getStartUseTime, reqVO.getStartUseTime()) .eqIfPresent(RentalMechanicalCostDO::getUseDuration, reqVO.getUseDuration()) - .betweenIfPresent(RentalMechanicalCostDO::getEndUseTime, reqVO.getEndUseTime()) - .likeIfPresent(RentalMechanicalCostDO::getCompanyName, reqVO.getCompanyName()) - .eqIfPresent(RentalMechanicalCostDO::getCompanyId, reqVO.getCompanyId()) - .eqIfPresent(RentalMechanicalCostDO::getDeptId, reqVO.getDeptId()) - .eqIfPresent(RentalMechanicalCostDO::getTeamIds, reqVO.getTeamIds()) - .eqIfPresent(RentalMechanicalCostDO::getRoadIds, reqVO.getRoadIds()) - .eqIfPresent(RentalMechanicalCostDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(RentalMechanicalCostDO::getCreateTime, reqVO.getCreateTime()) + //.betweenIfPresent(RentalMechanicalCostDO::getEndUseTime, reqVO.getEndUseTime()) + //.likeIfPresent(RentalMechanicalCostDO::getCompanyName, reqVO.getCompanyName()) + //.eqIfPresent(RentalMechanicalCostDO::getCompanyId, reqVO.getCompanyId()) + //.eqIfPresent(RentalMechanicalCostDO::getDeptId, reqVO.getDeptId()) + //.eqIfPresent(RentalMechanicalCostDO::getRoadIds, reqVO.getRoadIds()) + ///.//eqIfPresent(RentalMechanicalCostDO::getRemark, reqVO.getRemark()) + //.betweenIfPresent(RentalMechanicalCostDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(RentalMechanicalCostDO::getId)); } -} \ No newline at end of file +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/teambizdomainrel/TeamBizdomainRelMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/teambizdomainrel/TeamBizdomainRelMapper.java deleted file mode 100644 index b7e57e0..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/teambizdomainrel/TeamBizdomainRelMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zteits.urbanops.module.garden.dal.mysql.teambizdomainrel; - -import java.util.*; - -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import org.apache.ibatis.annotations.Mapper; -import com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo.*; - -/** - * 班组关联 Mapper - * - * @author 超级管理员 - */ -@Mapper -public interface TeamBizdomainRelMapper extends BaseMapperX { - - default PageResult selectPage(TeamBizdomainRelPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(TeamBizdomainRelDO::getBusiId, reqVO.getBusiId()) - .eqIfPresent(TeamBizdomainRelDO::getTeamId, reqVO.getTeamId()) - .likeIfPresent(TeamBizdomainRelDO::getTeamName, reqVO.getTeamName()) - .eqIfPresent(TeamBizdomainRelDO::getWeight, reqVO.getWeight()) - .likeIfPresent(TeamBizdomainRelDO::getCompanyName, reqVO.getCompanyName()) - .eqIfPresent(TeamBizdomainRelDO::getCompanyId, reqVO.getCompanyId()) - .betweenIfPresent(TeamBizdomainRelDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(TeamBizdomainRelDO::getBusiType, reqVO.getBusiType()) - .orderByDesc(TeamBizdomainRelDO::getId)); - } - -} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicaldepreciation/MechanicalDepreciationServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicaldepreciation/MechanicalDepreciationServiceImpl.java index e3c11db..8dd4ea2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicaldepreciation/MechanicalDepreciationServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicaldepreciation/MechanicalDepreciationServiceImpl.java @@ -1,28 +1,22 @@ package com.zteits.urbanops.module.garden.service.mechanicaldepreciation; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import com.zteits.urbanops.module.garden.controller.admin.mechanicaldepreciation.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.mechanicaldepreciation.MechanicalDepreciationDO; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.util.object.BeanUtils; - +import com.zteits.urbanops.module.garden.controller.admin.mechanicaldepreciation.vo.MechanicalDepreciationPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.mechanicaldepreciation.vo.MechanicalDepreciationSaveReqVO; +import com.zteits.urbanops.module.garden.dal.dataobject.mechanicaldepreciation.MechanicalDepreciationDO; import com.zteits.urbanops.module.garden.dal.mysql.mechanicaldepreciation.MechanicalDepreciationMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; -import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; -import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.MECHANICAL_DEPRECIATION_NOT_EXISTS; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.MECHANICAL_DEPRECIATION_NOT_EXISTS_001; /** * 自有机械折旧子 Service 实现类 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java index 0c9bf41..6a1d506 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java @@ -5,8 +5,9 @@ import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.PersonalCostPageReqVO; import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.PersonalCostSaveReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; import com.zteits.urbanops.module.garden.dal.mysql.personalcost.PersonalCostMapper; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; + import com.zteits.urbanops.module.system.api.dept.DeptApi; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -40,7 +41,7 @@ public class PersonalCostServiceImpl implements PersonalCostService { // 插入 PersonalCostDO personalCost = BeanUtils.toBean(createReqVO, PersonalCostDO.class); List deptIds = createReqVO.getTeamIds().stream() - .map(TeamBizdomainRelDO::getTeamId) + .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); personalCost.setDeptId(deptIds); personalCostMapper.insert(personalCost); @@ -56,7 +57,7 @@ public class PersonalCostServiceImpl implements PersonalCostService { // 更新 PersonalCostDO updateObj = BeanUtils.toBean(updateReqVO, PersonalCostDO.class); List deptIds = updateReqVO.getTeamIds().stream() - .map(TeamBizdomainRelDO::getTeamId) + .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); updateObj.setDeptId(deptIds); personalCostMapper.updateById(updateObj); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java index 806016a..ad4249f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java @@ -6,18 +6,14 @@ import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.v import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostSaveReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO; import com.zteits.urbanops.module.garden.dal.mysql.rentalmechanicalcost.RentalMechanicalCostMapper; -import com.zteits.urbanops.module.garden.enums.CostFeeConstants; -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService; import jakarta.annotation.Resource; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import java.util.List; - import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.RENTAL_MECHANICAL_COST_NOT_EXISTS; /** * 租赁机械费用录入 Service 实现类 @@ -31,15 +27,11 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ @Resource private RentalMechanicalCostMapper rentalMechanicalCostMapper; - @Resource - private TeamBizdomainRelService teamBizdomainRelService; - @Override public Long createRentalMechanicalCost(RentalMechanicalCostSaveReqVO createReqVO) { // 插入 RentalMechanicalCostDO rentalMechanicalCost = BeanUtils.toBean(createReqVO, RentalMechanicalCostDO.class); rentalMechanicalCostMapper.insert(rentalMechanicalCost); - // 返回 return rentalMechanicalCost.getId(); } @@ -51,10 +43,6 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ // 更新 RentalMechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, RentalMechanicalCostDO.class); rentalMechanicalCostMapper.updateById(updateObj); - - //add by wq 保存班组信息关联表 - teamBizdomainRelService.deleteTeamBizdomainRel(updateObj.getId(), CostFeeConstants.COSTFEE_RENTALMECHANICAL); - //add by wq 保存班组信息关联表 } @Override diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/teambizdomainrel/TeamBizdomainRelService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/teambizdomainrel/TeamBizdomainRelService.java deleted file mode 100644 index 7ac5537..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/teambizdomainrel/TeamBizdomainRelService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.zteits.urbanops.module.garden.service.teambizdomainrel; - -import java.util.*; -import jakarta.validation.*; -import com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; - -/** - * 班组关联 Service 接口 - * - * @author 超级管理员 - */ -public interface TeamBizdomainRelService { - - /** - * 创建班组关联 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createTeamBizdomainRel(@Valid TeamBizdomainRelSaveReqVO createReqVO); - - /** - * 更新班组关联 - * - * @param updateReqVO 更新信息 - */ - void updateTeamBizdomainRel(@Valid TeamBizdomainRelSaveReqVO updateReqVO); - - /** - * 删除班组关联 - * - * @param id 编号 - */ - void deleteTeamBizdomainRel(Long id); - - /** - * 批量删除班组关联 - * - * @param ids 编号 - */ - void deleteTeamBizdomainRelListByIds(List ids); - - /** - * 获得班组关联 - * - * @param id 编号 - * @return 班组关联 - */ - TeamBizdomainRelDO getTeamBizdomainRel(Long id); - - /** - * 获得班组关联分页 - * - * @param pageReqVO 分页查询 - * @return 班组关联分页 - */ - PageResult getTeamBizdomainRelPage(TeamBizdomainRelPageReqVO pageReqVO); - - /** - * @Author wangqian - * @Description 获取费用关联信息 - * @Date 2025/11/19 20:47 - * @Param busiId - * @param busiType - * @Return java.util.List - */ - public List getTeamBizdomainRelList(Long busiId, String busiType); - - public void saveTeamBizdomainRel(List teamList, Long busiId, String companyId, String companyName ,String busiType) ; - - public void deleteTeamBizdomainRel(Long id, String busiType); - - -} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/teambizdomainrel/TeamBizdomainRelServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/teambizdomainrel/TeamBizdomainRelServiceImpl.java deleted file mode 100644 index ee8d7d7..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/teambizdomainrel/TeamBizdomainRelServiceImpl.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.zteits.urbanops.module.garden.service.teambizdomainrel; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zteits.urbanops.module.garden.enums.CostFeeConstants; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import com.zteits.urbanops.module.garden.controller.admin.teambizdomainrel.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; -import com.zteits.urbanops.framework.common.util.object.BeanUtils; - -import com.zteits.urbanops.module.garden.dal.mysql.teambizdomainrel.TeamBizdomainRelMapper; - -import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; -import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; -import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; - -/** - * 班组关联 Service 实现类 - * - * @author 超级管理员 - */ -@Service -@Validated -public class TeamBizdomainRelServiceImpl implements TeamBizdomainRelService { - - @Resource - private TeamBizdomainRelMapper teamBizdomainRelMapper; - - @Override - public Long createTeamBizdomainRel(TeamBizdomainRelSaveReqVO createReqVO) { - // 插入 - TeamBizdomainRelDO teamBizdomainRel = BeanUtils.toBean(createReqVO, TeamBizdomainRelDO.class); - teamBizdomainRelMapper.insert(teamBizdomainRel); - - // 返回 - return teamBizdomainRel.getId(); - } - - @Override - public void updateTeamBizdomainRel(TeamBizdomainRelSaveReqVO updateReqVO) { - // 校验存在 - validateTeamBizdomainRelExists(updateReqVO.getId()); - // 更新 - TeamBizdomainRelDO updateObj = BeanUtils.toBean(updateReqVO, TeamBizdomainRelDO.class); - teamBizdomainRelMapper.updateById(updateObj); - } - - @Override - public void deleteTeamBizdomainRel(Long id) { - // 校验存在 - validateTeamBizdomainRelExists(id); - // 删除 - teamBizdomainRelMapper.deleteById(id); - } - - @Override - public void deleteTeamBizdomainRelListByIds(List ids) { - // 删除 - teamBizdomainRelMapper.deleteByIds(ids); - } - - - private void validateTeamBizdomainRelExists(Long id) { - if (teamBizdomainRelMapper.selectById(id) == null) { - //throw exception(TEAM_BIZDOMAIN_REL_NOT_EXISTS); - } - } - - @Override - public TeamBizdomainRelDO getTeamBizdomainRel(Long id) { - return teamBizdomainRelMapper.selectById(id); - } - - @Override - public PageResult getTeamBizdomainRelPage(TeamBizdomainRelPageReqVO pageReqVO) { - return teamBizdomainRelMapper.selectPage(pageReqVO); - } - - public List getTeamBizdomainRelList(Long busiId, String busiType) { - if (busiId == null && StringUtils.isEmpty(busiType)) { - throw exception(MECHANICAL_COST_NOT_EXISTS_001); - } - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(TeamBizdomainRelDO::getBusiId, busiId); - queryWrapper.eq(TeamBizdomainRelDO::getBusiType, busiType); - return teamBizdomainRelMapper.selectList(queryWrapper); - } - - @Override - public void saveTeamBizdomainRel(List teamList, Long busiId, String companyId, String companyName ,String busiType) { - if (CollectionUtils.isNotEmpty(teamList)) { - for (TeamBizdomainRelDO team : teamList) { - if (team != null && StringUtils.isNotEmpty(team.getTeamId())) { - TeamBizdomainRelDO teamBizdomainRel = new TeamBizdomainRelDO(); - teamBizdomainRel.setBusiId(String.valueOf(busiId)); - teamBizdomainRel.setCompanyId(companyId); - teamBizdomainRel.setCompanyName(companyName); - teamBizdomainRel.setTeamName(team.getTeamName()); - teamBizdomainRel.setTeamId(team.getTeamId()); - teamBizdomainRel.setBusiType(busiType); - teamBizdomainRelMapper.insert(teamBizdomainRel); - } - } - } - } - - @Override - public void deleteTeamBizdomainRel(Long id, String busiType ) { - if (id == null && StringUtils.isEmpty(busiType)) { - throw exception(MECHANICAL_COST_NOT_EXISTS_001); - } - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(TeamBizdomainRelDO::getBusiId, String.valueOf(id)); - queryWrapper.eq(TeamBizdomainRelDO::getBusiType, busiType); - teamBizdomainRelMapper.delete(queryWrapper); - } -} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java index f7381de..92d2338 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java @@ -4,10 +4,9 @@ import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo.WasteRecordPageReqVO; import com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo.WasteRecordSaveReqVO; -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import com.zteits.urbanops.module.garden.dal.dataobject.wasterecord.WasteRecordDO; import com.zteits.urbanops.module.garden.dal.mysql.wasterecord.WasteRecordMapper; -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +36,7 @@ public class WasteRecordServiceImpl implements WasteRecordService { // 插入 WasteRecordDO wasteRecord = BeanUtils.toBean(createReqVO, WasteRecordDO.class); List deptIds = createReqVO.getTeamIds().stream() - .map(TeamBizdomainRelDO::getTeamId) + .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); wasteRecord.setDeptId(deptIds); wasteRecordMapper.insert(wasteRecord); @@ -54,7 +53,7 @@ public class WasteRecordServiceImpl implements WasteRecordService { WasteRecordDO updateObj = BeanUtils.toBean(updateReqVO, WasteRecordDO.class); List deptIds = updateReqVO.getTeamIds().stream() - .map(TeamBizdomainRelDO::getTeamId) + .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); updateObj.setDeptId(deptIds);