恢复人员状态bug修复

mjava-yibaoju/src/main/java/com/malk/yibaoju/controller/YBJController.java

@@ -168,15 +168,18 @@ public class YBJController {
             //通过护理对象CID获取护理计划实例ID
             YDParam ydParam = YDParam.builder()
                     .formUuid("FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2")
-                    .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lroced8x",data.get("cId"))))
+                    .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lnyhv5tn",data.get("cId"))))
                     .build();
             List<Map> dataList = (List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
             if(dataList.size()>0){
-                Map map = (Map) dataList.get(0);
-                ybjService.creatInfo(map.get("formInstanceId").toString());
+                Map map = dataList.get(0);
+                log.info("护理计划安排信息：{}",map);
+                ybjService.thisMonthDataBase(map.get("formInstanceId").toString());
+//                ybjService.creatInfo(map.get("formInstanceId").toString());
                 if (dayOfMonth>24){
                     Thread.sleep(2000);
-                    ybjService.creatNextInfo(map.get("formInstanceId").toString());
+//                    ybjService.creatNextInfo(map.get("formInstanceId").toString());
+                    ybjService.insertDatabaseNextMonth(map.get("formInstanceId").toString());
                 }
             }
         }else{   //编辑护理对象信息

mjava-yibaoju/src/main/java/com/malk/yibaoju/service/impl/YBJServiceImpl.java

@@ -1219,16 +1219,15 @@ public class YBJServiceImpl implements YBJService {
      */
     @Override
     public void databaseToYiDaTask() {
-        List<String> dataMonths = new ArrayList<>();
-        dataMonths.add(dataMonth);
-        dataMonths.add(nextDataMonth);
+        LocalDate currentDate = LocalDate.now();
+        // 数据库当月数据日期
+        String dataMonth = currentDate.getYear() +"-"+ String.format("%02d", currentDate.getMonthValue());
         Connection connection = null;
         PreparedStatement ps = null;
         log.info("开始执行数据库更新到宜搭护理计划");
         ArrayList<Integer> ids = new ArrayList<>();
-        for (int j = 0; j < dataMonths.size(); j++) {
             int times = 0;
-            String formId = getFormId(dataMonths.get(j));
+            String formId = getFormId(dataMonth);
             try {
                 Class.forName(driver);
                 connection = DriverManager.getConnection(url, username, password);
@@ -1239,7 +1238,7 @@ public class YBJServiceImpl implements YBJService {
                         "`care_date_text`,`start_time_text`,`end_time_text`,`sign_in_photo`, `sign_in_photo_down`, `sign_in_photo_name`, `sign_out_photo`, " +
                         "`sign_out_photo_down`, `sign_out_photo_name`, `sign_in_longitude`, `sign_in_latitude`, `sign_in_time`, `sign_in_position`, " +
                         "`sign_out_longitude`, `sign_out_latitude`, `sign_out_time`, `sign_out_position`, `sign_in_distance`, `sign_out_distance` " +
-                        "FROM `yida_plan_details` where  data_month = '" + dataMonths.get(j) + "' AND is_cogradient = '否' AND care_date_text > '2024-12-31' " +
+                        "FROM `yida_plan_details` where  data_month >= '" + dataMonth + "' AND is_cogradient = '否' AND care_date_text > '2024-12-31' " +
                         "AND is_delete = '0' ORDER BY care_date_text ASC,id ASC LIMIT 400";
                 ps = connection.prepareStatement(selectSql);
                 ResultSet rs = ps.executeQuery(selectSql);
@@ -1327,7 +1326,6 @@ public class YBJServiceImpl implements YBJService {
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
-        }
     }
 
     /**