Merge branch 'master' of http://124.70.43.205:3000/xushili/calc-hub

ruoyi-admin/src/main/java/com/ruoyi/web/controller/JavaFunctionJobHandler.java

@@ -529,7 +529,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
             DateTime endTq = DateUtil.offset(end, DateField.YEAR, -1);
 
             QueryWrapper<StationInfoDay> wrapper = new QueryWrapper<>();
-            wrapper.lambda().between(StationInfoDay::getRecordDate, begin, end);
+            wrapper.between("record_date", begin, end);
             List<StationInfoDay> days = stationInfoDayService.list(wrapper);
             Map<String, Map<String, StationInfoDay>> dayMap = new HashMap<>();
             if (CollUtil.isNotEmpty(days)) {
@@ -537,7 +537,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
                         Collectors.toMap(sid -> DateUtil.formatDate(sid.getRecordDate()), Function.identity())));
             }
             wrapper.clear();
-            wrapper.lambda().between(StationInfoDay::getRecordDate, beginTq, endTq);
+            wrapper.between("record_date", beginTq, endTq);
 //            List<StationInfoDay> sids = stationInfoDayService.list(wrapper);
             List<StationInfoDay> sids = null;
             Map<String, List<StationInfoDay>> sidMap;
@@ -547,8 +547,8 @@ public class JavaFunctionJobHandler extends IJobHandler {
                 sidMap = null;
             }
             QueryWrapper<ProBasicProjectPlan> wrapperPlan = new QueryWrapper<>();
-            wrapperPlan.lambda().eq(ProBasicProjectPlan::getYear, String.valueOf(begin.year()))
-                    .eq(ProBasicProjectPlan::getMonth, String.valueOf(begin.month() + 1));
+            wrapperPlan.eq("year", String.valueOf(begin.year()))
+                    .eq("month", String.valueOf(begin.month() + 1));
             List<ProBasicProjectPlan> plantList = proBasicProjectPlanService.list(wrapperPlan);
 
             for (ProBasicProjectPlan plan : plantList) {