|
@@ -193,8 +193,8 @@ public class PlanServiceImpl implements PlanService {
|
|
|
List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
|
|
|
for (PlanItem item : items){
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_start_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_end_time,'%Y-%m-%d %H:%i:%s') > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ planQueryWrapper.apply("plan_end_time > STR_TO_DATE({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");
|
|
@@ -215,8 +215,8 @@ public class PlanServiceImpl implements PlanService {
|
|
|
for (PlanItem item : items){
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
planQueryWrapper.eq("plan_id",item.getPlanId());
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_start_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_end_time,'%Y-%m-%d %H:%i:%s') > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
planQueryWrapper.eq("state",1);
|
|
|
planQueryWrapper.eq("deleted","0");
|
|
|
Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
@@ -252,9 +252,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
.or()
|
|
|
.like("principal_telephone",bo.getText());
|
|
|
if (bo.getStartTime() != null)
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_start_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_end_time,'%Y-%m-%d %H:%i:%s') > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
+ planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
planQueryWrapper.eq("deleted","0");
|
|
|
List<Plan> plans = planMapper.selectList(planQueryWrapper);
|
|
|
List<PlanManageListVo> vos = new ArrayList<>();
|
|
@@ -305,9 +305,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
.or()
|
|
|
.like("principal_telephone",bo.getText());
|
|
|
if (bo.getStartTime() != null)
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_start_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- planQueryWrapper.apply("STR_TO_DATE(plan_end_time,'%Y-%m-%d %H:%i:%s') > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
+ planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
planQueryWrapper.eq("deleted","0");
|
|
|
List<Plan> plans = planMapper.selectList(planQueryWrapper);
|
|
|
List<PlanPushListVo> vos = new ArrayList<>();
|
|
@@ -333,9 +333,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
.or()
|
|
|
.like("equipment_name",bo.getText());
|
|
|
if (bo.getStartTime() != null)
|
|
|
- statisticsQueryWrapper.apply("STR_TO_DATE(laster_time,'%Y-%m-%d %H:%i:%s') >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ statisticsQueryWrapper.apply("laster_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- statisticsQueryWrapper.apply("STR_TO_DATE(laster_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
+ statisticsQueryWrapper.apply("laster_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
List<PlanPushStatistics> list = planPushStatisticsMapper.selectList(statisticsQueryWrapper);
|
|
|
List<PlanPushStatisticsListVo> vos = new ArrayList<>();
|
|
|
for (PlanPushStatistics statistics : list){
|