Ver Fonte

修改广告计划时间问题

JensionDzero há 1 ano atrás
pai
commit
78ddbe54fb

+ 5 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/DlUser.java

@@ -12,6 +12,7 @@ import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @Data
 @TableName("dl_user")
@@ -59,11 +60,13 @@ public class DlUser {
         this.startEquipmentId = s.getEquipmentId();
         this.startEquipmentName = s.getEquipmentName();
         this.startEquipmentCode = s.getEquipmentCode();
-        this.startTime = s.getTime();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime parse = LocalDateTime.parse(s.getTime(), dateTimeFormatter);
+        this.startTime = parse;
         this.endEquipmentId = s.getEquipmentId();
         this.endEquipmentName = s.getEquipmentName();
         this.endEquipmentCode = s.getEquipmentCode();
-        this.endTime = s.getTime();
+        this.endTime = parse;
         this.totalPrice = s.getDealToolPrice();
     }
 }

+ 3 - 1
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Order.java

@@ -11,6 +11,7 @@ import com.ruoyi.demo.entity.bo.OrderAddBo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @Data
 @TableName("dl_order")
@@ -75,6 +76,7 @@ public class Order {
         this.commercialName = bo.getCommercialName();
         this.appkey = bo.getAppkey();
         this.appName = bo.getAppName();
-        this.createTime = bo.getCreateTime();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        this.createTime = LocalDateTime.parse(bo.getCreateTime(), dateTimeFormatter);
     }
 }

+ 4 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Plan.java

@@ -16,6 +16,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 
 @Data
 @TableName("dl_plan")
@@ -102,8 +103,9 @@ public class Plan {
         this.setGoodsIntroduce(bo.getGoodsIntroduce());
         this.setGoodsClassify(bo.getGoodsClassify());
         this.setPlanCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
-        this.setPlanStartTime(bo.getPlanStartTime());
-        this.setPlanEndTime(bo.getPlanEndTime());
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        this.setPlanStartTime(LocalDateTime.parse(bo.getPlanStartTime(), dateTimeFormatter));
+        this.setPlanEndTime(LocalDateTime.parse(bo.getPlanEndTime(), dateTimeFormatter));
         this.setState(StateUtil.NOT_AUDITED);
 
         this.setOnState(OnStateUtil.UP);

+ 4 - 1
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Statistics.java

@@ -13,6 +13,7 @@ import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @Data
 @TableName("dl_statistics")
@@ -78,6 +79,8 @@ public class Statistics {
         this.userName = bo.getUserName();
         this.userTelephone = bo.getUserTelephone();
         this.behavior = bo.getBehavior();
-        this.time = bo.getTime();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime parse = LocalDateTime.parse(bo.getTime(), dateTimeFormatter);
+        this.time = parse;
     }
 }

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

@@ -23,15 +23,15 @@ public class OrderAddBo {
     private String goodsName;
     @NotBlank(groups = {AddGroup.class},message = "规格不能为空")
     private String specs;
-    @NotBlank(groups = {AddGroup.class},message = "商品价格不能为空")
+    @NotNull(groups = {AddGroup.class},message = "商品价格不能为空")
     private Float goodsPrice;
-    @NotBlank(groups = {AddGroup.class},message = "订单总金额不能为空")
+    @NotNull(groups = {AddGroup.class},message = "订单总金额不能为空")
     private Float totalPrice;
     @NotBlank(groups = {AddGroup.class},message = "交易状态不能为空")
     private String state;
     @NotBlank(groups = {AddGroup.class},message = "客户Id不能为空")
     private String userId;
-    @NotBlank(groups = {AddGroup.class},message = "客户名不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "客户名不能为空")
     private String userName;
     @NotBlank(groups = {AddGroup.class},message = "客户联系方式不能为空")
     private String userTelephone;
@@ -44,7 +44,7 @@ public class OrderAddBo {
     @NotBlank(groups = {AddGroup.class},message = "小程序名称不能为空")
     private String appName;
     @NotNull(groups = {AddGroup.class},message = "订单成交时间不能为空")
-    private LocalDateTime createTime;
+    private String createTime;
     @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
     private String sign;
 }

+ 4 - 4
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/PlanAddBo.java

@@ -41,10 +41,10 @@ public class PlanAddBo {
     @NotBlank(groups = {AddGroup.class},message = "负责人联系方式不能为空")
     private String principalTelephone;
 
-    @NotNull(groups = {AddGroup.class},message = "计划开始时间不能为空")
-    private LocalDateTime planStartTime;
-    @NotNull(groups = {AddGroup.class},message = "计划结束时间不能为空")
-    private LocalDateTime planEndTime;
+    @NotBlank(groups = {AddGroup.class},message = "计划开始时间不能为空")
+    private String planStartTime;
+    @NotBlank(groups = {AddGroup.class},message = "计划结束时间不能为空")
+    private String planEndTime;
     @NotNull(groups = {AddGroup.class},message = "设备不能为空")
     private List<PlanItemAddBo> items;
     @NotBlank(groups = {AddGroup.class},message = "签名不能为空")

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

@@ -14,36 +14,36 @@ public class StatisticsAddBo {
     @NotBlank(groups = {AddGroup.class},message = "计划名称不能为空")
     private String planName;
 
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "appkey不能为空")
     private String appkey;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "设备Id不能为空")
     private String equipmentId;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "设备名称不能为空")
     private String equipmentName;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "设备编号不能为空")
     private String equipmentCode;
 
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "地址信息不能为空")
     private String addrInfo;
 
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "商品Id不能为空")
     private String goodsId;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "商品名称不能为空")
     private String goodsName;
-    @NotNull(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotNull(groups = {AddGroup.class},message = "交易总数不能为空")
     private Integer dealToolCount;
-    @NotNull(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotNull(groups = {AddGroup.class},message = "交易总金额不能为空")
     private Float dealToolPrice;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "客户Id不能为空")
     private String userId;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "客户姓名不能为空")
     private String userName;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotBlank(groups = {AddGroup.class},message = "客户联系方式不能为空")
     private String userTelephone;
-    @NotNull(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotNull(groups = {AddGroup.class},message = "行为不能为空")
     private Integer behavior;
-    @NotNull(groups = {AddGroup.class},message = "订单编号不能为空")
-    private LocalDateTime time;
-    @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
+    @NotNull(groups = {AddGroup.class},message = "交易时间不能为空")
+    private String time;
+    @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
     private String sign;
 }