From e44f3f7b666394907a016488e79f788e7ed97a70 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十一月 2024 19:23:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 06f9e73..5b3aa1e 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
@@ -12,17 +12,15 @@
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.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;
@@ -41,6 +39,9 @@
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+ @Autowired
+ private IServiceSubtaskRecordService serviceSubtaskRecordService;
+
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@@ -52,6 +53,12 @@
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);
@@ -144,14 +151,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;
}
@@ -167,10 +174,21 @@
/**
* 閫氳瘽璁板綍鍥炶皟
*/
- @ApiOperation("閫氳瘽璁板綍鍥炶皟")
+ @ApiOperation("閫氳瘽璁板綍鍥炶皟(涓婃捣)")
+ @PostMapping("/recordAcceptshanghai")
+ public AjaxResult recordAccepshanghait(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
+ return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+ }
+
+ /**
+ * 閫氳瘽璁板綍鍥炶皟
+ */
+ @ApiOperation("閫氳瘽璁板綍鍥炶皟(闆ㄧ划)")
@PostMapping("/recordAccept")
- public AjaxResult recordAccept(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
+ public AjaxResult recordAccept(@RequestBody PhoneCallRecordVO phoneCallRecordVO) {
+ log.error("閫氳瘽璁板綍鍥炶皟(闆ㄧ划):{}", phoneCallRecordVO);
// return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+ serviceSubtaskService.recordAccept(phoneCallRecordVO);
return success();
}
--
Gitblit v1.9.3