|
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.time.ZoneId;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -138,7 +139,7 @@ public class PlanServiceImpl implements PlanService {
|
|
|
CallBackBean callBackBean = new CallBackBean();
|
|
|
callBackBean.setAuditPerson(userName);
|
|
|
callBackBean.setAuditComment(bo.getAuditComment());
|
|
|
- callBackBean.setAuditTime(LocalDateTime.now());
|
|
|
+ callBackBean.setAuditTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
SendCallBackUtil.sendCallBack(app.getCallBack(),callBackBean);
|
|
|
}
|
|
|
return insert;
|
|
@@ -193,8 +194,8 @@ public class PlanServiceImpl implements PlanService {
|
|
|
List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
|
|
|
for (PlanItem item : items){
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.apply("DATE_FORMAT(plan_start_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now());
|
|
|
- planQueryWrapper.apply("DATE_FORMAT(plan_end_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now());
|
|
|
+ planQueryWrapper.apply("DATE_FORMAT(plan_start_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ planQueryWrapper.apply("DATE_FORMAT(plan_end_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
planQueryWrapper.eq("plan_id",item.getPlanId());
|
|
|
planQueryWrapper.eq("state",1);
|
|
|
planQueryWrapper.eq("deleted","0");
|