From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
index cd8635f..36716d8 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
@@ -16,25 +16,29 @@
*/
package org.springblade.modules.eCallEventTwo.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
import org.springblade.modules.eCallEventTwo.entity.ECallEventTwoEntity;
+import org.springblade.modules.eCallEventTwo.service.EcOrderService;
+import org.springblade.modules.eCallEventTwo.service.IECallEventTwoService;
import org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO;
import org.springblade.modules.eCallEventTwo.wrapper.ECallEventTwoWrapper;
-import org.springblade.modules.eCallEventTwo.service.IECallEventTwoService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 工单 控制器
@@ -49,6 +53,8 @@
public class ECallEventTwoController extends BladeController {
private final IECallEventTwoService eCallEventTwoService;
+
+ private final EcOrderService ecOrderService;
/**
* 工单 详情
@@ -88,8 +94,9 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入eCallEventTwo")
- public R save(@Valid @RequestBody ECallEventTwoEntity eCallEventTwo) {
- return R.status(eCallEventTwoService.save(eCallEventTwo));
+ public R save(@Valid @RequestBody ECallEventTwoVO eCallEventTwo) {
+ eCallEventTwo.setCreateUserId(AuthUtil.getUserId());
+ return R.status(eCallEventTwoService.saveTwo(eCallEventTwo));
}
/**
@@ -108,8 +115,8 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入eCallEventTwo")
- public R submit(@Valid @RequestBody ECallEventTwoEntity eCallEventTwo) {
- return R.status(eCallEventTwoService.saveOrUpdate(eCallEventTwo));
+ public R submit(@Valid @RequestBody ECallEventTwoVO eCallEventTwo) {
+ return R.status(eCallEventTwoService.saveTwo(eCallEventTwo));
}
/**
@@ -123,4 +130,41 @@
}
+ /**
+ * 工单 同步
+ */
+ @GetMapping("/synchronizeData")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "工单 同步")
+ public R synchronizeData() {
+ EcOrderParamDTO ecOrderParamDTO = new EcOrderParamDTO();
+ boolean b = ecOrderService.SynchronizeData(ecOrderParamDTO);
+ return R.status(b);
+ }
+
+
+ /**
+ * 工单 同步
+ */
+ @PostMapping("/getCount")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "工单统计")
+ public R getCount(@Valid @RequestBody EcOrderParamDTO ecOrderParamDTO) {
+ Map<String, String> count = ecOrderService.getCount(ecOrderParamDTO);
+ return R.data(count);
+ }
+
+
+ /**
+ * 工单 同步
+ */
+ @GetMapping("/getUnitAssessmentIndicators")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "单位考核指标")
+ public R getUnitAssessmentIndicators( ) {
+ List<Map<String, String>> count = ecOrderService.getUnitAssessmentIndicators();
+ return R.data(count);
+ }
+
+
}
--
Gitblit v1.9.3