From f55c563e2a0b52e4569ce6b5f81632cac598f7fe Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 30 十月 2024 18:36:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 5faa0b4..064bc94 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -1,5 +1,6 @@
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;
@@ -11,7 +12,9 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
+import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -24,6 +27,7 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級Controller
@@ -39,25 +43,53 @@
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+ @Autowired
+ private IServiceSubtaskRecordService serviceSubtaskRecordService;
+
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:taskcall:list')")
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@PostMapping("/patItem")
- public TableDataInfo patItem(@RequestBody ServiceSubtask ivrTaskcall) {
- PageUtils.startPageByPost(ivrTaskcall.getPageNum(), ivrTaskcall.getPageSize());
- return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
+ public TableDataInfo patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ List<ServiceSubtask> serviceSubtaskList = null;
+ if (serviceSubtaskVO != null) {
+ PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
+ }
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
+ }
+ Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
+ map.put("serviceSubtaskList", serviceSubtaskList);
+ List<Map<String, Object>> list = new ArrayList<>();
+ list.add(map);
+ //鑾峰彇total
+ long total = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ serviceSubtaskVO.setPageNum(null);
+ serviceSubtaskVO.setPageSize(null);
+ serviceSubtaskService.patItem(serviceSubtaskVO);
+ }
+ });
+ return getDataTable2(total, list);
+// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
}
/**
* 瀵煎嚭鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:taskcall:export')")
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServiceSubtask ivrTaskcall) {
- List<ServiceSubtask> list = serviceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+ public void export(HttpServletResponse response, ServiceSubtask serviceSubtask) {
+ ServiceSubtaskVO serviceSubtaskVO = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtaskVO.class);
+ List<ServiceSubtask> list = serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO);
ExcelUtil<ServiceSubtask> util = new ExcelUtil<ServiceSubtask>(ServiceSubtask.class);
util.exportExcel(response, list, "鍗曚竴浠诲姟锛堥殢璁匡級鏁版嵁");
}
@@ -65,7 +97,7 @@
/**
* 鑾峰彇鍗曚竴浠诲姟锛堥殢璁匡級璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:taskcall:query')")
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceSubtaskService.selectServiceSubtaskById(id));
@@ -75,7 +107,7 @@
* 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟
*/
@ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟")
- @PreAuthorize("@ss.hasPermi('system:task:add')")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
@PostMapping("/insertOrUpdateTask")
public AjaxResult insertOrUpdateHeTask(@RequestBody ServiceTaskVO ivrTaskVO) {
@@ -83,7 +115,13 @@
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
ivrTaskVO.setCreateBy(user.getNickName());
- return toAjax(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
+ return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
+ }
+
+ @ApiOperation("淇敼瀛愪换鍔�")
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) {
+ return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
}
/**
@@ -93,8 +131,8 @@
@PostMapping("/queryTaskByCondition")
public AjaxResult queryTaskByCondition(@RequestBody ServiceSubtaskVO ivrTaskcallVO) {
//鏍规嵁鍏ュ弬鏌ヨ淇℃伅
- ServiceSubtask ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, ServiceSubtask.class);
- ServiceTaskVO ivrTaskVO = serviceSubtaskService.queryTaskByCondition(ivrTaskcall);
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, ServiceSubtask.class);
+ ServiceTaskVO ivrTaskVO = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
return success(ivrTaskVO);
}
@@ -117,7 +155,7 @@
}
/**
- * 鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划)
+ * 鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划)
*/
@ApiOperation("鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划)")
@PostMapping("/taskPull")
@@ -143,7 +181,17 @@
@ApiOperation("閫氳瘽璁板綍鍥炶皟")
@PostMapping("/recordAccept")
public AjaxResult recordAccept(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
- return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+// return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+ return success();
+ }
+
+ /**
+ * 鑾峰彇姣忎釜鏈堢殑闅忚銆佸璇婇噺
+ */
+ @ApiOperation("鑾峰彇姣忎釜鏈堢殑闅忚銆佸璇婇噺")
+ @PostMapping("/getSfFzInfoEveryMonth")
+ public TableDataInfo getSfFzInfoEveryMonth(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ return getDataTable(serviceSubtaskService.getSfFzInfoEveryMonth(serviceSubtaskCountReq));
}
}
--
Gitblit v1.9.3