线上版本-bug-20201104

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/QualityAnalyseController.java

@@ -5,8 +5,10 @@ import cn.com.qmth.stmms.ms.core.domain.Level;
 import cn.com.qmth.stmms.ms.core.domain.MarkLogOperType;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTask;
+import cn.com.qmth.stmms.ms.core.domain.user.MarkUser;
 import cn.com.qmth.stmms.ms.core.repository.LevelRepo;
 import cn.com.qmth.stmms.ms.core.repository.MarkTaskRepo;
+import cn.com.qmth.stmms.ms.core.repository.MarkUserRepo;
 import cn.com.qmth.stmms.ms.core.vo.Subject;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,9 @@ public class QualityAnalyseController {
     @Autowired
     MarkTaskRepo markTaskRepo;
 
+    @Autowired
+    MarkUserRepo markUserRepo;
+
     /**
      * 档位占比报表
      *
@@ -306,7 +311,9 @@ public class QualityAnalyseController {
             if (Objects.nonNull(distinctIdList) && distinctIdList.size() > 0) {
                 for (Long l : distinctIdList) {
                     Map map = new HashMap();
-                    map.put("userName", markerMap.get(l).getMarkerName());
+                    MarkUser markUser = markUserRepo.findOne(markerMap.get(l).getMarkerId());
+//                    map.put("userName", markerMap.get(l).getMarkerName());
+                    map.put("userName", markUser.getLoginName());
                     map.put("sumCount", 0);
                     map.put("userId", l);
                     list.add(map);