ly 1 год назад
Родитель
Сommit
b5350a0e36

+ 2 - 1
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -124,7 +124,8 @@ public class BizHousingFundDeclareController extends BaseController {
             // 直接写入Excel数据
             List<EmployeeExcel> list = getList(vo, employees, employeeExcels);
             HashMap<String, Object> map = new HashMap<>();
-            String titleName = vo.getYear() + "年" + vo.getMonth() + "月" + "公积金明细";
+            BizCompany company = companyService.getById(vo.getCompanyId());
+            String titleName = vo.getYear() + "年" + vo.getMonth() + "月" + company.getName()+ "公司公积金明细";
             AtomicReference<BigDecimal> totat1 = new AtomicReference<>(BigDecimal.ZERO);
             AtomicReference<BigDecimal> totat2 = new AtomicReference<>(BigDecimal.ZERO);
             AtomicReference<BigDecimal> totat3 = new AtomicReference<>(BigDecimal.ZERO);

+ 2 - 1
src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -173,7 +173,8 @@ public class SocialSecurityDeclareController extends BaseController {
             // 直接写入Excel数据
             List<SocialSecurityEmployeeExcel> list = getList(vo, employees, employeeExcels);
             HashMap<String, Object> map = new HashMap<>();
-            String titleName = vo.getYear() + "年" + vo.getMonth() + "月" + "社保明细";
+            BizCompany company = companyService.getById(vo.getCompanyId());
+            String titleName = vo.getYear() + "年" + vo.getMonth() + "月" + company.getName() + "公司社保明细";
             AtomicReference<BigDecimal>[] totals = new AtomicReference[17];
             // 初始化数组
             for (int i = 0; i < totals.length; i++) {