From 88214b60acac265ab2f8fd57560e6ee5a8a3bfde Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 13 Jun 2024 21:43:17 +0800
Subject: [PATCH] 启动失败

---
 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java |   82 ++++++++++++++++++++++++++++------------
 1 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
index aa4624a..3157730 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
@@ -5,6 +5,9 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.eCallEventTwo.dto.*;
 import org.springblade.modules.eCallEventTwo.entity.ECallEventTwoEntity;
@@ -18,7 +21,6 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +38,7 @@
 	@Autowired
 	private IECallEventTwoService ecOrderService;
 
+	protected static final Logger log = LoggerFactory.getLogger(EcOrderServiceImpl.class);
 	/**
 	 * 查询工单
 	 *
@@ -114,7 +117,8 @@
 
 		for (int pageNum = 1; pageNum <= totalPages; pageNum++) {
 			Page<EcOrder> page = new Page<>(pageNum, pageSize);
-			IPage<EcOrder> resultPage = baseMapper.selectPage(page, new QueryWrapper<>());
+			QueryWrapper<EcOrder> objectQueryWrapper = new QueryWrapper<>();
+			IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
 			List<EcOrder> records = resultPage.getRecords();
 			List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
 			boolean b = ecOrderService.saveOrUpdateBatch(recordEntityList);
@@ -132,11 +136,36 @@
 		return result;
 	}
 
+
 	/**
 	 * 统计办结率
 	 */
 	@Override
-	public Map<String, String> getCount(EcOrderParamDTO ecOrderParamDTO) {
+	public IPage<EcOrderDTO> getCount(IPage<EcOrderDTO> page, EcOrderParamDTO ecOrderParamDTO) {
+		// acpt_org_code
+		List<EcOrderDTO> result = baseMapper.getOrgCode(page, ecOrderParamDTO);
+		for (EcOrderDTO ecOrderDTO : result) {
+			if (ecOrderParamDTO.getTagMain().equals("Y")) {
+				ecOrderParamDTO.setSinkOrgCode(ecOrderDTO.getSinkOrgCode());
+			} else {
+				ecOrderParamDTO.setSubjectOrgCode(ecOrderDTO.getSubjectOrgCode());
+			}
+			// 统计办结率
+			buildRate(ecOrderParamDTO, ecOrderDTO);
+			// 获取单位名称
+			if (ecOrderParamDTO.getTagMain().equals("Y")) {
+				ecOrderDTO.setOrgCode(ecOrderDTO.getSinkOrgCode());
+				ecOrderDTO.setOrgName(ecOrderDTO.getSinkOrgName());
+			} else {
+				ecOrderDTO.setOrgCode(ecOrderDTO.getSubjectOrgCode());
+				ecOrderDTO.setOrgName(ecOrderDTO.getSubjectOrgName());
+			}
+		}
+		return page.setRecords(result);
+	}
+
+	@NotNull
+	private void buildRate(EcOrderParamDTO ecOrderParamDTO, EcOrderDTO ecOrder) {
 		// 统计订单
 		EcOrderDTO ecOrderDTO = BeanUtil.copy(ecOrderParamDTO, EcOrderDTO.class);
 		int i = baseMapper.selectEcOrderCount(ecOrderDTO);
@@ -162,37 +191,40 @@
 		EcOrderSuperviseDTO ecOrderSuperviseDTO = BeanUtil.copy(ecOrderParamDTO, EcOrderSuperviseDTO.class);
 		int i7 = baseMapper.selectEcOrderSuperviseCount(ecOrderSuperviseDTO);
 		// 工单数	派发单数	办理单数(率)	办结单数(率)	答复单数(率)	回访单数(率)	核实单数	督办单数
-		Map<String, String> result = new HashMap<>();
+		// Map<String, String> result = new HashMap<>();
 		// 工单数
-		result.put("orderNumber", String.valueOf(i));
+		// result.put("orderNumber", String.valueOf(i));
+		ecOrder.setOrderNumber(String.valueOf(i));
 		// 派发单数(率)
-		result.put("dispatchRate", getRate(i1, i));
-		result.put("dispatchNumber", String.valueOf(i1));
+		// result.put("dispatchRate", getRate(i1, i));
+		ecOrder.setDispatchRate(getRate(i1, i));
+		// result.put("dispatchNumber", String.valueOf(i1));
+		ecOrder.setDispatchNumber(String.valueOf(i1));
 		// 办理单数(率)
-		result.put("handRate", getRate(i2, i));
-		result.put("handNumber", String.valueOf(i2));
+		// result.put("handRate", getRate(i2, i));
+		ecOrder.setHandRate(getRate(i2, i));
+		// result.put("handNumber", String.valueOf(i2));
 		// 办结单数(率)
-		result.put("checkRate", getRate(i3, i));
-		result.put("checkNumber", String.valueOf(i3));
+		// result.put("checkRate", getRate(i3, i));
+		ecOrder.setCheckRate(getRate(i3, i));
+		// result.put("checkNumber", String.valueOf(i3));
 		// 答复单数(率)
-		result.put("doneRate", getRate(i4, i));
-		result.put("doneNumber", String.valueOf(i4));
+		// result.put("doneRate", getRate(i4, i));
+		ecOrder.setDoneRate(getRate(i4, i));
+		// result.put("doneNumber", String.valueOf(i4));
 		// 回访单数(率)
-		result.put("respRate", getRate(i5, i));
-		result.put("respNumber", String.valueOf(i5));
+		// result.put("respRate", getRate(i5, i));
+		ecOrder.setRespRate(getRate(i5, i));
+		// result.put("respNumber", String.valueOf(i5));
 		// 核实单数(率)
-		result.put("reviewRate", getRate(i6, i));
-		result.put("reviewNumber", String.valueOf(i6));
+		// result.put("reviewRate", getRate(i6, i));
+		ecOrder.setReviewRate(getRate(i6, i));
+		// result.put("reviewNumber", String.valueOf(i6));
 		// 督办单数
-		result.put("superviseNumber", String.valueOf(i7));
+		// result.put("superviseNumber", String.valueOf(i7));
+		ecOrder.setSuperviseNumber(String.valueOf(i7));
 		// 返回结果
-		return result;
-
-	}
-
-	public static void main(String[] args) {
-		String rate = getRate(10, 3);
-		System.out.println(rate);
+		// return result;
 	}
 
 

--
Gitblit v1.9.3