From d70f956288973045038035341928447d16027fac Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 09 七月 2019 17:23:35 +0800
Subject: [PATCH] 调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java |   90 +++++++++++++++++++++++++++++++--------------
 1 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
index 026bf87..96a24ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
@@ -1,92 +1,126 @@
 package com.yeshi.fanli.service.impl.user;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import com.google.gson.Gson;
 import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;
+import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
 import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
 import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService;
+import com.yeshi.fanli.util.StringUtil;
 
 @Service
 public class ExtractAuditRecordServiceImpl implements ExtractAuditRecordService {
-	
+
 	@Resource
 	private ExtractAuditRecordMapper extractAuditRecordMapper;
 
 	@Override
-	public List<ExtractAuditRecord> getList(int pageIndex, int pageSize, String key,
-			String startTime, String endTime) {
+	public List<ExtractAuditRecord> getList(int pageIndex, int pageSize, String key, String startTime, String endTime) {
 		return extractAuditRecordMapper.getList((pageIndex - 1) * pageSize, pageSize, key, startTime, endTime);
 	}
-	
-	
+
 	@Override
-	public int getCount (String key, String startTime, String endTime) {
+	public int getCount(String key, String startTime, String endTime) {
 		return extractAuditRecordMapper.getCount(key, startTime, endTime);
 	}
-	
-	
+
 	@Override
-	public List<ExtractAuditRecord> getMyAuditedAllList(int pageIndex, int pageSize,
-			String key,	Integer state, Long adminId) {
+	public List<ExtractAuditRecord> getMyAuditedAllList(int pageIndex, int pageSize, String key, Integer state,
+			Long adminId) {
 		return extractAuditRecordMapper.getMyAuditedAllList((pageIndex - 1) * pageSize, pageSize, key, state, adminId);
 	}
-	
+
 	@Override
 	public int getMyAuditedAllCount(String key, Integer state, Long adminId) {
 		return extractAuditRecordMapper.getMyAuditedAllCount(key, state, adminId);
 	}
-	
+
 	@Override
-	public List<ExtractAuditRecord> getMyAuditedTimeSlotList(int pageIndex, int pageSize,
-			String key,	Integer state, Long adminId, Integer days) {
-		return extractAuditRecordMapper.getMyAuditedTimeSlotList((pageIndex - 1) * pageSize, pageSize, key, state, adminId, days);
+	public List<ExtractAuditRecord> getMyAuditedTimeSlotList(int pageIndex, int pageSize, String key, Integer state,
+			Long adminId, Integer days) {
+		List<ExtractAuditRecord> list = extractAuditRecordMapper.getMyAuditedTimeSlotList((pageIndex - 1) * pageSize,
+				pageSize, key, state, adminId, days);
+		Gson gson = new Gson();
+		if (list != null)
+			for (ExtractAuditRecord record : list) {
+				if (!StringUtil.isNullOrEmpty(record.getExtraInfoStr())) {
+					record.setExtraInfo(gson.fromJson(record.getExtraInfoStr(), ExtractOrderStatisticDTO.class));
+				}
+			}
+		return list;
 	}
-	
+
 	@Override
 	public int getMyAuditedTimeSlotCount(String key, Integer state, Long adminId, Integer days) {
 		return extractAuditRecordMapper.getMyAuditedTimeSlotCount(key, state, adminId, days);
 	}
-	
+
 	@Override
 	public int getMyAuditedCountWeek(Long adminId) {
 		return extractAuditRecordMapper.getMyAuditedCountWeek(adminId);
 	}
-	
+
 	@Override
 	public int getMyAuditedCountMonth(Long adminId) {
 		return extractAuditRecordMapper.getMyAuditedCountMonth(adminId);
 	}
-	
+
 	@Override
 	public int getMyAuditedCountToday(Long adminId) {
 		return extractAuditRecordMapper.getMyAuditedCountToday(adminId);
 	}
-	
+
 	@Override
 	public List<ExtractAuditRecord> getByUidList(int pageIndex, int pageSize, Long uid) {
-		return extractAuditRecordMapper.getByUidList((pageIndex - 1) * pageSize, pageSize, uid);
+		List<ExtractAuditRecord> list = extractAuditRecordMapper.getByUidList((pageIndex - 1) * pageSize, pageSize, uid);
+		
+		Gson gson = new Gson();
+		if (list != null)
+			for (ExtractAuditRecord record : list) {
+				if (!StringUtil.isNullOrEmpty(record.getExtraInfoStr())) {
+					record.setExtraInfo(gson.fromJson(record.getExtraInfoStr(), ExtractOrderStatisticDTO.class));
+				}
+			}
+		return list;
 	}
-	
+
 	@Override
 	public int getByUidCount(Long key) {
 		return extractAuditRecordMapper.getByUidCount(key);
 	}
-	
-	
+
 	@Override
 	public List<ExtractAuditRecord> getListbyExtractId(Long extractId) {
 		return extractAuditRecordMapper.getListbyExtractId(extractId);
 	}
-	
+
 	@Override
 	public List<ExtractAuditRecord> getbyExtractId(Long extractId) {
 		return extractAuditRecordMapper.getbyExtractId(extractId);
 	}
-	
-	
-	
+
+	@Override
+	public List<Map<String, Object>> countAuditTotal(Integer state, Integer type, String years, String startTime,
+			String endTime) throws Exception {
+		return extractAuditRecordMapper.countAuditTotal(state, type, years, startTime, endTime);
+	}
+
+	@Override
+	public List<Map<String, Object>> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
+			String endTime) throws Exception {
+		return extractAuditRecordMapper.countExtractMoney(state, type, years, startTime, endTime);
+	}
+
+	@Override
+	public List<Map<String, Object>> countExtractApplyNumber(Integer state, Integer type, String years,
+			String startTime, String endTime) throws Exception {
+		return extractAuditRecordMapper.countExtractApplyNumber(state, type, years, startTime, endTime);
+	}
+
 }

--
Gitblit v1.8.0