bug

jiangqs

2023-08-02 bb58e108a9da48d84b84d30b73c01106dd642550

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java

@@ -10,6 +10,7 @@
import com.ruoyi.shop.domain.dto.MerFollowAgencyTaskDto;
import com.ruoyi.shop.domain.dto.MerFollowPhoneDto;
import com.ruoyi.shop.domain.pojo.task.*;
import com.ruoyi.shop.domain.vo.MerAgencySimpleTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo;
import com.ruoyi.shop.mapper.task.AgencyTaskMapper;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
@@ -48,10 +49,23 @@
     */
    @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;
    }

    /**
     * @description
     * @author  jqs
     * @date    2023/8/1 18:16
     * @param page
     * @param merAgencyTaskPageDto
     * @return  List<MerAgencySimpleTaskRecordPageVo>
     */
    @Override
    public List<MerAgencySimpleTaskRecordPageVo>pageMerAgencySimpleTaskRecord(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
        return agencyTaskMapper.pageMerAgencySimpleTaskRecord(page, merAgencyTaskPageDto);
    }

    /**
@@ -63,13 +77,22 @@

        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());
        agencyTask.setTaskContent(merCreateAgencyTaskDto.getTaskContent());
        agencyTask.setEmergencyState(merCreateAgencyTaskDto.getEmergencyState());
        agencyTask.setCreateTime(new Date());
        this.saveOrUpdate(agencyTask);
    }
@@ -126,7 +149,7 @@
                }
            }
            if(StringUtils.isNotBlank(video)){
                strArr = picture.split(",");
                strArr = video.split(",");
                for(String str : strArr){
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -139,7 +162,7 @@
                }
            }
            if(StringUtils.isNotBlank(audio)){
                strArr = picture.split(",");
                strArr = audio.split(",");
                for(String str : strArr){
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -161,7 +184,16 @@
            agencyTask.setAgencyId(oldAgencyTask.getAgencyId());
            agencyTask.setTaskDate(merFollowAgencyTaskDto.getNextTaskDate());
            agencyTask.setTaskContent(merFollowAgencyTaskDto.getNextTaskContent());
            agencyTask.setTaskStatus(2);
            agencyTask.setEmergencyState(merFollowAgencyTaskDto.getEmergencyState());
            String nowTimeStr = DateUtils.getDate();
            int i = merFollowAgencyTaskDto.getNextTaskDate().compareTo(nowTimeStr);
            if(i>0){
                agencyTask.setTaskStatus(0);
            }else if(i==0){
                agencyTask.setTaskStatus(1);
            }else{
                agencyTask.setTaskStatus(3);
            }
            agencyTask.setCreateTime(new Date());
            this.saveOrUpdate(agencyTask);
        }