工单评分

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

@@ -867,7 +867,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                         GxtWorkOrderPerson workPerson = new GxtWorkOrderPerson();
                         workPerson.setId(person.getId());
                         workPerson.setFinalScore(person.getFinalScore());
-                        workPerson.setScore(person.getReviewScore() != null ? BigDecimal.valueOf(person.getReviewScore()) : null);
+                        workPerson.setScore(person.getFinalScore() != null ? BigDecimal.valueOf(person.getFinalScore()) : null);
                         personList.add(workPerson);
                     }
                     gxtWorkOrderService.updateWorkOrderPersonList(personList);
@@ -1419,6 +1419,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                     
                     // 在月度统计中查找该用户
                     for (GxtUserScore userScore : userScores) {
+                        boolean found = false;
                         // 使用userName进行匹配
                         if (orderPerson.getNickName() != null && orderPerson.getNickName().equals(userScore.getUserName())) {
                             // 更新维修工单总分（应用差值）
@@ -1436,8 +1437,31 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                             userScore.setUpdateBy(SecurityUtils.getUsername());
                             userScore.setUpdateTime(new Date());
                             gxtUserScoreService.updateGxtUserScore(userScore);
+                            found = true;
                             break;
                         }
+
+                        // 如果没找到用户记录，则创建新记录
+                        /*if (!found) {
+                                GxtUserScore newUserScore = new GxtUserScore();
+                                newUserScore.setMonthScoreId(monthScore.getId());
+                                newUserScore.setUserName(orderPerson.getNickName());
+                                newUserScore.setMonthPeriod(monthScore.getMonthPeriod());
+
+                                // 设置维修工单得分
+                                BigDecimal repairScore = (orderPerson.getScore() != null) ?
+                                        orderPerson.getScore() : BigDecimal.ZERO;
+                                newUserScore.setRepairTotalScore(repairScore);
+
+                                // 维保得分默认为0
+                                newUserScore.setMaintenanceTotalScore(BigDecimal.ZERO);
+                                newUserScore.setFinalScore(repairScore);
+                                newUserScore.setStatus(0);
+                                newUserScore.setCreateBy(SecurityUtils.getUsername());
+                                newUserScore.setCreateTime(new Date());
+                                // 插入新记录
+                                gxtUserScoreService.insertGxtUserScore(newUserScore);
+                        }*/
                     }
                 }
             }
@@ -1471,6 +1495,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
 
                     // 在月度统计中查找该用户
                     for (GxtUserScore userScore : userScores) {
+                        boolean found = false;
                         // 使用userName进行匹配
                         if (orderPerson.getNickName() != null && orderPerson.getNickName().equals(userScore.getUserName())) {
                             // 更新用户得分（加上差值）
@@ -1489,8 +1514,31 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                             userScore.setUpdateTime(new Date());
                             // 更新用户评分统计
                             gxtUserScoreService.updateGxtUserScore(userScore);
+                            found = true;
                             break;
                         }
+
+                        // 如果没找到用户记录，则创建新记录
+                        /*if (!found) {
+                            GxtUserScore newUserScore = new GxtUserScore();
+                            newUserScore.setMonthScoreId(monthScore.getId());
+                            newUserScore.setUserName(orderPerson.getNickName());
+                            newUserScore.setMonthPeriod(monthScore.getMonthPeriod());
+
+                            // 设置维保工单得分
+                            BigDecimal maintenanceScore = (orderPerson.getScore() != null) ?
+                                    orderPerson.getScore() : BigDecimal.ZERO;
+                            newUserScore.setMaintenanceTotalScore(maintenanceScore);
+
+                            // 维修得分默认为0
+                            newUserScore.setRepairTotalScore(BigDecimal.ZERO);
+                            newUserScore.setFinalScore(maintenanceScore);
+                            newUserScore.setStatus(0);
+                            newUserScore.setCreateBy(SecurityUtils.getUsername());
+                            newUserScore.setCreateTime(new Date());
+                            // 插入新记录
+                            gxtUserScoreService.insertGxtUserScore(newUserScore);
+                        }*/
                     }
                 }
             }