Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanDetailVo.java

@@ -1,8 +1,11 @@
 package com.ruoyi.demo.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.demo.entity.Plan;
+import com.ruoyi.demo.utils.OnStateUtil;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 // 广告计划明细
@@ -15,6 +18,13 @@ public class PlanDetailVo {
     private String appName;
     private String principalName;
     private String principalTelephone;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date planCreateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date planStartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date planEndTime;
+    private String onState;
     private List<PlanItemVo> planItems;
 
     public PlanDetailVo(){}
@@ -26,6 +36,10 @@ public class PlanDetailVo {
         this.appName = plan.getAppName();
         this.principalName = plan.getPrincipalName();
         this.principalTelephone = plan.getPrincipalTelephone();
+        this.planCreateTime = plan.getPlanCreateTime();
+        this.planStartTime = plan.getPlanStartTime();
+        this.planEndTime = plan.getPlanEndTime();
+        this.onState = OnStateUtil.getOnStateChar(plan.getOnState());
         this.planItems = itemVos;
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanManageDetailVo.java

@@ -12,12 +12,19 @@ import java.util.List;
 @Data
 public class PlanManageDetailVo {
     private String planId;
+    private String planName;
     private String appName;
     private String goodsName;
     private String goodsImg;
     private BigDecimal goodsPrice;
     private String goodsLogo;
     private String commercialName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date planStartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date planEndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date auditTime;
     private String state;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planCreateTime;
@@ -26,12 +33,16 @@ public class PlanManageDetailVo {
     public PlanManageDetailVo(){}
     public PlanManageDetailVo(Plan plan, List<PlanManageItemVo> itemVos){
         this.planId = plan.getPlanId();
+        this.planName = plan.getPlanName();
         this.appName = plan.getAppName();
         this.goodsName = plan.getGoodsName();
         this.goodsImg = plan.getGoodsImg();
         this.goodsPrice = plan.getGoodsPrice();
         this.goodsLogo = plan.getGoodsLogo();
         this.commercialName = plan.getCommercialName();
+        this.planStartTime = plan.getPlanStartTime();
+        this.planEndTime = plan.getPlanEndTime();
+        this.auditTime = plan.getAuditTime();
         this.state = StateUtil.getStateName(plan.getState());
         this.planCreateTime = plan.getPlanCreateTime();
         this.planItems = itemVos;