Merge branch 'V0.0.9' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.9

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

@@ -176,7 +176,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, "总结", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("note").toString(), Element.ALIGN_LEFT, 5, 1);
         createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 1);
-        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 80, 30);
+        dealEduImageCell((List<String>) data.get("signImage"), table, 4, 80, 30);
         document.add(table);
 
         //第二页
@@ -445,7 +445,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("comment").toString(), Element.ALIGN_LEFT, 5, 1);
         //参会人员签字
         createPDFCell(tableFont, table, "参演人员", Element.ALIGN_MIDDLE, 1, 1);
-        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 80, 30);
+        dealEduImageCell((List<String>) data.get("signImage"), table, 4, 80, 30);
         document.add(table);
 
         //第二页

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -885,19 +885,29 @@ and
     </select>
     <select id="getLibrary" resultType="java.util.Map">
         SELECT
-            COUNT( a.business_library_type ) AS total,
-            IFNULL( sum( IF ( a.business_library_type = 1, 1, 0 )), 0 ) AS one,
-            IFNULL( SUM( IF ( a.business_library_type = 2, 1, 0 )), 0 ) AS two,
-            IFNULL( SUM( IF ( a.business_library_type = 3, 1, 0 )), 0 ) AS three,
-            IFNULL( SUM( IF ( a.business_library_type = 4, 1, 0 )), 0 ) AS four
+            sum( a.yywd + a.zxywk ) AS total,
+            a.one,
+            a.two,
+            a.three,
+            a.four
         FROM
-            sys_org_extend a
-                LEFT JOIN sys_org b ON a.org_id = b.id
-        where
-        1=1
-        and    b.path LIKE concat(#{orgPath}, '%')
-        and b.is_lock = 0
-        and b.deleted = 0
+            (
+                SELECT
+                    IFNULL( sum( IF ( b.type = 6, 1, 0 )), 0 ) AS yywd,
+                    IFNULL( sum( IF ( b.type = 4 AND a.business_library = 1, 1, 0 )), 0 ) AS zxywk,
+                    IFNULL( sum( IF ( a.business_library_type = 1, 1, 0 )), 0 ) AS one,
+                    IFNULL( SUM( IF ( a.business_library_type = 2, 1, 0 )), 0 ) AS two,
+                    IFNULL( SUM( IF ( a.business_library_type = 3, 1, 0 )), 0 ) AS three,
+                    IFNULL( SUM( IF ( a.business_library_type = 4, 1, 0 )), 0 ) AS four
+                FROM
+                    sys_org b
+                        LEFT JOIN sys_org_extend a ON a.org_id = b.id
+                WHERE
+                  b.is_lock = 0
+                  and b.path LIKE concat(#{orgPath}, '%')
+                  and b.deleted = 0
+                  AND (b.type = 4 OR b.type = 5 OR b.type = 6)
+            ) a
     </select>
     <select id="getCollectLibrary" resultType="java.lang.Integer">
         SELECT