Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!362

adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml

@@ -11,9 +11,8 @@
 			`index`.value_type as valueType,
 			eva.evaluation_type as evaluationType,
 			process_node as processNode,
-			avg(eva.score * `index`.weight) AS score,
-			min(eva.create_time) as createTiem,
-			max(eva.modify_time) as modifyTime
+			sum(eva.score * `index`.weight) AS score,
+			max(eva.create_time) as createTiem
 		FROM
 			quality_evaluation AS eva
 		LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
@@ -26,7 +25,7 @@
 			valueType,
 			evaluationType,
 			process_node
-		ORDER BY modifyTime DESC,process_node ASC
+		ORDER BY createTiem DESC,process_node ASC
 
     </select>
 
@@ -36,6 +35,7 @@
 			resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation">
 
 		SELECT
+		DISTINCT
 			UNAME AS userName,
 			score,
 			reason,
@@ -48,7 +48,8 @@
 			`index`.one_index_title as oneIndexTitle,
 			`index`.two_index_title as twoIndexTitle,
 			`index`.three_index_title as threeIndexTitle,
-			`index`.weight as weight
+			`index`.weight as weight,
+			`index`.index_sort
 		FROM
 			quality_evaluation
 		LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID