Merge remote-tracking branch 'origin/develop_master' into develop_master

2021-12-07 15:20:05 +08:00
parent 1edd95bccc 359a384c70
commit 01b503fda5
10 changed files with 131 additions and 81 deletions
@@ -5,20 +5,20 @@
    <select id="getHistory"
            resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation">

-        SELECT
-        	`user`.UNAME AS userName,
-        	evaluation_index,
-        	eva.user_id,
-        	avg(eva.score * iex.weight) AS score
-        FROM
-        	quality_evaluation AS eva
-        LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
-        LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id
-        GROUP BY
-        	userName,
-        	evaluation_index,
-        	eva.user_id,
-	        score
+		 SELECT
+			`user`.UNAME AS userName,
+			eva.user_id,
+			avg(eva.score * iex.weight) AS score,
+			iex.index_type as valueType
+		FROM
+			quality_evaluation AS eva
+		LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
+		LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id
+		GROUP BY
+			userName,
+			eva.user_id,
+			index_type
+
        ${ew.customSqlSegment}
    </select>
 </mapper>