APP工分调整

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/OrderScoreInfo.java

@@ -216,6 +216,9 @@ public class OrderScoreInfo {
 
     private String remark;
 
+    /** 本人得分 */
+    private BigDecimal myScore;
+
     public Integer getOrderType() {
         return orderType;
     }
@@ -753,4 +756,12 @@ public class OrderScoreInfo {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public BigDecimal getMyScore() {
+        return myScore;
+    }
+
+    public void setMyScore(BigDecimal myScore) {
+        this.myScore = myScore;
+    }
 }

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

@@ -22,12 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.*;
 
 /**
  * 工单评分Service业务层处理
@@ -118,6 +113,9 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                     scorePerson.setFeedbackReason(person.getFeedbackReason());
                     scorePerson.setConfirmStatus(person.getConfirmStatus());
                     scorePersons.add(scorePerson);
+                    if (Objects.equals(person.getUserId(), SecurityUtils.getUserId()) && ("to_archive".equals(order.getScoringStatus()) || "archived".equals(order.getScoringStatus()))) {
+                        order.setMyScore(person.getScore());
+                    }
                 }
                 order.setScorePersonList(scorePersons);
             } else if (order.getOrderType() == 2) {
@@ -137,6 +135,9 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                     scorePerson.setFeedbackReason(person.getFeedbackReason());
                     scorePerson.setConfirmStatus(person.getConfirmStatus());
                     scorePersons.add(scorePerson);
+                    if (Objects.equals(person.getUserId(), SecurityUtils.getUserId())  && ("to_archive".equals(order.getScoringStatus()) || "archived".equals(order.getScoringStatus()))) {
+                        order.setMyScore(person.getScore());
+                    }
                 }
                 order.setScorePersonList(scorePersons);
             }
@@ -197,7 +198,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                 result.put("repairCount", statistics.get("repairCount"));
 
                 // 计算排名
-                int rank = calculateUserRankInStation(repairOrder, workOrder, month);
+               /* int rank = calculateUserRankInStation(repairOrder, workOrder, month);
                 result.put("rank", rank);
 
                 // 计算场站总人数
@@ -219,7 +220,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
                 } else {
                     // 如果无法获取用户信息，至少当前用户参与排名
                     result.put("totalRankingUsers", 1);
-                }
+                }*/
 
                 return result;
             }