调整积分统计

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankManagerMapper.xml

@@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         union all
 
-        select report_year,report_date,'' submit_org_nm,'2' team_type,t1.work_team_nm,t1.work_princip_nm,
+        select report_year,report_date,t1.work_team_nm submit_org_nm,'2' team_type,'' work_team_nm,t1.work_princip_nm,
         work_level_1+work_level_2+work_level_3+work_level_4+work_level_5
         -IFNULL(province_violation_1,0)-IFNULL(province_violation_2,0)-IFNULL(city_violation_1,0)-IFNULL(city_violation_2,0)
         -IFNULL(city_problem_1,0)-IFNULL(city_problem_2,0) score

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankTeamMapper.xml

@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         union all
 
-        select report_year,report_date,'' submit_org_nm,'2' team_type,t1.work_team_nm,
+        select report_year,report_date,t1.work_team_nm submit_org_nm,'2' team_type,'' work_team_nm,
         work_level_1+work_level_2+work_level_3+work_level_4+work_level_5
         -IFNULL(province_violation_1,0)-IFNULL(province_violation_2,0)-IFNULL(city_violation_1,0)-IFNULL(city_violation_2,0)
         -IFNULL(city_problem_1,0)-IFNULL(city_problem_2,0) score

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankWorkerMapper.xml

@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         union all
 
-        select report_year,report_date,'' submit_org_nm,'2' team_type,t1.work_team_nm,t1.person_nm,
+        select report_year,report_date,t1.work_team_nm submit_org_nm,'2' team_type,'' work_team_nm,t1.person_nm,
         work_level_1+work_level_2+work_level_3+work_level_4+work_level_5
         -IFNULL(province_violation_1,0)-IFNULL(province_violation_2,0)-IFNULL(city_violation_1,0)-IFNULL(city_violation_2,0)
         -IFNULL(city_problem_1,0)-IFNULL(city_problem_2,0) score