Эх сурвалжийг харах

个人绩效汇总:
修复导出文件缺少字段缺陷

xiexh 10 цаг өмнө
parent
commit
b329a3370e

+ 5 - 2
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/hrm/service/imple/PersonnelManagementServiceImpl.java

@@ -271,7 +271,7 @@ public class PersonnelManagementServiceImpl extends GenericProvider implements P
 
         clauseConfig.addAll(dbRecords);
         // 创建表头
-        String[] headers = new String[3 + clauseConfig.size() + 1]; // 序号 + 部门 + 年份 + 姓名 + 16个条款 + 汇总
+        String[] headers = new String[4 + clauseConfig.size() + 1]; // 序号 + 部门 + 年份 + 姓名 + 16个条款 + 汇总
         headers[0] = "序号"; headers[1] = "部门"; headers[2] = "年份"; headers[3] = "姓名";
         for (int i = 0; i < clauseConfig.size(); i++) {
             headers[4 + i] = clauseConfig.get(i);
@@ -291,7 +291,10 @@ public class PersonnelManagementServiceImpl extends GenericProvider implements P
             String dept = MapUtils.getString(row, "bu_men_2_");
             String year = MapUtils.getString(row, "nian_fen_2_");
             String name = MapUtils.getString(row, "xing_ming_2_");
-            String clauseName = MapUtils.getString(row, "tiao_kuan_ming_ch", "");
+            String clauseName = MapUtils.getString(row, "tiao_kuan_ming_ch", "其他条款");
+            if (clauseName != null) {
+                clauseName = clauseName.trim(); // 去除前后空格
+            }
             String scoreStr = MapUtils.getString(row, "ji_xiao_ping_fen_");
 
             BigDecimal score = StringUtils.isNotBlank(scoreStr) ? new BigDecimal(scoreStr) : BigDecimal.ZERO;