代码提交

liusheng

2024-09-18 907641e56c2085aaa81f267946dc3e3e9fca73e7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java

@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.ISvyTaskService;
import com.smartor.service.ISvyTaskSingleService;
import io.swagger.annotations.Api;
@@ -39,9 +40,14 @@
public class SvyTaskController extends BaseController {
    @Autowired
    private ISvyTaskService svyTaskService;
//
//    @Autowired
//    private ISvyTaskSingleService iSvyTaskSingleService;

    @Autowired
    private ISvyTaskSingleService iSvyTaskSingleService;
    private IServiceSubtaskService serviceSubtaskService;



    @Value("${pub_key}")
    private String pub_key;
@@ -53,7 +59,7 @@
     * 查询问卷任务（任务）列表
     */
    @ApiOperation("查询问卷任务（任务）列表")
    @PreAuthorize("@ss.hasPermi('system:task:list')")
    //@PreAuthorize("@ss.hasPermi('system:task:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody SvyTask svyTask) {
        PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
@@ -61,9 +67,9 @@
        List<SvyTaskVO> svyTaskVOS = DtoConversionUtils.sourceToTarget(list, SvyTaskVO.class);
        if (CollectionUtils.isNotEmpty(svyTaskVOS)) {
            for (SvyTaskVO svyTaskVO : svyTaskVOS) {
                SvyTaskSingle svyTaskSingle = new SvyTaskSingle();
                svyTaskSingle.setTaskid(svyTaskVO.getTaskid());
                List<SvyTaskSingle> svyTaskSingles = iSvyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
                ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
                serviceSubtaskVO.setTaskid(svyTaskVO.getTaskid());
                List<ServiceSubtask> svyTaskSingles = serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO);
                if (CollectionUtils.isNotEmpty(svyTaskSingles)) {
                    //已发送
                    long yfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
@@ -95,7 +101,7 @@
     * 导出问卷任务（任务）列表
     */
    @ApiOperation("导出问卷任务（任务）列表")
    @PreAuthorize("@ss.hasPermi('system:task:export')")
    //@PreAuthorize("@ss.hasPermi('system:task:export')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SvyTask svyTask) {
@@ -108,7 +114,7 @@
     * 获取问卷任务（任务）详细信息
     */
    @ApiOperation("获取问卷任务（任务）详细信息")
    @PreAuthorize("@ss.hasPermi('system:task:query')")
    //@PreAuthorize("@ss.hasPermi('system:task:query')")
    @GetMapping(value = "/{taskid}")
    public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
        return success(svyTaskService.selectSvyTaskByTaskid(taskid));
@@ -118,7 +124,7 @@
     * 新增问卷任务（任务）
     */
    @ApiOperation("新增问卷任务（任务）")
    @PreAuthorize("@ss.hasPermi('system:task:add')")
    //@PreAuthorize("@ss.hasPermi('system:task:add')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody SvyTask svyTask) {
@@ -129,7 +135,7 @@
     * 修改问卷任务（任务）
     */
    @ApiOperation("修改问卷任务（任务）")
    @PreAuthorize("@ss.hasPermi('system:task:edit')")
    //@PreAuthorize("@ss.hasPermi('system:task:edit')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SvyTask svyTask) {
@@ -140,7 +146,7 @@
     * 删除问卷任务（任务）
     */
    @ApiOperation("删除问卷任务（任务）")
    @PreAuthorize("@ss.hasPermi('system:task:remove')")
    //@PreAuthorize("@ss.hasPermi('system:task:remove')")
    @Log(title = "问卷任务（任务）", businessType = BusinessType.DELETE)
    @GetMapping("/{taskids}")
    public AjaxResult remove(@PathVariable Long[] taskids) {