Merge branch 'feat-20231009-taskstatuscondition' into temp-pre

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

@@ -471,17 +471,17 @@ public class WmPayOffController {
 		SettlementProofModel settlementProofModel = new SettlementProofModel();
 		settlementProofModel.setPackageList(packageDetailList);
 
-		// 收款单位户名
-		String collectionName = "";
-		// 收款单位账号
-		String collectionAccount = "";
-		// 收款单位开户行
-		String collectionBankName = "";
-		if (queryDeptSub.getSettlementProofInfo() != null) {
-			collectionName = queryDeptSub.getSettlementProofInfo().getOrDefault("collection_name", "");
-			collectionAccount = queryDeptSub.getSettlementProofInfo().getOrDefault("collection_account", "");
-			collectionBankName = queryDeptSub.getSettlementProofInfo().getOrDefault("collection_bank_name", "");
-		}
+//		// 收款单位户名
+//		String collectionName = "";
+//		// 收款单位账号
+//		String collectionAccount = "";
+//		// 收款单位开户行
+//		String collectionBankName = "";
+//		if (queryDeptSub.getSettlementProofInfo() != null) {
+//			collectionName = queryDeptSub.getSettlementProofInfo().getOrDefault("collection_name", "");
+//			collectionAccount = queryDeptSub.getSettlementProofInfo().getOrDefault("collection_account", "");
+//			collectionBankName = queryDeptSub.getSettlementProofInfo().getOrDefault("collection_bank_name", "");
+//		}
 
 		// 服务器模板文件路径
 		String resourcePath = OsEnvUtils.getEachEnvPaths().get("EXCEL_FILE_PATH") + "settlement_application_form_template.docx";
@@ -490,9 +490,9 @@ public class WmPayOffController {
 
 		Configure config = Configure.newBuilder().bind("package_list", policy).build();
 
-		String finalCollectionName = collectionName;
-		String finalCollectionAccount = collectionAccount;
-		String finalCollectionBankName = collectionBankName;
+//		String finalCollectionName = collectionName;
+//		String finalCollectionAccount = collectionAccount;
+//		String finalCollectionBankName = collectionBankName;
 		BigDecimal finalTotalSettleAmount = totalSettleAmount;
 		XWPFTemplate template = XWPFTemplate.compile(resourcePath, config).render(
 				new HashMap<String, Object>() {{
@@ -502,9 +502,9 @@ public class WmPayOffController {
 					put("total_settle_amount", String.valueOf(finalTotalSettleAmount));
 					// 实际结算金额
 					put("total_settle_amount_cn", AmountToCNUtil.number2CNMontrayUnit(finalTotalSettleAmount));
-					put("collection_name", finalCollectionName);
-					put("collection_account", finalCollectionAccount);
-					put("collection_bank_name", finalCollectionBankName);
+//					put("collection_name", finalCollectionName);
+//					put("collection_account", finalCollectionAccount);
+//					put("collection_bank_name", finalCollectionBankName);
 				}}
 		);