考评对标分析API

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationScoreCountController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -88,4 +89,19 @@ public class EvaluationScoreCountController {
 		}
 	}
 
+
+	@ApiOperation(value = "考评对标分析")
+	@GetMapping(value = "evaluation/list")
+	public R EvaluationBenchmarkingAnalysis(
+		@RequestParam(value = "year", required = false) String year, //年
+		@RequestParam(value = "season", required = false) String season, //季度
+		@RequestParam(value = "month", required = false) String month, //月
+		@RequestParam(value = "type", required = false) String type, //指标类型
+		@RequestParam(value = "binSection", required = false) String binSection, //板块
+		@RequestParam(value = "binStage", required = false) String binStage) { //业务阶段
+		List<Map<String, Object>> list = iEvaluationScoreCountService.evaluationList(binSection, binStage, type, year, season, month);
+		return R.ok().data(list);
+	}
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/IndicatorController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -202,6 +203,4 @@ public class IndicatorController {
 	}
 
 
-
-
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationScoreCountMapper.java

@@ -1,11 +1,11 @@
 package com.ims.eval.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ims.eval.entity.BinSection;
 import com.ims.eval.entity.EvaluationScoreCount;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,4 +22,6 @@ public interface EvaluationScoreCountMapper extends BaseMapper<EvaluationScoreCo
 															 @Param("organizationEvaluationRuleId") String organizationEvaluationRuleId,
 															 @Param("binStage") String binStage);
 
+
+	List<Map<String, Object>> selectEvaluationList(String binSection, String binStage, String type, String year, String season, String month);
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationScoreCountService.java

@@ -5,6 +5,7 @@ import com.ims.eval.entity.BinSection;
 import com.ims.eval.entity.EvaluationScoreCount;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,7 +18,9 @@ import java.util.List;
 public interface IEvaluationScoreCountService extends IService<EvaluationScoreCount> {
 
 
-
 	List<EvaluationScoreCount> getListByEvaluationRuleId(String organizationEvaluationId,String organizationEvaluationRuleId,String binStage);
 
+
+	List<Map<String, Object>> evaluationList(String binSection, String binStage, String type, String year, String season, String month);
 }
+

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluatioinScoreCountServiceImpl.java

@@ -12,7 +12,9 @@ import com.ims.eval.service.IEvaluationScoreCountService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,10 +28,15 @@ import java.util.List;
 public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScoreCountMapper, EvaluationScoreCount> implements IEvaluationScoreCountService {
 
 
-
 	@Override
 	public List<EvaluationScoreCount> getListByEvaluationRuleId(String organizationEvaluationId, String organizationEvaluationRuleId, String binStage) {
 		List<EvaluationScoreCount> list = baseMapper.selelctListByEvaluationRuleId(organizationEvaluationId, organizationEvaluationRuleId, binStage);
 		return list;
 	}
+
+	@Override
+	public List<Map<String, Object>> evaluationList(String binSection, String binStage, String type, String year, String season, String month) {
+		List<Map<String, Object>> list = baseMapper.selectEvaluationList(binSection, binStage, type, year, season, month);
+		return list;
+	}
 }

ims-service/ims-eval/src/main/resources/mappers/EvaluationScoreCountMapper.xml

@@ -16,7 +16,7 @@
         id, organization_evaluation_id, indicator_id, score, organization_evaluation_rule_id
     </sql>
 
-    <select id="selelctListByEvaluationRuleId" resultType="com.ims.eval.entity.dto.response.EvaluationScoreCountDTO">
+    <select id="selelctListByEvaluationRuleId" resultType="com.ims.eval.entity.EvaluationScoreCount">
         select c.*,i.indicator_name,o.organization_name,b.section_name,s.stage_name,d.key_name
         from evaluation_score_count c
         LEFT JOIN indicator i on  c.indicator_id = i.id
@@ -39,4 +39,48 @@
         </where>
     </select>
 
+    <select id="selectEvaluationList" resultType="java.util.Map">
+        SELECT
+        oer.organization_name,
+        es.score,
+        es.obversion_score,
+        i.indicator_name,
+        i.unit
+        FROM
+        evaluation_score_count es
+        LEFT JOIN indicator i ON es.indicator_id = i.id
+        LEFT JOIN indicator_type t ON i.indicator_type_id = t.id
+        LEFT JOIN bin_stage b ON i.bin_stage = b.id
+        LEFT JOIN bin_section bs ON i.bin_section = bs.id
+        LEFT JOIN organization_evaluation oe ON oe.id = es.organization_evaluation_id
+        LEFT JOIN organization_evaluation_rule oer ON oer.id = es.organization_evaluation_rule_id
+        <where>
+
+            <if test="binSection !=null and binSection !=''">
+                AND bs.id = #{binSection}
+            </if>
+            <if test="binStage !=null and binStage !=''">
+                AND b.id = #{binStage}
+            </if>
+
+            <if test="type !=null and type !=''">
+                AND i.type = #{type}
+            </if>
+
+            <if test="year !=null and year !=''">
+                AND oe.year = #{year}
+            </if>
+
+            <if test="season !=null and season !=''">
+                AND oe.season = #{season}
+            </if>
+
+            <if test="month !=null and month !=''">
+                AND oe.month = #{month}
+            </if>
+
+        </where>
+
+    </select>
+
 </mapper>