Merge branch 'feat-newreporttemplate-20210816' of googol/YY_BE_2 into master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysExportController.java

@@ -19,6 +19,7 @@
 
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,6 +57,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -80,6 +82,8 @@ public class SysExportController {
 
 	private final WmScorePackageService wmScorePackageService;
 
+	private final WmScorePackageSettleNoteService wmScorePackageSettleNoteService;
+
 	private final WmScorePackageMapper wmScorePackageMapper;
 
 	private final SysDeptService sysDeptService;
@@ -112,6 +116,8 @@ public class SysExportController {
 
 	private final JavaMailSender sender;
 
+	private final SysExportService sysExportService;
+
 	/**
 	 * 新增查询列表功能
 	 */
@@ -811,13 +817,17 @@ public class SysExportController {
 			if (listPackageIds.size() > 0) {
 				List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
 				Integer totalScorePackage = 0;
+				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
 						totalScorePackage += wmScorePackage.getScore();
+						if (wmScorePackage.getSettleStatus() != null && wmScorePackage.getSettleStatus() == 1){
+							settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
+						}
 					}
 				}
-
-				excelMap.put("totalscorePackageScore", totalScorePackage);
+				excelMap.put("settleAmount","0".equals(settleAmount.toString()) ? " " : settleAmount);
+				excelMap.put("settleAmount",settleAmount.toString());
 			}
 
 			excelMap.put("rwmxTable", wmTaskDetialMap);
@@ -866,6 +876,16 @@ public class SysExportController {
 			excelMap.put("ztTable", wmTaskCount);
 		}
 
+		// 计算所有所有提交任务积分
+		List<WmTask> tasks = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+				.in(WmTask::getScorePackageId, wmTask.getExtIds()));
+
+		if (CollUtil.isNotEmpty(tasks)){
+			int sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+			excelMap.put("submitAmount", sum);
+		}
+
+
 		String agentId = "";
 		if (sysDept.getLevel() == 3) {
 			agentId = sysDept.getLevel2Id() + "";
@@ -967,8 +987,6 @@ public class SysExportController {
 
 	}
 
-	private final SysExportService sysExportService;
-
 	@GetMapping("/exportZbInfo")
 	public R exportZbInfo(WmTask wmTask) {
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/ReportExportServiceImpl.java

@@ -18,6 +18,7 @@
  */
 
 package com.qunzhixinxi.hnqz.admin.service.impl;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -45,6 +46,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -817,20 +819,30 @@ public class ReportExportServiceImpl implements ReportExportService {
 			if (listPackageIds.size() > 0) {
 				List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
 				Integer totalScorePackage = 0;
+				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
-						if(null!=wmScorePackage.getScore()){
-							totalScorePackage += wmScorePackage.getScore();
+						totalScorePackage += wmScorePackage.getScore();
+						if (wmScorePackage.getSettleStatus() != null && wmScorePackage.getSettleStatus() == 1){
+							settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
 						}
 					}
 				}
-
+				excelMap.put("settleAmount","0".equals(settleAmount.toString()) ? " " : settleAmount);
 				excelMap.put("totalscorePackageScore", totalScorePackage);
 				if(wmScorePackage1.getPackageType1().equals("2")||wmScorePackage1.getPackageType1().equals("3")){
 					if(!wmScorePackage1.getPackageType2().equals("2")){
 						excelMap.put("totalscorePackageTaskNum", wmScorePackage1.getTaskNum()*wmScorePackage1.getUserNum());//积分包值任务个数
 					}
 				}
+
+				List<WmTask> tasks = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+						.in(WmTask::getScorePackageId, listPackageIds));
+
+				if (CollUtil.isNotEmpty(tasks)){
+					int sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+					excelMap.put("submitAmount",sum);
+				}
 			}
 
 			excelMap.put("rwmxTable", wmTaskDetialMap);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysExportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
@@ -21,6 +22,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -154,13 +156,26 @@ public class SysExportServiceImpl implements SysExportService {
 			if (listPackageIds.size() > 0) {
 				List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
 				Integer totalScorePackage = 0;
+				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
 						totalScorePackage += wmScorePackage.getScore();
+						if (wmScorePackage.getSettleStatus() != null && wmScorePackage.getSettleStatus() == 1){
+							settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
+						}
 					}
 				}
-
+				excelMap.put("settleAmount","0".equals(settleAmount.toString()) ? " " : settleAmount);
 				excelMap.put("totalscorePackageScore", totalScorePackage);
+
+				List<WmTask> tasks= wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+						.in(WmTask::getScorePackageId, listPackageIds));
+
+				if (CollUtil.isNotEmpty(tasks)){
+					int sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+					excelMap.put("submitAmount",sum);
+				}
+
 			}
 
 			excelMap.put("rwmxTable", wmTaskDetialMap);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/util/ExportReport.java

@@ -128,6 +128,8 @@ public class ExportReport {
 				put("tMoney", bulidObjectToStr(map.get("tMoney")));
 				put("totalscorePackageScore", bulidObjectToStr(map.get("totalscorePackageScore")));
 				put("totalSubmitScore", bulidObjectToStr(map.get("totalSubmitScore")));
+				put("submitAmount", bulidObjectToStr(map.get("submitAmount")));
+				put("settleAmount", bulidObjectToStr(map.get("settleAmount")));
 				put("totalscorePackageNum", bulidObjectToStr(map.get("totalscorePackageNum")));
 				put("totalSubmitNum", bulidObjectToStr(map.get("totalSubmitScore")));
 
@@ -317,6 +319,8 @@ public class ExportReport {
 				put("tMoney", bulidObjectToStr(map.get("tMoney")));
 				put("totalscorePackageScore", bulidObjectToStr(map.get("totalscorePackageScore")));
 				put("totalSubmitScore", bulidObjectToStr(map.get("totalSubmitScore")));
+				put("submitAmount", bulidObjectToStr(map.get("submitAmount")));
+				put("settleAmount", bulidObjectToStr(map.get("settleAmount")));
 				put("totalscorePackageTaskNum", bulidObjectToStr(map.get("totalscorePackageTaskNum")));
 				put("totalSubmitTaskNum", bulidObjectToStr(map.get("totalSubmitTaskNum")));