bug

jiangqs

2023-08-02 bb58e108a9da48d84b84d30b73c01106dd642550

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java

@@ -4,10 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo;
import com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.AgencyTaskService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
@@ -102,6 +99,18 @@
        return R.ok(page.setRecords(merAgencyTaskPageVoList));
    }

    @RequestMapping(value = "/pageMerAgencySimpleTaskRecord", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户代理商简易跟进任务记录列表")
    public R<Page<MerAgencySimpleTaskRecordPageVo>> pageMerAgencySimpleTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
        Long userId = SecurityUtils.getUserId();
        merAgencyTaskPageDto.setUserId(userId);
        Page<MerAgencySimpleTaskRecordPageVo> page = new Page<>();
        page.setSize(merAgencyTaskPageDto.getPageSize());
        page.setCurrent(merAgencyTaskPageDto.getPageNum());
        List<MerAgencySimpleTaskRecordPageVo> merAgencySimpleTaskRecordPageVos = agencyTaskService.pageMerAgencySimpleTaskRecord(page,merAgencyTaskPageDto);
        return R.ok(page.setRecords(merAgencySimpleTaskRecordPageVos));
    }

    @RequestMapping(value = "/pageMerAgencyTaskRecord", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户代理商跟进任务记录列表")
    public R<Page<MerAgencyTaskRecordPageVo>> pageMerAgencyTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {