Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml

@@ -254,7 +254,7 @@
             <if test="riskLevel != null  and riskLevel != ''">
                 and s.RISK_LEVEL in
                 <foreach item="item" index="index" collection="riskLevel.split(',')" open="(" separator="," close=")">
-                    #{riskLevel}
+                    #{item}
                 </foreach>
             </if>
             <if test="standLevel != null  and standLevel != ''">and s.STAND_LEVEL = #{standLevel}</if>

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -274,7 +274,7 @@
             MAX(law_sort) AS sort,
             COUNT(law_areas) AS count,
   SUM(CASE WHEN check_status = 1 THEN 1 ELSE 0 END) AS completed,
-  100 * SUM(CASE WHEN check_status = 1 THEN 1 ELSE 0 END) / COUNT(law_areas) AS completion_rate
+        ROUND(100 * SUM(CASE WHEN check_status = 1 THEN 1 ELSE 0 END) / COUNT(law_areas)) AS completion_rate
         FROM b_plan_enterprise
         <where>
             <if test="req.plannedYear !=null and req.plannedYear!='' ">
@@ -302,7 +302,7 @@
             MAX(law_sort) AS sort,
             COUNT(law_areas) AS count,
   SUM(CASE WHEN check_status = 1 THEN 1 ELSE 0 END) AS completed,
-  100 * SUM(CASE WHEN check_status = 1 THEN 1 ELSE 0 END) / COUNT(law_areas) AS completion_rate
+        ROUND(100 * SUM(CASE WHEN check_status = 1 THEN 1 ELSE 0 END) / COUNT(law_areas)) AS completion_rate
         FROM b_plan_enterprise
         <where>
             <if test="req.plannedYear !=null and req.plannedYear!='' ">