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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/mapper/CoreMessageCenterMapper.java

@@ -1,6 +1,4 @@
 package com.xunmei.core.information.mapper;
-
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.information.domain.CoreMessageCenter;
@@ -8,7 +6,6 @@ import com.xunmei.core.information.dto.CoreMessageCenterDTO;
 import com.xunmei.core.information.vo.CoreMessageCenterVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -108,10 +108,10 @@
     <select id="orgDimension" resultType="java.util.Map">
         SELECT
         COUNT( a.id ) AS planInspectOrg,
-        IFNULL( SUM( IF ( a.`status` = 1, 1, 0 )), 0 ) AS realityInspectOrg,
+        IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 ) AS realityInspectOrg,
         IFNULL(
         CONCAT(
-        ROUND( SUM( IF ( a.`status` = 1, 1, 0 ))/ COUNT( a.id )* 100, 2 ),
+        ROUND( SUM( IF ( a.`status` = 3, 1, 0 ))/ COUNT( a.id )* 100, 2 ),
         '%'
         ),
         '0%'
@@ -131,7 +131,9 @@
         <if test="orgType !=null">
             AND c.type = #{orgType}
         </if>
-
+<if test="type !=null">
+    and b.check_type=#{type}
+</if>
     </select>
     <select id="pitfallDimension" resultType="java.util.Map">
         SELECT