Merge remote-tracking branch 'origin/dev' into dev

common/src/main/java/com/ximai/common/core/dto/SysUserExcelExport.java

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -92,7 +93,7 @@ public class SysUserExcelExport {
      * 最后登录时间
      */
     @ExcelProperty(value = "最后登录时间", converter = LocalDateTimeConverter.class)
-    private Date loginDate;
+    private LocalDateTime loginDate;
 
     @ApiModelProperty("国际化语言")
     @ExcelProperty("国际化")

mes/src/main/java/com/ximai/mes/kanban/service/KanbanTaskService.java

@@ -215,7 +215,8 @@ public class KanbanTaskService {
     private List<TaskStatDto.AbnormalCauseStat> unQualifiedDist(List<ProFeedback> feedbackList){
         List<TaskStatDto.AbnormalCauseStat> rst = new ArrayList<>();
         //按不合格原因分组
-        Map<String, List<ProFeedback>> feedbackMap = feedbackList.stream().collect(Collectors.groupingBy(s->s.getAbnormalReason()));
+        Map<String, List<ProFeedback>> feedbackMap = feedbackList.stream().filter(s->StringUtils.isNotEmpty(s.getAbnormalReason()))
+                .collect(Collectors.groupingBy(s->s.getAbnormalReason()));
         feedbackMap.forEach((k,v)->{
             if(StringUtils.isBlank(k)){
                 return;