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 e5b8363..bcab493 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 @@ -1,11 +1,13 @@ package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo; import cn.idev.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDate; @@ -52,20 +54,24 @@ public class MechanicalCostSaveReqVO { @Schema(description = "开始使用时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "开始使用时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate startUseTime; @Schema(description = "使用年限") private Long serviceLife; @Schema(description = "结束使用时间") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate endUseTime; @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") - @NotEmpty(message = "归属公司不能为空") + //@NotEmpty(message = "归属公司不能为空") private String companyName; @Schema(description = "归属公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5463") - @NotEmpty(message = "归属公司ID不能为空") + //@NotEmpty(message = "归属公司ID不能为空") private String companyId; @Schema(description = "部门id", example = "13645") 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 2c1d5db..6703bac 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 @@ -2,6 +2,7 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost. import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fhs.core.trans.anno.Trans; import com.fhs.core.trans.constant.TransType; import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; @@ -55,6 +56,8 @@ public class RentalMechanicalCostRespVO { @Schema(description = "开始使用时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("开始使用时间") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate startUseTime; @Schema(description = "使用时长(天)") @@ -63,14 +66,16 @@ public class RentalMechanicalCostRespVO { @Schema(description = "结束使用时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("结束使用时间") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate endUseTime; @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - @ExcelProperty("归属公司") + //@ExcelProperty("归属公司") private String companyName; @Schema(description = "归属公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25530") - @ExcelProperty("归属公司ID") + //@ExcelProperty("归属公司ID") private String companyId; @Schema(description = "道路ID数组(多选)") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java index 2755dc5..b747502 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java @@ -8,6 +8,8 @@ import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdoma import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO; import com.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper; import com.zteits.urbanops.module.garden.service.mechanicaldepreciation.MechanicalDepreciationService; +import com.zteits.urbanops.module.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -17,7 +19,10 @@ import org.springframework.validation.annotation.Validated; import java.util.List; import java.util.stream.Collectors; +import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0; +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getCompanyId; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.MECHANICAL_COST_NOT_EXISTS; @@ -35,8 +40,15 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { @Resource private MechanicalDepreciationService mechanicalDepreciationService; + @Resource + private DeptApi deptApi; + @Override public Long createMechanicalCost(MechanicalCostSaveReqVO createReqVO) { + DeptRespDTO deptRespDTO = deptApi.getDept(getCompanyId()); + if(null == deptRespDTO){ + throw exception0(BAD_REQUEST.getCode(), "无效参数-登录人所属单位为空"); + } // 插入 MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class); @@ -44,7 +56,8 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); mechanicalCost.setDeptId(deptIds); - + mechanicalCost.setCompanyId(String.valueOf(deptRespDTO.getId())); + mechanicalCost.setCompanyName(deptRespDTO.getName()); mechanicalCostMapper.insert(mechanicalCost); // 返回 return mechanicalCost.getId(); 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 658993d..8b9c7ed 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 @@ -7,6 +7,8 @@ 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.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -14,7 +16,10 @@ import org.springframework.validation.annotation.Validated; import java.util.List; import java.util.stream.Collectors; +import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0; +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getCompanyId; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.RENTAL_MECHANICAL_COST_NOT_EXISTS; /** @@ -29,14 +34,23 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ @Resource private RentalMechanicalCostMapper rentalMechanicalCostMapper; + @Resource + private DeptApi deptApi; + @Override public Long createRentalMechanicalCost(RentalMechanicalCostSaveReqVO createReqVO) { + DeptRespDTO deptRespDTO = deptApi.getDept(getCompanyId()); + if(null == deptRespDTO){ + throw exception0(BAD_REQUEST.getCode(), "无效参数-登录人所属单位为空"); + } // 插入 RentalMechanicalCostDO rentalMechanicalCost = BeanUtils.toBean(createReqVO, RentalMechanicalCostDO.class); List deptIds = createReqVO.getTeamIds().stream() .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); rentalMechanicalCost.setDeptId(deptIds); + rentalMechanicalCost.setCompanyId(String.valueOf(deptRespDTO.getId())); + rentalMechanicalCost.setCompanyName(deptRespDTO.getName()); rentalMechanicalCostMapper.insert(rentalMechanicalCost); // 返回 return rentalMechanicalCost.getId();