数据看板-维修申报统计调整

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -453,11 +453,11 @@ public class DataboardController {
         int personCount = 0;
 
         for (Map<String, Object> objectMap : list) {
-            Object statusObj = objectMap.get("status");
-            if(statusObj == null){
-                uncompleteCount ++;
-            }else{
+            Object statusObj = objectMap.get("maintenance_feedback");
+            if(statusObj != null && !statusObj.toString().isEmpty()){
                 completeCount ++;
+            }else{
+                uncompleteCount ++;
             }
             if(objectMap.get("status") != null && "是".equals(objectMap.get("status").toString())){
                 personCount ++;

src/main/java/com/xjrsoft/module/teacher/entity/TeacherAward.java

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 
@@ -171,4 +172,7 @@ public class TeacherAward implements Serializable {
      */
     @ApiModelProperty("完整的奖项名称")
     private String wholeCompetitionName;
+
+    @ApiModelProperty("获奖日期")
+    private LocalDate awardDate;
 }

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -125,4 +126,7 @@ public class TeacherAwardDetailPageVo {
      */
     @ApiModelProperty("是否论文（1：是 0：否）")
     private Integer isThesis;
+
+    @ApiModelProperty("获奖日期")
+    private LocalDate awardDate;
 }