Joburgess 4 年 前
コミット
0ea706e3dc

+ 6 - 6
mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -161,14 +161,14 @@
 			CONCAT(#{month}, '-01') month_,
 			<choose>
 				<when test="type == 'submit'">
-					SUM(sees.expect_exercises_num_) total_num_,
+					SUM(sees.actual_exercises_num_) total_num_,
 					SUM(sees.exercises_reply_num_) activate_num_,
-					TRUNCATE(SUM(sees.exercises_reply_num_)/SUM(sees.expect_exercises_num_)*100, 2) percent_
+					TRUNCATE(SUM(sees.exercises_reply_num_)/SUM(sees.actual_exercises_num_)*100, 2) percent_
 				</when>
 				<when test="type == 'comment'">
-					SUM(sees.expect_exercises_num_) total_num_,
-					SUM(sees.exercises_reply_num_) activate_num_,
-					TRUNCATE(SUM(sees.exercises_reply_num_)/SUM(sees.expect_exercises_num_)*100, 2) percent_
+					SUM(sees.exercises_reply_num_) total_num_,
+					SUM(sees.exercises_message_num_) activate_num_,
+					TRUNCATE(SUM(sees.exercises_message_num_)/SUM(sees.exercises_reply_num_)*100, 2) percent_
 				</when>
 				<otherwise>
 					SUM(sees.expect_exercises_num_) total_num_,
@@ -181,7 +181,7 @@
 		WHERE su.del_flag_=0
 			AND su.organ_id_ IS NOT NULL
 			AND YEAR(sees.monday_)=YEAR(CONCAT(#{month}, '-01'))
-			AND MONTH(sees.monday_)&lt;=MONTH(CONCAT(#{month}, '-01'))
+			AND MONTH(sees.monday_)=MONTH(CONCAT(#{month}, '-01'))
 		GROUP BY su.organ_id_
 		ORDER BY su.organ_id_
 	</select>