月度工分汇总-组员得分计算更改

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtMonthScoreServiceImpl.java

@@ -267,8 +267,8 @@ public class GxtMonthScoreServiceImpl implements IGxtMonthScoreService
                     List<GxtWorkOrderPerson> personList = gxtWorkOrderPersonMapper.selectGxtWorkOrderPersonListByScore(gxtWorkOrderPerson);
                     if (!personList.isEmpty()) {
                         for (GxtWorkOrderPerson person:personList) {
-                            if (person.getScore()!=null) {
-                                workOrderScore = workOrderScore.add(person.getScore());
+                            if (person.getFinalScore()!=null) {
+                                workOrderScore = workOrderScore.add(BigDecimal.valueOf(person.getFinalScore()));
                             }
                         }
                     }
@@ -283,8 +283,8 @@ public class GxtMonthScoreServiceImpl implements IGxtMonthScoreService
                     List<GxtRepairOrderPerson> personList1 = gxtRepairOrderPersonMapper.selectGxtRepairOrderPersonListByScore(repairOrderPerson);
                     if (!personList1.isEmpty()) {
                         for (GxtRepairOrderPerson person:personList1) {
-                            if (person.getScore()!=null) {
-                                repairOrderScore = repairOrderScore.add(person.getScore());
+                            if (person.getFinalScore()!=null) {
+                                repairOrderScore = repairOrderScore.add(BigDecimal.valueOf(person.getFinalScore()));
                             }
                         }
                     }

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderPersonMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectGxtRepairOrderPersonListByScore" parameterType="GxtRepairOrderPerson" resultMap="GxtRepairOrderPersonResult">
-        SELECT rop.*, ro.score /( SELECT COUNT(*) FROM gxt_repair_order_person rop2 WHERE rop2.order_id = rop.order_id ) AS score
+        SELECT rop.*
         FROM
             gxt_repair_order_person rop
                 LEFT JOIN gxt_repair_order ro ON rop.order_id = ro.id

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderPersonMapper.xml

@@ -53,8 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectGxtWorkOrderPersonListByScore" parameterType="GxtWorkOrderPerson" resultMap="GxtWorkOrderPersonResult">
         SELECT
-        wop.*,
-        wo.score / wop_counts.cnt AS score
+        wop.*
         FROM
         gxt_work_order_person wop
         LEFT JOIN gxt_work_order wo ON wop.order_id = wo.id