人机材修改

wangqian
1 parent c74f3154
Showing 11 changed files with 44 additions and 1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/departmentcost/vo/DepartmentCostSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/waterfee/WaterFeeServiceImpl.java
@@ -28,6 +28,7 @@ public class DepartmentCostSaveReqVO {
  
     @Schema(description = "部门总额", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "部门总额不能为空")
+    @DecimalMax(value = "99999999.99", message = "工资金额最大值为99999999.99")
     private BigDecimal deptTotalCost;
  
     @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@@ -44,4 +45,4 @@ public class DepartmentCostSaveReqVO {
     @Schema(description = "备注", example = "你猜")
     private String remark;
  
-}
 \ No newline at end of file
+}
@@ -99,4 +99,6 @@ public class MechanicalCostRespVO {
  
     private String deptNames;
  
+    @ExcelProperty("状态 0:在用 1:报废")
+    private Integer status;
 }
@@ -83,4 +83,7 @@ public class MechanicalCostSaveReqVO {
     @ExcelProperty("班组")
     private List<TeamBizdomainRelVo> teamIds;
  
+    @ExcelProperty("状态 0:在用 1:报废")
+    private Integer status;
+
 }
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo;
 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 jakarta.validation.constraints.DecimalMax;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -27,6 +28,7 @@ public class PersonalCostSaveReqVO {
  
     @Schema(description = "工资金额", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "工资金额不能为空")
+    @DecimalMax(value = "99999999.99", message = "工资金额最大值为99999999.99")
     private BigDecimal salaryAmount;
  
     @Schema(description = "岗位名称", example = "李四")
@@ -36,6 +36,9 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     @Schema(description = "数量")
     private Integer quantity;
  
+    @Schema(description = "所属单位")
+    private String companyId;
+
     public static final Map<String, SFunction<RentalMechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
             "id", RentalMechanicalCostDO::getId,
             "quantity", RentalMechanicalCostDO::getQuantity,
@@ -100,6 +100,8 @@ public class MechanicalCostDO extends BaseDO {
      */
     private String remark;
  
+    private Integer status;
+
     static final Map<String, SFunction<MechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
             "id", MechanicalCostDO::getId,
             "unitPrice", MechanicalCostDO::getUnitPrice,
@@ -14,6 +14,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
  
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getCompanyId;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
  
  
@@ -91,6 +92,9 @@ public class DepartmentCostServiceImpl implements DepartmentCostService {
  
     @Override
     public PageResult<DepartmentCostDO> getDepartmentCostPage(DepartmentCostPageReqVO pageReqVO) {
+        if (getCompanyId() != 100) {
+            pageReqVO.setCompanyId(String.valueOf(getCompanyId()));
+        }
         return departmentCostMapper.selectPage(pageReqVO);
     }
  
@@ -121,6 +121,9 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
  
     @Override
     public PageResult<MechanicalCostDO> getMechanicalCostPage(MechanicalCostPageReqVO pageReqVO) {
+        if (getCompanyId() != 100) {
+            pageReqVO.setCompanyId(String.valueOf(getCompanyId()));
+        }
         return mechanicalCostMapper.selectPage(pageReqVO);
     }
  
@@ -97,6 +97,9 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ
  
     @Override
     public PageResult<RentalMechanicalCostDO> getRentalMechanicalCostPage(RentalMechanicalCostPageReqVO pageReqVO) {
+        if (getCompanyId() != 100) {
+            pageReqVO.setCompanyId(String.valueOf(getCompanyId()));
+        }
         return rentalMechanicalCostMapper.selectPage(pageReqVO);
     }
  
@@ -102,6 +102,9 @@ public class WasteRecordServiceImpl implements WasteRecordService {
  
     @Override
     public PageResult<WasteRecordDO> getWasteRecordPage(WasteRecordPageReqVO pageReqVO) {
+        if (getCompanyId() != 100) {
+            pageReqVO.setCompanyId(String.valueOf(getCompanyId()));
+        }
         return wasteRecordMapper.selectPage(pageReqVO);
     }
  
@@ -8,6 +8,8 @@ import com.zteits.urbanops.module.garden.controller.admin.waterfee.vo.WaterFeePa
 import com.zteits.urbanops.module.garden.controller.admin.waterfee.vo.WaterFeeSaveReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.waterfee.WaterFeeDO;
 import com.zteits.urbanops.module.garden.dal.mysql.waterfee.WaterFeeMapper;
+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.util.CollectionUtils;
@@ -16,7 +18,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.WATER_FEE_NOT_EXISTS;
  
 /**
@@ -31,6 +36,9 @@ public class WaterFeeServiceImpl implements WaterFeeService {
     @Resource
     private WaterFeeMapper waterFeeMapper;
  
+    @Resource
+    private DeptApi deptApi;
+
     @Override
     public Long createWaterFee(WaterFeeSaveReqVO createReqVO) {
         // add by wq 删除重复，录入最新记录
@@ -43,8 +51,14 @@ public class WaterFeeServiceImpl implements WaterFeeService {
             waterFeeMapper.deleteByIds(ids);
         }
         // add by wq 删除重复，录入最新记录
+        DeptRespDTO deptRespDTO = deptApi.getDept(getCompanyId());
+        if(null == deptRespDTO){
+            throw exception0(BAD_REQUEST.getCode(), "无效参数-登录人所属单位为空");
+        }
         // 插入
         WaterFeeDO waterFee = BeanUtils.toBean(createReqVO, WaterFeeDO.class);
+        waterFee.setCompanyId(String.valueOf(deptRespDTO.getId()));
+        waterFee.setCompanyName(deptRespDTO.getName());
         waterFeeMapper.insert(waterFee);
  
         // 返回
@@ -88,6 +102,9 @@ public class WaterFeeServiceImpl implements WaterFeeService {
  
     @Override
     public PageResult<WaterFeeDO> getWaterFeePage(WaterFeePageReqVO pageReqVO) {
+        if (getCompanyId() != 100) {
+            pageReqVO.setCompanyId(String.valueOf(getCompanyId()));
+        }
         return waterFeeMapper.selectPage(pageReqVO);
     }