安全检查登记簿

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -56,11 +56,13 @@
         <collection property="checkOrgList" ofType="com.xunmei.system.api.domain.SysOrg">
             <result column="check_org_id" property="id"/>
             <result column="check_org_name" property="name"/>
+            <result column="check_org_name" property="shortName"/>
         </collection>
         <!-- 检查机构关系映射 -->
         <collection property="execOrgList" ofType="com.xunmei.system.api.domain.SysOrg">
             <result column="exec_org_id" property="id"/>
             <result column="exec_org_name" property="name"/>
+            <result column="exec_org_name" property="shortName"/>
         </collection>
         <!-- 检查机构类型关系映射 -->
         <collection property="checkOrgTypeList"
@@ -167,9 +169,9 @@
                co.plan_id       AS check_org_plan_id,
                co.org_id        AS check_org_org_id,
                o3.id            AS exec_org_id,
-               o3.NAME          AS exec_org_name,
+               o3.short_NAME    AS exec_org_name,
                o4.id            AS check_org_id,
-               o4.NAME          AS check_org_name,
+               o4.short_NAME    AS check_org_name,
                pp.of_org_id,
                typ.type_id,
                typ.plan_id      as type_plan_id

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -567,12 +567,13 @@ public class PdfUtil {
             document.add(table);
             return;
         }
+        int questionIndex=1;
         for (int i = 1; i <= data.getCheckDatas().size(); i++) {
             final CheckDataVo checkDataVo = data.getCheckDatas().get(i - 1);
             if (ObjectUtil.isEmpty(checkDataVo.getResRemark())) {
                 continue;
             }
-            PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 2, 1);
+            PdfUtil.createPDFCell(tableFont, table, String.valueOf(questionIndex++), Element.ALIGN_MIDDLE, 2, 1);
             PdfUtil.createPDFCell(tableFont, table, checkDataVo.getItemName(), Element.ALIGN_MIDDLE, 6, 1);
             PdfUtil.createPDFCell(tableFont, table, checkDataVo.getResRemark(), Element.ALIGN_MIDDLE, 6, 1);
         }