|
@@ -39,6 +39,7 @@ import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
import java.time.format.TextStyle;
|
|
import java.time.format.TextStyle;
|
|
import java.time.temporal.TemporalAdjusters;
|
|
import java.time.temporal.TemporalAdjusters;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -1197,8 +1198,8 @@ public class YBJServiceImpl implements YBJService {
|
|
long now = new Date().getTime();
|
|
long now = new Date().getTime();
|
|
Plan plan = new Plan();
|
|
Plan plan = new Plan();
|
|
Map formData = ydClient.queryData(YDParam.builder()
|
|
Map formData = ydClient.queryData(YDParam.builder()
|
|
- .appType("APP_ERBDTFS82HOVBPL3NFH0")
|
|
|
|
- .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
|
|
|
|
|
|
+// .appType("APP_ERBDTFS82HOVBPL3NFH0")
|
|
|
|
+// .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
|
|
.formInstanceId(formInstId)
|
|
.formInstanceId(formInstId)
|
|
.build(),
|
|
.build(),
|
|
YDConf.FORM_QUERY.retrieve_id).getFormData();
|
|
YDConf.FORM_QUERY.retrieve_id).getFormData();
|
|
@@ -1335,14 +1336,16 @@ public class YBJServiceImpl implements YBJService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public void deleteDatabaseInfo(String formInstId) {
|
|
public void deleteDatabaseInfo(String formInstId) {
|
|
-
|
|
|
|
|
|
+ LocalDate now = LocalDate.now();
|
|
|
|
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
|
+ String format = dateTimeFormatter.format(now);
|
|
log.info("开始逻辑删除下月数据库护理计划");
|
|
log.info("开始逻辑删除下月数据库护理计划");
|
|
try {
|
|
try {
|
|
Class.forName(driver);
|
|
Class.forName(driver);
|
|
Connection connection = DriverManager.getConnection(url, username, password);
|
|
Connection connection = DriverManager.getConnection(url, username, password);
|
|
PreparedStatement ps = null;
|
|
PreparedStatement ps = null;
|
|
// String deleteSql = "DELETE FROM`yida_plan_details` where data_month in ('" + dataMonth + "','"+nextDataMonth+"') AND form_inst_id = '"+formInstId+"' AND task_status = '待上报'";
|
|
// String deleteSql = "DELETE FROM`yida_plan_details` where data_month in ('" + dataMonth + "','"+nextDataMonth+"') AND form_inst_id = '"+formInstId+"' AND task_status = '待上报'";
|
|
- String deleteSql = "UPDATE `yida_plan_details` SET is_delete = 1 where data_month in ('" + dataMonth + "','"+nextDataMonth+"') AND form_inst_id = '"+formInstId+"' AND task_status = '待上报'";
|
|
|
|
|
|
+ String deleteSql = "UPDATE `yida_plan_details` SET is_delete = 1 where care_date_text >= '" + format + "' AND form_inst_id = '" + formInstId + "' AND task_status = '待上报'";
|
|
ps = connection.prepareStatement(deleteSql);
|
|
ps = connection.prepareStatement(deleteSql);
|
|
ps.executeUpdate(deleteSql);
|
|
ps.executeUpdate(deleteSql);
|
|
|
|
|
|
@@ -1405,12 +1408,8 @@ public class YBJServiceImpl implements YBJService {
|
|
//获取当前日期是本月几号
|
|
//获取当前日期是本月几号
|
|
LocalDateTime now = LocalDateTime.now();
|
|
LocalDateTime now = LocalDateTime.now();
|
|
int dayOfMonth = now.getDayOfMonth();
|
|
int dayOfMonth = now.getDayOfMonth();
|
|
-// log.info("currentDate:{}",currentDate);
|
|
|
|
- log.info("now:{}",now);
|
|
|
|
- log.info("dayOfMonth:{}",dayOfMonth);
|
|
|
|
//获取本月天数
|
|
//获取本月天数
|
|
int daysInMonth = now.toLocalDate().lengthOfMonth();
|
|
int daysInMonth = now.toLocalDate().lengthOfMonth();
|
|
- log.info("daysInMonth:{}",daysInMonth);
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
Class.forName(driver);
|
|
Class.forName(driver);
|