1.修改审核意见不必填

2.将明细中缺少的字段补齐
3.修改时间搜索范围
4.将扫码时间分布返回类型改为指定对象的数组

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/StatisticsController.java

@@ -19,7 +19,7 @@ public class StatisticsController {
     // 扫码时间分布
     @GetMapping("/timeDis")
     public R timeDis(String option){
-        return R.ok(statisticsService.getTimeDis(option));
+        return R.ok(statisticsService.getTimeDisToVo(option));
     }
 
     // 获取扫描日志

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/PlanAudit.java

@@ -42,7 +42,12 @@ public class PlanAudit {
         this.setUserId(userId);
         this.userName = userName;
         this.setState(bo.getState());
-        this.setAuditComment(bo.getAuditComment());
+//        this.setAuditComment(bo.getAuditComment());
+        if (bo.getState() == 1)
+            this.setAuditComment("审核通过");
+        else if (bo.getState() == 0)
+            this.setAuditComment("未进行审核");
+        else this.setAuditComment("审核不通过");
         this.setAuditTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
     }
 }

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

@@ -21,7 +21,7 @@ public class PlanBo {
     private String goods;
     private String planId;
     private List<String> planIds;
-    private String auditComment;
+//    private String auditComment;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)

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

@@ -18,6 +18,7 @@ public class PlanManageDetailVo {
     private String appName;
     private String goodsName;
     private String goodsImg;
+    private Float goodsPrice;
     private String goodsLogo;
     private String commercialName;
     private String state;
@@ -33,6 +34,7 @@ public class PlanManageDetailVo {
         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.state = StateUtil.getStateName(plan.getState());

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

@@ -0,0 +1,11 @@
+package com.ruoyi.demo.entity.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TimeAndCountVo {
+    private String time;
+    private Integer count;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/StatisticsService.java

@@ -6,6 +6,7 @@ import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import com.ruoyi.demo.entity.vo.PlanHomeVo;
 import com.ruoyi.demo.entity.vo.ScanListVo;
+import com.ruoyi.demo.entity.vo.TimeAndCountVo;
 
 import java.util.List;
 import java.util.Map;
@@ -18,4 +19,5 @@ public interface StatisticsService {
     int add(StatisticsAddBo bo);
 
     Map<String,Integer> getTimeDis(String option);
+    List<TimeAndCountVo> getTimeDisToVo(String option);
 }

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

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

@@ -163,6 +163,7 @@ public class PlanServiceImpl implements PlanService {
             return -1;
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",plan.getAppkey());
+        appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         plan.setState(bo.getState());
         int i = planMapper.updateById(plan);
@@ -174,7 +175,9 @@ public class PlanServiceImpl implements PlanService {
         if (insert == 1){
             CallBackBean callBackBean = new CallBackBean();
             callBackBean.setAuditPerson(userName);
-            callBackBean.setAuditComment(bo.getAuditComment());
+            if (bo.getState() == 1)
+                callBackBean.setAuditComment("审核通过");
+            else callBackBean.setAuditComment("审核不通过");
             callBackBean.setAuditTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
             SendCallBackUtil.sendCallBack(app.getCallBack(),callBackBean);
         }
@@ -185,11 +188,16 @@ public class PlanServiceImpl implements PlanService {
     public PageInfo<List<PlanListVo>> getPlanList(PlanBo bo) {
         PageHelper.startPage(bo.getPageNum(), bo.getPageSize(),true);
         QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
-        if (bo.getText() != null){
-            planQueryWrapper.like("plan_id",bo.getText())
-                .or()
-                .like("goods_name",bo.getText());
-        }
+        if (bo.getText() != null)
+            planQueryWrapper.and(planQueryWrapper1 -> {
+                planQueryWrapper1.like("plan_id",bo.getText())
+                    .or()
+                    .like("plan_name",bo.getText())
+                    .or()
+                    .like("principal_name",bo.getText())
+                    .or()
+                    .like("principal_telephone",bo.getText());
+            });
         planQueryWrapper.eq("state", StateUtil.APPROVED);
         planQueryWrapper.eq("deleted","0");
         List<Plan> plans = planMapper.selectList(planQueryWrapper);
@@ -293,9 +301,17 @@ public class PlanServiceImpl implements PlanService {
                     .like("commercial_name",bo.getText());
             });
         if (bo.getStartTime() != null)
-            planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            planQueryWrapper.and(planQueryWrapper1 -> {
+                planQueryWrapper1.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
+                    .or()
+                    .apply("plan_create_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.and(planQueryWrapper1 -> {
+                planQueryWrapper1.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
+                    .or()
+                    .like("plan_create_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<>();
@@ -351,9 +367,17 @@ public class PlanServiceImpl implements PlanService {
                     .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.and(planQueryWrapper1 -> {
+                planQueryWrapper1.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
+                    .or()
+                    .apply("plan_create_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.and(planQueryWrapper1 -> {
+                planQueryWrapper1.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
+                    .or()
+                    .like("plan_create_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

@@ -9,6 +9,7 @@ import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import com.ruoyi.demo.entity.vo.PlanHomeVo;
 import com.ruoyi.demo.entity.vo.ScanListVo;
+import com.ruoyi.demo.entity.vo.TimeAndCountVo;
 import com.ruoyi.demo.mapper.*;
 import com.ruoyi.demo.service.StatisticsService;
 import com.ruoyi.demo.utils.SignUtil;
@@ -126,24 +127,49 @@ public class StatisticsServiceImpl implements StatisticsService {
     public Map<String, Integer> getTimeDis(String option) {
         Map<String, Integer> map = new LinkedHashMap<>();
         if (option.equals("day")){
-            List<String> days = new ArrayList<>();
-            for (int i=0;i<30;i++)
-                days.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-            for (String day : days)
+            for (int i=0;i<30;i++){
+                String day = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                 map.put(day,statisticsMapper.selectTimeDisByDay(day));
+            }
         } else if (option.equals("year")){
-            List<String> years = new ArrayList<>();
-            for (int i=0;i<12;i++)
-                years.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")));
-            for (String year : years)
+            for (int i=0;i<12;i++){
+                String year = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy"));
                 map.put(year,statisticsMapper.selectTimeDisByYear(year));
+            }
         } else {
-            List<String> months = new ArrayList<>();
-            for (int i=0;i<12;i++)
-                months.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
-            for (String month : months)
+            for (int i=0;i<12;i++){
+                String month = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM"));
                 map.put(month,statisticsMapper.selectTimeDisByMonth(month));
+            }
         }
         return map;
     }
+
+    @Override
+    public List<TimeAndCountVo> getTimeDisToVo(String option) {
+        List<TimeAndCountVo> vos = new ArrayList<>();
+        if (option.equals("day")){
+            for (int i=0;i<30;i++){
+                TimeAndCountVo vo = new TimeAndCountVo();
+                vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                vo.setCount(statisticsMapper.selectTimeDisByDay(vo.getTime()));
+                vos.add(vo);
+            }
+        } else if (option.equals("year")){
+            for (int i=0;i<12;i++){
+                TimeAndCountVo vo = new TimeAndCountVo();
+                vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")));
+                vo.setCount(statisticsMapper.selectTimeDisByYear(vo.getTime()));
+                vos.add(vo);
+            }
+        } else {
+            for (int i=0;i<12;i++){
+                TimeAndCountVo vo = new TimeAndCountVo();
+                vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
+                vo.setCount(statisticsMapper.selectTimeDisByMonth(vo.getTime()));
+                vos.add(vo);
+            }
+        }
+        return vos;
+    }
 }