From afb277a81e060c6275f11e9f9f102b5dcfd80a72 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java | 98 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
index 355329f..ca8e739 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
@@ -1,98 +1,138 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.SvyTask;
+import com.smartor.domain.*;
import com.smartor.service.ISvyTaskService;
+import com.smartor.service.ISvyTaskSingleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.stream.Collectors;
/**
- * 缁煎悎闂嵎浠诲姟锛堜换鍔★級Controller
+ * 闂嵎浠诲姟锛堜换鍔★級Controller
*
* @author ruoyi
* @date 2024-06-12
*/
+@Api(description = " 闂嵎浠诲姟锛堜换鍔★級")
@RestController
@RequestMapping("/smartor/svytask")
-public class SvyTaskController extends BaseController
-{
+public class SvyTaskController extends BaseController {
@Autowired
private ISvyTaskService svyTaskService;
+ @Autowired
+ private ISvyTaskSingleService iSvyTaskSingleService;
/**
- * 鏌ヨ缁煎悎闂嵎浠诲姟锛堜换鍔★級鍒楄〃
+ * 鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
+ @ApiOperation("鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:task:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyTask svyTask)
- {
- startPage();
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyTask svyTask) {
+ PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
- return getDataTable(list);
+ 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);
+ if (CollectionUtils.isNotEmpty(svyTaskSingles)) {
+ //宸插彂閫�
+ long yfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
+ //鏈彂閫�
+ long wfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
+ svyTaskVO.setYfs(yfs);
+ svyTaskVO.setWfs(wfs);
+
+ }
+ }
+ //鑾峰彇total
+ long total = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ svyTask.setPageNum(null);
+ svyTask.setPageSize(null);
+ svyTaskService.selectSvyTaskList(svyTask);
+ }
+ });
+
+ return getDataTable2(total, svyTaskVOS);
+
+ }
+
+ return getDataTable2(0, list);
}
/**
- * 瀵煎嚭缁煎悎闂嵎浠诲姟锛堜换鍔★級鍒楄〃
+ * 瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
+ @ApiOperation("瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:task:export')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyTask svyTask)
- {
+ public void export(HttpServletResponse response, SvyTask svyTask) {
List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
ExcelUtil<SvyTask> util = new ExcelUtil<SvyTask>(SvyTask.class);
util.exportExcel(response, list, "缁煎悎闂嵎浠诲姟锛堜换鍔★級鏁版嵁");
}
/**
- * 鑾峰彇缁煎悎闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅
+ * 鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:task:query')")
@GetMapping(value = "/{taskid}")
- public AjaxResult getInfo(@PathVariable("taskid") Long taskid)
- {
+ public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
return success(svyTaskService.selectSvyTaskByTaskid(taskid));
}
/**
- * 鏂板缁煎悎闂嵎浠诲姟锛堜换鍔★級
+ * 鏂板闂嵎浠诲姟锛堜换鍔★級
*/
+ @ApiOperation("鏂板闂嵎浠诲姟锛堜换鍔★級")
@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SvyTask svyTask)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SvyTask svyTask) {
return toAjax(svyTaskService.insertSvyTask(svyTask));
}
/**
- * 淇敼缁煎悎闂嵎浠诲姟锛堜换鍔★級
+ * 淇敼闂嵎浠诲姟锛堜换鍔★級
*/
+ @ApiOperation("淇敼闂嵎浠诲姟锛堜换鍔★級")
@PreAuthorize("@ss.hasPermi('system:task:edit')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SvyTask svyTask)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SvyTask svyTask) {
return toAjax(svyTaskService.updateSvyTask(svyTask));
}
/**
- * 鍒犻櫎缁煎悎闂嵎浠诲姟锛堜换鍔★級
+ * 鍒犻櫎闂嵎浠诲姟锛堜换鍔★級
*/
+ @ApiOperation("鍒犻櫎闂嵎浠诲姟锛堜换鍔★級")
@PreAuthorize("@ss.hasPermi('system:task:remove')")
- @Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.DELETE)
- @DeleteMapping("/{taskids}")
- public AjaxResult remove(@PathVariable Long[] taskids)
- {
+ @Log(title = "闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.DELETE)
+ @GetMapping("/{taskids}")
+ public AjaxResult remove(@PathVariable Long[] taskids) {
return toAjax(svyTaskService.deleteSvyTaskByTaskids(taskids));
}
}
--
Gitblit v1.9.3