餐补定时任务优化

src/weaver/interfaces/hostar/job/UpdateCbxxjlDataJob.java

@@ -10,9 +10,11 @@ import weaver.general.BaseBean;
 import weaver.general.ThreadPoolUtil;
 import weaver.interfaces.schedule.BaseCronJob;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -40,21 +42,31 @@ public class UpdateCbxxjlDataJob extends BaseCronJob {
         baseBean.writeLog("UpdateCbxxjlDataJob start, param is:" + ryParam + "、" + startDate + "、" + endDate);
         try {
             String today = DateUtil.format(new Date(), "yyyy-MM-dd");
-            if (StringUtils.isEmpty(endDate)) {
-                endDate = today;
-            }
-            if (StringUtils.isEmpty(startDate)) {
-                startDate = today;
-            }
-            String date1 = String.valueOf(startDate);
-            String date2 = String.valueOf(endDate);
+//            if (StringUtils.isEmpty(endDate)) {
+//                endDate = today;
+//            }
+//            if (StringUtils.isEmpty(startDate)) {
+//                startDate = today;
+//            }
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = dateFormat.parse(today);
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            calendar.add(Calendar.DATE, -2); // 减去两天
+            Date previousDay = calendar.getTime();
+            String date1 = dateFormat.format(previousDay);
+
+            calendar.setTime(date);
+            calendar.add(Calendar.DATE, -1); // 减去一天
+            Date previousDay1 = calendar.getTime();
+            String date2 = dateFormat.format(previousDay1);
             List<String> allDates = getAllDates(date1, date2);
             baseBean.writeLog("UpdateCbxxjlDataJob allDatas:" + allDates);
             RecordSet rs = new RecordSet();
             List<String> userIds = new ArrayList<>();
             if (StringUtils.isEmpty(ryParam) || StringUtils.equals(ryParam, "null")) {
                 baseBean.writeLog("1111.");
-                rs.executeQuery("select id from hrmresource");
+                rs.executeQuery("select id from hrmresource where status in(0,1,2,3)");
                 while (rs.next()) {
                     userIds.add(rs.getString("id"));
                 }