Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/service into dev1.0

src/main/resources/mapper/TaCheckMapper.xml

@@ -5,36 +5,36 @@
 
     <update id="updateScore">
         UPDATE ta_check t
-            INNER JOIN (
-                SELECT
-                a.check_id,
-                sum( a.score ) AS score,
-                count( 1 ) AS num
-                FROM
-                ta_check_item a
-                WHERE
-                a.check_id = #{checkId}
-                AND a.item_type = 'loc'
-                AND a.`status` = 1
-            ) m ON m.check_id = t.check_id
-            INNER JOIN (
-                SELECT
-                a.check_id,
-                sum( a.score ) AS score,
-                count( 1 ) AS num
-                FROM
-                ta_check_item a
-                    INNER JOIN  ta_check_answer s ON s.item_id = a.item_id
-                WHERE
-                a.check_id = #{checkId}
-                AND a.item_type = 'survey'
-                AND a.`status` = 1
-            ) n ON n.check_id = t.check_id
-            SET t.loc_score = m.score,
-                t.loc_num = m.num,
-                t.survey_score = n.score,
-                t.survey_num = n.num
+        INNER JOIN (
+        SELECT
+        a.check_id,
+        sum( a.score ) AS score,
+        count( 1 ) AS num
+        FROM
+        ta_check_item a
         WHERE
-            t.check_id = #{checkId}
+        a.check_id = #{checkId}
+        AND a.item_type = 'loc'
+        AND a.`status` = 1
+        ) m ON m.check_id = t.check_id
+        INNER JOIN (
+        SELECT
+        a.check_id,
+        a.score AS score,
+        s.num
+        FROM
+        ta_check_item a
+        INNER JOIN ( SELECT t.item_id,count(1) as num FROM ta_check_answer t WHERE t.check_id =#{checkId} AND t.`status`=1 GROUP BY t.item_id )s ON s.item_id = a.item_id
+        WHERE
+        a.check_id = #{checkId}
+        AND a.item_type = 'survey'
+        AND a.`status` = 1
+        ) n ON n.check_id = t.check_id
+        SET t.loc_score = m.score,
+        t.loc_num = m.num,
+        t.survey_score = n.score,
+        t.survey_num = n.num
+        WHERE
+        t.check_id = #{checkId}
     </update>
 </mapper>