Эх сурвалжийг харах

再修改关于时间查询的时间格式转换函数,字段不转格式

云殇忆 1 жил өмнө
parent
commit
613d5ce3ec

+ 4 - 4
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/DlUserServiceImpl.java

@@ -32,13 +32,13 @@ public class DlUserServiceImpl implements DlUserService {
                 .or()
                 .like("user_telephone",bo.getText());
         if (bo.getStartTime() != null)
-            queryWrapper.apply("STR_TO_DATE(start_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
+            queryWrapper.apply("start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
                 .or()
-                .apply("STR_TO_DATE(end_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+                .apply("end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.apply("STR_TO_DATE(start_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
+            queryWrapper.apply("start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
                 .or()
-                .apply("STR_TO_DATE(end_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+                .apply("end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<DlUser> dlUsers = dlUserMapper.selectList(queryWrapper);
         List<DlUserListVo> vos = new ArrayList<>();
         for (DlUser user : dlUsers){

+ 2 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/GoodsServiceImpl.java

@@ -52,9 +52,9 @@ public class GoodsServiceImpl implements GoodsService {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Goods> queryWrapper = new QueryWrapper<>();
         if (bo.getStartTime() != null)
-            queryWrapper.apply("STR_TO_DATE(create_time,'%Y-%m-%d %H:%i:%s') >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            queryWrapper.apply("create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.apply("STR_TO_DATE(create_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            queryWrapper.apply("create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<GoodsListVo> vos = new ArrayList<>();
         for (Goods goods : goodsMapper.selectList(queryWrapper)) {
             vos.add(new GoodsListVo(goods));

+ 2 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/OrderServiceImpl.java

@@ -37,9 +37,9 @@ public class OrderServiceImpl implements OrderService {
                 .or()
                 .like("commercial_name",bo.getText());
         if (bo.getStartTime() != null)
-            queryWrapper.apply("STR_TO_DATE(create_time,'%Y-%m-%d %H:%i:%s') >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            queryWrapper.apply("create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.apply("STR_TO_DATE(create_time,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            queryWrapper.apply("create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<Order> orders = orderMapper.selectList(queryWrapper);
         return new PageInfo(orders);
     }

+ 10 - 10
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -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){

+ 2 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StatisticsServiceImpl.java

@@ -33,9 +33,9 @@ public class StatisticsServiceImpl implements StatisticsService {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Statistics> queryWrapper = new QueryWrapper<>();
         if (bo.getStartTime() != null)
-            queryWrapper.apply("STR_TO_DATE(`time`,'%Y-%m-%d %H:%i:%s') >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            queryWrapper.apply("`time` >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.apply("STR_TO_DATE(`time`,'%Y-%m-%d %H:%i:%s') <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            queryWrapper.apply("`time` <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<Statistics> list = statisticsMapper.selectList(queryWrapper);
         List<ScanListVo> vos = new ArrayList<>();
         for (Statistics statistics : list){