xujun

science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectGroupScoreOrderDTO.java

@@ -22,6 +22,8 @@ public class ProjectGroupScoreOrderDTO implements Serializable {
     private String projNo;
     /** 项目名称 */
     private String projName;
+    /** 一级学科 */
+    private String parentName;
     /** 二级学科 */
     private String knowledgeName;
     /** 所属市州单位 */
@@ -30,6 +32,10 @@ public class ProjectGroupScoreOrderDTO implements Serializable {
     private String personName;
     /** 申报单位 */
     private String appUnitName;
-    /** 平均分 */
-    private BigDecimal averageScore;
+    /** 技术专家评分 */
+    private String gradeScore1;
+    /** 财务专家评分 */
+    private String gradeScore2;
+    /** 最终得分 */
+    private String calculateScore;
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -623,8 +623,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         return dto;
     }
 
-    public EvaluationExportExcelDTO getProjectGroupScoreOrder(Integer reportYear, Integer
-            startRow, List<String> rowMarkList) {
+    public EvaluationExportExcelDTO getProjectGroupScoreOrder(Integer reportYear, Integer startRow, List<String> rowMarkList) {
         List<ProjectGroupScoreOrderDTO> list = comProjectAuditDAO.getProjectGroupScoreOrder(reportYear);
 
         Map<String, List<ProjectGroupScoreOrderDTO>> groupScoreMap1 = list.stream()

science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

@@ -295,14 +295,16 @@
         order by a.proj_no, a.proj_name
     </select>
     <select id="getProjectGroupScoreOrder" resultType="com.yiboshi.science.param.dto.ProjectGroupScoreOrderDTO">
-        select a.id as group_id, a.group_name, a.display_order, b.proj_id, c.proj_no, c.proj_name, f.name as knowledge_name, ifnull(h.unit_name, '省直属') as unit_name, d.person_name, e.unit_name as app_unit_name, c.average_score
+        select a.id as group_id, a.group_name, a.display_order, b.proj_id, c.proj_no, c.proj_name, f.name as knowledge_name, i.name as parent_name, ifnull(h.unit_name, '省直属') as unit_name, d.person_name, e.unit_name as app_unit_name,
+        CONCAT_WS('/', c.technology_score, c.technology_average_score) as gradeScore1, CONCAT_WS('/', c.economy_score, c.economy_average_score) as gradeScore2, c.calculate_score
         from com_project_group a left join com_project_group_detail b on a.id = b.group_id
         left join com_project c on b.proj_id = c.id
         left join com_person d on c.app_person_id = d.id
         left join com_unit e on c.app_unit_id = e.id
         left join system_parameter f on c.knowledge_id = f.id
+        left join system_parameter i on f.parent_id = i.id
         left join com_unit g on c.app_unit_id = g.id
         left join com_unit h on substring(g.tree_code, 1, 10) = h.tree_code and h.unit_type = 0
-        where a.group_year = #{reportYear} order by a.display_order, c.average_score desc
+        where a.group_year = #{reportYear} order by a.display_order, a.group_name, c.calculate_score desc
     </select>
 </mapper>
\ No newline at end of file