提交

src/main/java/cn/ezhizao/common/utils/PdfUtil.java

@@ -95,6 +95,7 @@ public class PdfUtil {
             FontProvider fontProvider = new DefaultFontProvider(true, true, false);
             PdfFont simsun = PdfFontFactory.createFont(FontProgramFactory.createFont("simsun.ttc", 1, false));
             fontProvider.addFont(simsun.getFontProgram());
+            fontProvider.addSystemFonts();
 //            System.out.println(fontProvider.getFontSet().getFonts().stream().map(l -> l.getFontName()).collect(Collectors.joining(",")));
             converterProperties.setFontProvider(fontProvider);
 

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -552,6 +552,8 @@ public class BizHousingFundConfirmController extends BaseController {
             housingFundConfirm.setDetails(financialSalaryDetailEmployeeList);
             company = companyService.getById(housingFundConfirm.getCompanyId());
             housingFundConfirm.setCompanyName(company.getName());
+            housingFundConfirm.setTime(housingFundConfirm.getYear()+"年"+" "+"第"+housingFundConfirm.getMonth()+"期");
+
         } else {
             return;
         }
@@ -567,8 +569,7 @@ public class BizHousingFundConfirmController extends BaseController {
         String templateContent = out.toString();
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/pdf");
-        String fileName ="工资表";
-//        response.setHeader("Content-Disposition", "filename=" + new String(fileName.getBytes(), "iso8859-1"));
+        String fileName ="公积金人员信息表";
         response.setHeader("Content-Disposition", "filename=" + new String(fileName.getBytes()));
         byte[] resources = PdfUtil.html2Pdf(templateContent);
         ServletOutputStream outputStream = response.getOutputStream();

src/main/java/cn/ezhizao/project/business/housingFund/domain/BizHousingFundConfirmDetail.java

@@ -27,6 +27,11 @@ public class BizHousingFundConfirmDetail extends BaseEntity implements Serializa
     @TableField(exist = false)
     private String companyName;
 
+    //导出期间
+    @TableField(exist = false)
+    private String time;
+
+
     @ApiModelProperty(value = "年")
     private String year;
 

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -549,14 +549,6 @@ public class BizFinancialSalaryController extends BaseController {
         IoUtil.close(out);
     }
 
-//    @Log(title = "导出工资", businessType = BusinessType.EXPORT)
-//    @PreAuthorize("@ss.hasPermi('business:salary:verify')")
-//    @PostMapping("/export")
-//    public void export( @RequestBody List<BizFinancialSalary> list,HttpServletResponse response) throws NoSuchFieldException, IllegalAccessException {
-//
-//        ExcelUtil<BizFinancialSalary> util = new ExcelUtil<BizFinancialSalary>(BizFinancialSalary.class);
-//        util.exportExcel(response, list, "用户数据");
-//    }
 
     @ApiOperation("打印工资信息")
     @PostMapping("/printDetailPdf")
@@ -597,6 +589,8 @@ public class BizFinancialSalaryController extends BaseController {
                 financialSalaryDetail.setIndividualIncomeTax(BigDecimal.valueOf(0));
                 financialSalaryDetail.setOtherCut(BigDecimal.valueOf(0));
             }
+            financialSalaryDetail.setTime(financialSalaryDetail.getYear()+"年"+" "+"第"+financialSalaryDetail.getMonth()+"期");
+
             //查询客户信息
             company = companyService.getById(financialSalaryDetail.getCompanyId());
             //获取客户名称
@@ -611,10 +605,6 @@ public class BizFinancialSalaryController extends BaseController {
         //获取模板地址
         Template template = freeMarkerConfigurer.getConfiguration().getTemplate("salaryTemplate.html");
 
-//        TemplateLoader templateLoader = new FileTemplateLoader(new File(templatePath));
-//        Configuration configuration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
-//        configuration.setTemplateLoader(templateLoader);
-//        Template template = configuration.getTemplate("salaryTemplate.html", "UTF-8");
         template.process(paramMap, out);
         out.flush();
         out.close();
@@ -623,7 +613,6 @@ public class BizFinancialSalaryController extends BaseController {
         response.setContentType("application/pdf");
 
         String fileName ="工资表";
-//        response.setHeader("Content-Disposition", "filename=" + new String(fileName.getBytes(), "iso8859-1"));
         response.setHeader("Content-Disposition", "filename=" + new String(fileName.getBytes()));
         byte[] resources = PdfUtil.html2Pdf(templateContent);
         ServletOutputStream outputStream = response.getOutputStream();

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryZeroController.java

@@ -224,7 +224,6 @@ public class BizFinancialSalaryZeroController extends BaseController {
                 }
             }
             bool = bool && checkKeepAccount(bizFinancialSalaryDetail) && addRecord(bizFinancialSalaryDetail.getFinancialSalaryId(), bizFinancialSalaryDetail.getYear(), bizFinancialSalaryDetail.getMonth(), SecurityUtils.getUserId(), "工资审核通过");
-//            return bool;
         } else {
             bool = bool && addRecord(bizFinancialSalaryDetail.getFinancialSalaryId(), bizFinancialSalaryDetail.getYear(), bizFinancialSalaryDetail.getMonth(), SecurityUtils.getUserId(), "工资审核不通过");
         }

src/main/java/cn/ezhizao/project/business/salary/domain/BizFinancialSalaryDetail.java

@@ -36,6 +36,10 @@ public class BizFinancialSalaryDetail extends BaseEntity
     @TableField(exist = false)
     private String taxType;
 
+    //导出期间
+    @TableField(exist = false)
+    private String time;
+
     /** 年 */
     @Excel(name = "年")
     @ApiModelProperty(value = "年")

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -508,7 +508,7 @@ public class SocialSecurityConfirmController extends BaseController {
             return;
         }
         ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(true);
-        writer.merge(0, 0, 0, 5, "社保员信息", true);
+        writer.merge(0, 0, 0, 5, "社保人员信息", true);
         writer.merge(1, 1, 0, 3, company.getName(), false);
         writer.merge(1, 1, 4, 5, socialSecurityConfirm.getYear() + "年 第" + socialSecurityConfirm.getMonth() + "期", false);
         writer.writeCellValue(0, 2, "员工名");
@@ -598,6 +598,7 @@ public class SocialSecurityConfirmController extends BaseController {
             List<BizSocialSecurityConfirmDetailEmployee> socialSecurityDetailEmployeeList = socialSecurityConfirmDetailEmployeeService.getList(map);
             socialSecurityConfirm.setDetails(socialSecurityDetailEmployeeList);
             company = companyService.getById(socialSecurityConfirm.getCompanyId());
+            socialSecurityConfirm.setTime(" "+socialSecurityConfirm.getYear()+"年"+" "+"第"+socialSecurityConfirm.getMonth()+"期");
             socialSecurityConfirm.setCompanyName(company.getName());
         } else {
             return;
@@ -614,8 +615,7 @@ public class SocialSecurityConfirmController extends BaseController {
         String templateContent = out.toString();
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/pdf");
-        String fileName ="工资表";
-//        response.setHeader("Content-Disposition", "filename=" + new String(fileName.getBytes(), StandardCharsets.ISO_8859_1));
+        String fileName ="社保人员信息表";
         response.setHeader("Content-Disposition", "filename=" + new String(fileName.getBytes()));
         byte[] resources = PdfUtil.html2Pdf(templateContent);
         ServletOutputStream outputStream = response.getOutputStream();

src/main/java/cn/ezhizao/project/business/socialSecurity/domain/BizSocialSecurityConfirmDetail.java

@@ -36,6 +36,10 @@ public class BizSocialSecurityConfirmDetail extends BaseEntity implements Serial
     @ApiModelProperty(value = "详情")
     private String content;
 
+    //导出期间
+    @TableField(exist = false)
+    private String time;
+
     @ApiModelProperty("反馈详情")
     private String feedbackContent;
 

src/main/resources/templates/housingFundTemplate.html

@@ -28,7 +28,6 @@
     }
     .header {
         background-color: #f2f2f2;
-        /*font-weight: bold;*/
     }
 
     /* 用于模拟5列布局 */
@@ -45,7 +44,10 @@
     <!-- 第二行 -->
     <tr class="header border">
         <td class="col-4" colspan="3" align="left" valign="middle"> ${housingFundConfirm.companyName}</td>
-        <td class="col-4" colspan="2" align="center" valign="middle">${ housingFundConfirm.year + "年 第" + housingFundConfirm.month + "期" }</td>
+        <td class="col-4" colspan="2" align="center" valign="middle">
+            <div style="display: inline;">${housingFundConfirm.year}年 第</div><div style="display: inline;">${housingFundConfirm.month}期</div>
+
+        </td>
     </tr>
 
     <!-- 第三行 -->

src/main/resources/templates/salaryTemplate.html

@@ -48,7 +48,8 @@
     <!-- 第二行 -->
     <tr class="header border">
         <td class="col-4" colspan="4" align="left" valign="middle"> ${financialSalaryDetail.companyName}</td>
-        <td class="col-4" colspan="4" align="center" valign="middle">${ financialSalaryDetail.year + "年 第" + financialSalaryDetail.month + "期" }</td>
+        <td class="col-4" colspan="4" align="center" valign="middle">
+            <div style="display: inline;">${financialSalaryDetail.year}年 第</div><div style="display: inline;">${financialSalaryDetail.month}期</div>   </td>
         <td class="col-4" colspan="5" align="right" valign="middle">单位：元</td>
     </tr>
 

src/main/resources/templates/socialSecurityTemplate.html

@@ -42,10 +42,13 @@
         <td align="center"  style="font-weight: bold;font-size: 12px;" valign="middle"bgcolor="#c0c0c0" colspan="6">社保人员信息</td>
     </tr>
 
+
     <!-- 第二行 -->
     <tr class="header border">
         <td class="col-4" colspan="4" align="left" valign="middle"> ${socialSecurityConfirm.companyName}</td>
-        <td class="col-4" colspan="2" align="center" valign="middle">${ socialSecurityConfirm.year + "年 第" + socialSecurityConfirm.month + "期" }</td>
+        <td class="col-4" colspan="2" align="center" valign="middle">
+            <div style="display: inline;">${socialSecurityConfirm.year}年 第</div><div style="display: inline;">${socialSecurityConfirm.month}期</div>
+        </td>
     </tr>
 
     <!-- 第三行 -->