From c00d0d3bc399b6648145dfd955cedbea90f5f99d Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 18 六月 2023 17:38:22 +0800
Subject: [PATCH] 看板

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 53ae5b0..f7eefd8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.shop.service.impl.task;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -12,9 +13,12 @@
 import com.ruoyi.shop.service.task.ShopTaskRecordService;
 import com.ruoyi.shop.service.task.ShopTaskService;
 import com.ruoyi.shop.service.task.TaskFileService;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -52,10 +56,11 @@
         shopTask.setDelFlag(0);
         shopTask.setShopId(mgtFollowShopTaskDto.getShopId());
         shopTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
-        shopTask.setNextFollowDate(DateUtils.getDate());
+        shopTask.setNextFollowDate(DateUtils.toDate(LocalDate.now()));
         shopTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
         shopTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
         shopTask.setCreateTime(new Date());
+        shopTask.setTaskDate(DateUtils.toDate(LocalDate.now()));
         this.saveOrUpdate(shopTask);
         //创建任务记录
         ShopTaskRecord shopTaskRecord = new ShopTaskRecord();
@@ -89,12 +94,34 @@
         shopNextTask.setDelFlag(0);
         shopNextTask.setShopId(mgtFollowShopTaskDto.getShopId());
         shopNextTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
-        shopNextTask.setNextFollowDate(mgtFollowShopTaskDto.getNextTaskDate());
         shopNextTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
         shopNextTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
         shopNextTask.setCreateTime(new Date());
+        try {
+            shopNextTask.setNextFollowDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
+            shopNextTask.setTaskDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
         this.saveOrUpdate(shopNextTask);
     }
 
-
+    /**
+     * @description boardTaskTotal
+     * @param
+     * @return MgtBulletinBoardVo
+     * @author jqs34
+     * @date 2023/6/18 17:08
+     */
+    @Override
+    public MgtBulletinBoardVo boardTaskTotal(){
+        MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
+        LambdaQueryWrapper<ShopTask> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(ShopTask::getDelFlag,0);
+        queryWrapper.eq(ShopTask::getTaskStatus,1);
+        queryWrapper.eq(ShopTask::getTaskDate,DateUtils.getDate());
+        Integer followShopToday = this.count(queryWrapper);
+        mgtBulletinBoardVo.setFollowShopToday(followShopToday);
+        return mgtBulletinBoardVo;
+    }
 }

--
Gitblit v1.7.1