diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java index eaee2f2..d596d95 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java @@ -206,6 +206,8 @@ public class CostFeeServiceImpl implements CostFeeService { log.info("数据列表为空,跳过插入操作"); return; } + //总公司 + DeptRespDTO deptRespDTO = deptApi.getDept(getCompanyId()); //单位集合 List companyList = deptApi.getSubDeptList(); // 1. 预加载部门映射(循环外加载,避免重复查询) @@ -220,7 +222,7 @@ public class CostFeeServiceImpl implements CostFeeService { )); - // 模板类型校验 + // 模板类型校验 Class importClass = template.getImportClass(); // 从枚举获取导入类,避免switch // 根据不同模板类型执行不同的处理逻辑 if (WaterFeeImport.class.isAssignableFrom(importClass)) { @@ -239,8 +241,8 @@ public class CostFeeServiceImpl implements CostFeeService { WaterFeeDO fee = new WaterFeeDO(); BeanUtils.copyProperties(importObj, fee); fee.setCompanyId(String.valueOf(getCompanyId())); - if (getCompanyId() == 100) { - fee.setCompanyName("蓟城山水"); + if (deptRespDTO.getParentId() == 0) { + fee.setCompanyName(Objects.toString(deptRespDTO.getName(), "")); } else { // 设置单位id fee.setCompanyName(String.valueOf(companyIdToNamedMap.get(getCompanyId()))); @@ -612,7 +614,7 @@ public class CostFeeServiceImpl implements CostFeeService { Set> violations = validator.validate(importBean); if (!violations.isEmpty()) { // 收集所有校验错误信息(比如“用水量不能为空”“格式应为两位小数”) - // StringBuilder errorMsg = new StringBuilder(); + // StringBuilder errorMsg = new StringBuilder(); for (ConstraintViolation violation : violations) { //errorMsg.append(violation.getMessage()).append(";"); throw exception0(BAD_REQUEST.getCode() ,String.format( @@ -644,13 +646,13 @@ public class CostFeeServiceImpl implements CostFeeService { // 收集所有校验错误信息(比如“用水量不能为空”“格式应为两位小数”) //StringBuilder errorMsg = new StringBuilder(); for (ConstraintViolation violation : violations) { - // errorMsg.append(violation.getMessage()).append(";"); + // errorMsg.append(violation.getMessage()).append(";"); throw exception0(BAD_REQUEST.getCode() ,String.format( "第[{}]条数据:"+ violation.getMessage() ), rowNum); } // 抛出包含行号和所有错误的异常 - // throw exception0(BAD_REQUEST.getCode(), errorMsg.toString().trim(), violations); + // throw exception0(BAD_REQUEST.getCode(), errorMsg.toString().trim(), violations); } Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName()); //单位校验 @@ -766,9 +768,9 @@ public class CostFeeServiceImpl implements CostFeeService { Set> violations = validator.validate(importBean); if (!violations.isEmpty()) { // 收集所有校验错误信息(比如“用水量不能为空”“格式应为两位小数”) - // StringBuilder errorMsg = new StringBuilder(); + // StringBuilder errorMsg = new StringBuilder(); for (ConstraintViolation violation : violations) { - // errorMsg.append(violation.getMessage()).append(";"); + // errorMsg.append(violation.getMessage()).append(";"); throw exception0(BAD_REQUEST.getCode() ,String.format( "第[{}]条数据:"+violation.getMessage() ), rowNum);