feat: 修改兼职全职报告，只统计结算成功的结算金额

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

@@ -821,11 +821,12 @@ public class SysExportController {
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
 						totalScorePackage += wmScorePackage.getScore();
-						settleAmount =  settleAmount.add(wmScorePackage.getSettleAmount());
+						if ("1".equals(wmScorePackage.getSettleStatus())){
+							settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
+						}
 					}
 				}
-
-				excelMap.put("totalscorePackageScore", totalScorePackage);
+				excelMap.put("settleAmount","0".equals(settleAmount.toString()) ? " " : settleAmount);
 				excelMap.put("settleAmount",settleAmount.toString());
 			}
 

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

@@ -822,15 +822,13 @@ public class ReportExportServiceImpl implements ReportExportService {
 				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
-						if(null!=wmScorePackage.getScore()){
-							totalScorePackage += wmScorePackage.getScore();
-						}
-						if (wmScorePackage.getSettleAmount() != null){
+						totalScorePackage += wmScorePackage.getScore();
+						if ("1".equals(wmScorePackage.getSettleStatus())){
 							settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
 						}
 					}
 				}
-				excelMap.put("settleAmount",settleAmount);
+				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")){

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

@@ -160,10 +160,12 @@ public class SysExportServiceImpl implements SysExportService {
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
 						totalScorePackage += wmScorePackage.getScore();
-						settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
+						if ("1".equals(wmScorePackage.getSettleStatus())){
+							settleAmount = settleAmount.add(wmScorePackage.getSettleAmount());
+						}
 					}
 				}
-				excelMap.put("settleAmount",settleAmount);
+				excelMap.put("settleAmount","0".equals(settleAmount.toString()) ? " " : settleAmount);
 				excelMap.put("totalscorePackageScore", totalScorePackage);
 
 				List<WmTask> tasks= wmTaskService.list(Wrappers.<WmTask>lambdaQuery()