Merge branch 'hotfix-20230411-settleexport' into temp-pre

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

@@ -261,7 +261,8 @@ public class WmPayOffController {
 				dictItemService.list(Wrappers.<SysDictItem>lambdaQuery()
 						.in(SysDictItem::getType, "renlijia_invoice", "olading_invoice", "yee_invoice",
 								"tax_helper_invoice", "olading_henan_invoice", "olading_jinyuan_invoice", "zheng_qi_zhi_xing_invoice",
-								"langchao_invoice", "zheng_qi_zhi_xing_jiang_xi_invoice", "hui_qi_yun_invoice"));
+								"langchao_invoice", "zheng_qi_zhi_xing_jiang_xi_invoice", "hui_qi_yun_invoice", "zhong_yi_yun_invoice",
+								"olading_zhaoyu_invoice"));
 		Map<String, Map<String, String>> collect = invoiceCategoryList.stream().collect(Collectors.groupingBy(SysDictItem::getType, Collectors.toMap(SysDictItem::getValue, SysDictItem::getLabel)));
 		Map<String, String> renlijiaInvoice = collect.get("renlijia_invoice");
 		Map<String, String> oladingInvoice = collect.get("olading_invoice");
@@ -273,6 +274,8 @@ public class WmPayOffController {
 		Map<String, String> langchaoInvoice = collect.get("langchao_invoice");
 		Map<String, String> zhengQiZhiXingJiangXiInvoice = collect.get("zheng_qi_zhi_xing_jiang_xi_invoice");
 		Map<String, String> huiQiYunInvoice = collect.get("hui_qi_yun_invoice");
+		Map<String, String> zhongYiYunInvoice = collect.get("zhong_yi_yun_invoice");
+		Map<String, String> oladingZhaoyuInvoice = collect.get("olading_zhaoyu_invoice");
 
 
 		// 转换为导出实体
@@ -323,6 +326,12 @@ public class WmPayOffController {
 					case JIANG_XI:
 						invoice = zhengQiZhiXingJiangXiInvoice.get(cate);
 						break;
+					case ZHONG_YI_YUN:
+						invoice = zhongYiYunInvoice.get(cate);
+						break;
+					case ZHAO_YU:
+						invoice = oladingZhaoyuInvoice.get(cate);
+						break;
 					default:
 						invoice = WmScorePackageSettleExcelModel.CategoryEnum.CATEGORY_NULL.getDesc();
 						break;