|
|
|
@@ -130,6 +130,12 @@ public class WxFinanceController extends BaseController { |
|
|
|
List<Integer> billTypeList = new ArrayList<Integer>(); |
|
|
|
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<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); |
|
|
|
@@ -473,7 +479,15 @@ public class WxFinanceController extends BaseController { |
|
|
|
Map<String,Object> map = new HashMap<String,Object>(); |
|
|
|
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<Map> variablesList = new ArrayList<Map>(); |
|
|
|
Map cashierTypeMap = new HashMap<String,Object>(); |
|
|
|
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 { |
|
|
|
|