修改时间和时间查询

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/OrderAddBo.java

@@ -44,7 +44,7 @@ public class OrderAddBo {
     @NotBlank(groups = {AddGroup.class},message = "小程序名称不能为空")
     private String appName;
     @NotNull(groups = {AddGroup.class},message = "订单成交时间不能为空")
-    private String createTime;
+    private LocalDateTime createTime;
     @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
     private String sign;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/PlanItemBo.java

@@ -60,7 +60,7 @@ public class PlanItemBo {
         this.goodsIntroduce = plan.getGoodsIntroduce();
         this.goodsPrice = plan.getGoodsPrice();
         this.goodsClassify = plan.getGoodsClassify();
-        //this.planCreateTime = plan.getPlanCreateTime();
+        this.planCreateTime = plan.getPlanCreateTime();
         this.planStartTime = plan.getPlanStartTime();
         this.planEndTime = plan.getPlanEndTime();
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/StatisticsAddBo.java

@@ -43,7 +43,7 @@ public class StatisticsAddBo {
     @NotNull(groups = {AddGroup.class},message = "行为不能为空")
     private Integer behavior;
     @NotNull(groups = {AddGroup.class},message = "交易时间不能为空")
-    private String time;
+    private LocalDateTime time;
     @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
     private String sign;
 }

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

@@ -32,13 +32,9 @@ public class DlUserServiceImpl implements DlUserService {
                 .or()
                 .like("user_telephone",bo.getText());
         if (bo.getStartTime() != null)
-            queryWrapper.apply("start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
-                .or()
-                .apply("end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            queryWrapper.apply("end_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.apply("start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
-                .or()
-                .apply("end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            queryWrapper.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){

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

@@ -335,9 +335,9 @@ public class PlanServiceImpl implements PlanService {
                 .or()
                 .like("principal_telephone",bo.getText());
         if (bo.getStartTime() != null)
-            planQueryWrapper.apply("plan_start_time <= 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("plan_end_time > 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<>();

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

@@ -126,9 +126,7 @@ public class StatisticsServiceImpl implements StatisticsService {
             user.setEndEquipmentId(bo.getEquipmentId());
             user.setEndEquipmentName(bo.getEquipmentName());
             user.setEndEquipmentCode(bo.getEquipmentCode());
-            DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDateTime parse = LocalDateTime.parse(bo.getTime(), dateTimeFormatter);
-            user.setEndTime(parse);
+            user.setEndTime(bo.getTime());
             user.setTotalPrice(user.getTotalPrice() + bo.getDealToolPrice());
             dlUserMapper.update(user,userQueryWrapper);
         }