修复BUG

src/main/java/com/taauav/admin/service/impl/TauvDriverServiceImpl.java

@@ -282,16 +282,7 @@ public class TauvDriverServiceImpl extends BaseServiceImpl<TauvDriverMapper, Tau
         // 区划ID
         if (map.containsKey("driverArea") && !StringUtils.isEmpty(map.get("driverArea"))) {
             BigInteger driverArea = BigInteger.valueOf(Long.valueOf(map.get("driverArea").toString()));
-            // 获取所有自己区划ID
-            List<BigInteger> driverAreaList = new ArrayList<>();
-            driverAreaList.add(driverArea);
-            List<BigInteger> cityIdsList = lsCityService.getChildCityIds(driverArea);
-            if (!cityIdsList.isEmpty()) {
-                cityIdsList.forEach(item -> {
-                    driverAreaList.add(item);
-                });
-            }
-            queryWrapper.in("driver_area", driverAreaList);
+            queryWrapper.eq("driver_area", driverArea);
         }
         // 河流名称
         if (map.containsKey("name") && !StringUtils.isEmpty(map.get("name"))) {
@@ -307,6 +298,9 @@ public class TauvDriverServiceImpl extends BaseServiceImpl<TauvDriverMapper, Tau
         }
         // 每页数
         Integer pageSize = 10;
+        if (map.containsKey("pageSize") && !StringUtils.isEmpty(map.get("pageSize").toString())) {
+            pageSize = Integer.valueOf(map.get("pageSize").toString());
+        }
         IPage<TauvDriver> page = new Page<>(pageIndex, pageSize);
         IPage<TauvDriver> data = driverMapper.selectPage(page, queryWrapper);
         List<TauvDriver> driverList = data.getRecords();

src/main/java/com/taauav/admin/validate/ExecuteTask.java

@@ -30,31 +30,37 @@ public class ExecuteTask {
     /**
      * 天气
      */
+    @Length(max = 20, message = "天气长度最多为20")
     private String weather;
 
     /**
      * 风向
      */
+    @Length(max = 20, message = "风向长度最多为20")
     private String wind;
 
     /**
      * 温度
      */
+    @Length(max = 20, message = "温度长度最多为20")
     private String temperature;
 
     /**
      * 飞行速度
      */
+    @Length(max = 20, message = "飞行速度长度最多为20")
     private String flightSpeed;
 
     /**
      * 飞行高度
      */
+    @Length(max = 20, message = "飞行高度长度最多为20")
     private String flightHeight;
 
     /**
      * 飞行时间
      */
+    @Length(max = 20, message = "飞行时间长度最多为20")
     private String flightTime;
 
     @Length(max = 200, message = "备注不能超过200个字符")

src/main/java/com/taauav/front/service/impl/LSReportServiceImpl.java

@@ -244,21 +244,19 @@ public class LSReportServiceImpl extends BaseServiceImpl<LSReportMapper, TauvRep
                 Integer questionNum = inspectFileService.getReviewNumByInspectDriverId(item.getId(), report.getInspectDriverId());
                 // 报告备注
                 TauvReportRemark remarkInfo = reportRemarkService.getInfoByReportIdAndQuestionId(report.getId(), report.getId());
-                if (remarkInfo != null) {
-                    LSReportQuestionListVo reportQuestionListVo = new LSReportQuestionListVo();
-                    reportQuestionListVo.setId(item.getId());
-                    reportQuestionListVo.setCategory(item.getCategory());
-                    reportQuestionListVo.setCategoryName(categoryList.get(item.getCategory()));
-                    reportQuestionListVo.setType(item.getType());
-                    reportQuestionListVo.setTypeName(typeList.get(item.getType()));
-                    reportQuestionListVo.setQuestionNum(questionNum);
-                    reportQuestionListVo.setRemark(remarkInfo.getRemark());
-                    reportQuestionListVo.setContent(item.getContent());
-                    reportQuestionListVo.setNote(item.getNote());
-                    reportQuestionListVo.setExamineScore(remarkInfo.getExamineScore());
-                    reportQuestionListVo.setCheckScore(remarkInfo.getCheckScore());
-                    reportQuestionListVoList.add(reportQuestionListVo);
-                }
+                LSReportQuestionListVo reportQuestionListVo = new LSReportQuestionListVo();
+                reportQuestionListVo.setId(item.getId());
+                reportQuestionListVo.setCategory(item.getCategory());
+                reportQuestionListVo.setCategoryName(categoryList.get(item.getCategory()));
+                reportQuestionListVo.setType(item.getType());
+                reportQuestionListVo.setTypeName(typeList.get(item.getType()));
+                reportQuestionListVo.setQuestionNum(questionNum);
+                reportQuestionListVo.setRemark(remarkInfo != null ? remarkInfo.getRemark() : "");
+                reportQuestionListVo.setContent(item.getContent());
+                reportQuestionListVo.setNote(item.getNote());
+                reportQuestionListVo.setExamineScore(remarkInfo != null ? remarkInfo.getExamineScore() : 0);
+                reportQuestionListVo.setCheckScore(remarkInfo != null ? remarkInfo.getCheckScore() : 0);
+                reportQuestionListVoList.add(reportQuestionListVo);
             });
         }
         // 加入报告