From aa4ff4f238589f94c1f774ae42a4f01a2619d3a1 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 13 Sep 2024 10:12:48 +0800 Subject: [PATCH] fix --- .../controller/market/WxFinanceController.java | 16 +++++++++++++++- .../com/iformall/domain/po/WxEnergyFees.java | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 171191ae1..6dedf1d2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -130,6 +130,12 @@ public class WxFinanceController extends BaseController { List billTypeList = new ArrayList(); billTypeList.add(EnumBillAllType.RENT_DEPOSIT.getCode()); billTypeList.add(EnumBillAllType.PROPERTY.getCode()); + if (null != record.getIsAllList() && EnumYesOrNo.YES.getCode() == record.getIsAllList()) { + billTypeList.add(EnumBillAllType.RENT.getCode()); + billTypeList.add(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); + billTypeList.add(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); + billTypeList.add(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); + } record.setBillTypeList(billTypeList); record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); @@ -473,7 +479,15 @@ public class WxFinanceController extends BaseController { Map map = new HashMap(); map.put("businessType", EnumFlowKey.FINANCE_RED.getCode()); map.put("remark", record.getRemark()); - map.put("businessId", String.valueOf(record.getId())); + map.put("businessId", String.valueOf(record.getId())); + + List variablesList = new ArrayList(); + Map cashierTypeMap = new HashMap(); + cashierTypeMap.put("key","cashierType"); + cashierTypeMap.put("value",String.valueOf(receive.getType())); + variablesList.add(cashierTypeMap); + + map.put("variables", variablesList); record.setFlowParams(map); wxFlowService.start(record.getFlowParams(), user.getId(), user.getName(), receive); }else { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java index 61197abdf..4f1577489 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java @@ -182,5 +182,7 @@ public class WxEnergyFees extends TenantEntity { private Integer notSetOff; @TableField(exist = false) private List billTypeList; + @TableField(exist = false) + private Integer isAllList; }