From 10aaa035f5be0312304d20f022bdb714a8f4900a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 11 十二月 2024 22:16:23 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 94 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 22 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 7a0b1e6..ec2f820 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
@@ -8,23 +8,24 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DtoConversionUtils;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+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.time.LocalTime;
-import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級Controller
@@ -40,25 +41,41 @@
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+ @Autowired
+ private IServiceSubtaskRecordService serviceSubtaskRecordService;
+
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@PostMapping("/patItem")
- public TableDataInfo patItem(@RequestBody ServiceSubtask ivrTaskcall) {
- PageUtils.startPageByPost(ivrTaskcall.getPageNum(), ivrTaskcall.getPageSize());
- List<ServiceSubtask> serviceSubtaskList = 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() {
- ivrTaskcall.setPageNum(null);
- ivrTaskcall.setPageSize(null);
- serviceSubtaskService.patItem(ivrTaskcall);
+ serviceSubtaskVO.setPageNum(null);
+ serviceSubtaskVO.setPageSize(null);
+ serviceSubtaskService.patItem(serviceSubtaskVO);
}
});
- return getDataTable2(total, serviceSubtaskList);
+ return getDataTable2(total, list);
// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
}
@@ -68,11 +85,13 @@
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- 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, "鍗曚竴浠诲姟锛堥殢璁匡級鏁版嵁");
+ public void export(HttpServletResponse response, ServiceSubtaskVO serviceSubtaskVO) {
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ List<ServiceSubtaskExportVO> serviceSubtaskExportVOS = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExportVO.class);
+ ExcelUtil<ServiceSubtaskExportVO> util = new ExcelUtil<ServiceSubtaskExportVO>(ServiceSubtaskExportVO.class);
+ util.exportExcel(response, serviceSubtaskExportVOS, "闅忚瀵煎嚭鏁版嵁");
+ }
}
/**
@@ -103,6 +122,12 @@
@PostMapping("/update")
public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) {
return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
+ }
+
+ @ApiOperation("鏂板瀛愪换鍔�")
+ @PostMapping("/addSubTask")
+ public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) {
+ return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
}
/**
@@ -136,14 +161,14 @@
}
/**
- * 鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划)
+ * 鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划)
*/
- @ApiOperation("鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划)")
+ @ApiOperation("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划)")
@PostMapping("/taskPull")
public List<PullTaskVO> taskPull() {
- log.error("鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划)");
+ log.error("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划)");
List<PullTaskVO> pullTaskVOList = serviceSubtaskService.taskPull();
- log.error("鐢佃瘽鍥炶皟浠诲姟(闆ㄧ划):{}", pullTaskVOList);
+ log.error("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划):{}", pullTaskVOList);
return pullTaskVOList;
}
@@ -159,10 +184,22 @@
/**
* 閫氳瘽璁板綍鍥炶皟
*/
- @ApiOperation("閫氳瘽璁板綍鍥炶皟")
- @PostMapping("/recordAccept")
- public AjaxResult recordAccept(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
+ @ApiOperation("閫氳瘽璁板綍鍥炶皟(涓婃捣)")
+ @PostMapping("/recordAcceptshanghai")
+ public AjaxResult recordAccepshanghait(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+ }
+
+ /**
+ * 閫氳瘽璁板綍鍥炶皟
+ */
+ @ApiOperation("閫氳瘽璁板綍鍥炶皟(闆ㄧ划)")
+ @PostMapping("/recordAccept")
+ public AjaxResult recordAccept(@RequestBody PhoneCallRecordVO phoneCallRecordVO) {
+ log.error("閫氳瘽璁板綍鍥炶皟(闆ㄧ划):{}", phoneCallRecordVO);
+// return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+ serviceSubtaskService.recordAccept(phoneCallRecordVO);
+ return success();
}
/**
@@ -174,4 +211,17 @@
return getDataTable(serviceSubtaskService.getSfFzInfoEveryMonth(serviceSubtaskCountReq));
}
+
+ /**
+ * 鑾峰彇闅忚缁熻姣斾緥
+ */
+ @ApiOperation("鑾峰彇闅忚缁熻姣斾緥")
+ @PostMapping("/getSfStatistics")
+ public AjaxResult getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
+ return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
+ }
+ return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
+ }
+
}
--
Gitblit v1.9.3