配置文件提交

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -984,7 +984,7 @@ public class PlanTaskController extends AbstractBaseController {
 
         if (!ObjectUtils.isEmpty(pointId)) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.matchPhraseQuery("pointId", "*" + planTaskId + "*"));
+            meBuilder.must(QueryBuilders.matchPhraseQuery("pointId", "*" + pointId + "*"));
             boolMust.must(meBuilder);
         }
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -1200,7 +1200,7 @@ public class CheckServiceImpl implements ICheckService {
         }
 
         if(type.equals(String.valueOf(PlanTaskTypeStatusEnum.day.getValue()))) {
-            calendar.setTime(DateUtils.dateParse(checkTime, DateUtils.DATE_PATTERN));
+            calendar.setTime(DateUtils.dateParse(checkTime, DateUtils.MONTH_PATTERN));
             int sYear = calendar.get(Calendar.YEAR);
             int sMonth = calendar.get(Calendar.MONTH) + 1;
             int month = calendarNew.get(Calendar.MONTH) + 1;

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1405,8 +1405,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 //        }
 
         builder.query(boolMust);
-        builder.sort("checkDate", SortOrder.DESC);
-        builder.from((Integer.parseInt(params.get("number").toString()) - 1) * Integer.parseInt(params.get("size").toString()));
+      //  builder.sort("checkDate", SortOrder.DESC);
+        builder.from((Integer.parseInt(params.get("number").toString())) * Integer.parseInt(params.get("size").toString()));
         builder.size(Integer.parseInt(params.get("size").toString()));
         request.source(builder);