From 6b34c3ba5cf27dd8693e2bd23426fe96fefd9688 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 七月 2023 23:42:35 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
index 445e4a5..c4848ff 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -48,8 +48,8 @@
*/
@Override
public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
- String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
- merAgencyTaskPageDto.setNowDay(nowDay);
+ /*String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
+ merAgencyTaskPageDto.setNowDay(nowDay);*/
List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
return merAgencyTaskPageVoList;
}
@@ -63,9 +63,17 @@
AgencyTask agencyTask = new AgencyTask();
String taskId = IdUtils.simpleUUID();
+ String nowTimeStr = DateUtils.getDate();
agencyTask.setTaskId(taskId);
agencyTask.setDelFlag(0);
- agencyTask.setTaskStatus(0);
+ int i = merCreateAgencyTaskDto.getTaskDate().compareTo(nowTimeStr);
+ if(i>0){
+ agencyTask.setTaskStatus(0);
+ }else if(i==0){
+ agencyTask.setTaskStatus(1);
+ }else{
+ agencyTask.setTaskStatus(3);
+ }
agencyTask.setShopId(merCreateAgencyTaskDto.getShopId());
agencyTask.setAgencyId(merCreateAgencyTaskDto.getAgencyId());
agencyTask.setTaskDate(merCreateAgencyTaskDto.getTaskDate());
@@ -126,7 +134,7 @@
}
}
if(StringUtils.isNotBlank(video)){
- strArr = picture.split(",");
+ strArr = video.split(",");
for(String str : strArr){
taskFile = new TaskFile();
taskFile.setDelFlag(0);
@@ -139,7 +147,7 @@
}
}
if(StringUtils.isNotBlank(audio)){
- strArr = picture.split(",");
+ strArr = audio.split(",");
for(String str : strArr){
taskFile = new TaskFile();
taskFile.setDelFlag(0);
--
Gitblit v1.7.1