| @@ -55,6 +55,17 @@ public class WxBillAllController extends BaseController { | |||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @GetMapping("allDepositList") | |||||
| @SystemControllerLog(description = "账单总览-所有押金列表") | |||||
| public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) { | |||||
| logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList"); | |||||
| if (null == wxBillAll) { | |||||
| wxBillAll = new WxBillAll(); | |||||
| } | |||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| return new ResultData(wxBillAllService.allDepositList(wxBillAll)); | |||||
| } | |||||
| @GetMapping("exportBill") | @GetMapping("exportBill") | ||||
| @SystemControllerLog(description = "账单总览-导出") | @SystemControllerLog(description = "账单总览-导出") | ||||
| public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { | public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { | ||||
| @@ -0,0 +1,21 @@ | |||||
| alter table wx_bill_rent | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| alter table wx_bill_rent_deposit | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| alter table wx_bill_property | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| alter table wx_bill_property_deposit | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| alter table wx_bill_daily | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| alter table wx_bill_other | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| alter table wx_bill_other_deposit | |||||
| add column `freeze` SMALLINT (1) NULL DEFAULT 0 COMMENT '0正常1冻结'; | |||||
| @@ -0,0 +1,24 @@ | |||||
| DROP TABLE IF EXISTS `mall_sale_type` ; | |||||
| CREATE TABLE `mall_sale_type` ( | |||||
| `id` bigint(64) NOT NULL, | |||||
| `name` varchar(32) DEFAULT NULL COMMENT '销售类型', | |||||
| `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版', | |||||
| `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', | |||||
| `menus` json DEFAULT NULL COMMENT '菜单列表', | |||||
| PRIMARY KEY (`id`), | |||||
| UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' | |||||
| ) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; | |||||
| INSERT INTO `mall_sale_type` | |||||
| (`id`,`name`, `type`, `period`, `menus`) | |||||
| VALUES | |||||
| (1, '尊享全能版', 1, 12, | |||||
| '[1,2,3,4,5,6,7,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]' | |||||
| ), | |||||
| (2, '尊享营销版', 2, 12, | |||||
| '[1,2,4,5,6,7,8,9,10,50,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,416,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,961]' | |||||
| ), | |||||
| (3, '速享版', 3, 1, | |||||
| '[2,4,5,6,7,10,50,201,202,205,211,212,221,222,251,409,410,411,416,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932]' | |||||
| ) | |||||
| ; | |||||
| @@ -51,4 +51,6 @@ public interface WxBillAllMapper { | |||||
| Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record); | Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record); | ||||
| List<Map<String, Object>> allDepositList(WxBillAll wxBillAll); | |||||
| } | } | ||||
| @@ -17,6 +17,8 @@ import java.util.Map; | |||||
| */ | */ | ||||
| public interface WxBillAllService { | public interface WxBillAllService { | ||||
| List<Map<String, Object>> allDepositList(WxBillAll wxBillAll); | |||||
| Map<String, Object> listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); | Map<String, Object> listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); | ||||
| List<Map<String, Object>> listBillOweAndWaitPay(WxBillAll wxBillAll); | List<Map<String, Object>> listBillOweAndWaitPay(WxBillAll wxBillAll); | ||||
| @@ -1633,4 +1633,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| excelService.exportExcel(list, null, name, WaitMerchantVo.class, name + ".xlsx", response, false); | excelService.exportExcel(list, null, name, WaitMerchantVo.class, name + ".xlsx", response, false); | ||||
| } | } | ||||
| @Override | |||||
| public List<Map<String, Object>> allDepositList(WxBillAll wxBillAll) { | |||||
| return wxBillAllMapper.allDepositList(wxBillAll); | |||||
| } | |||||
| } | } | ||||
| @@ -69,42 +69,42 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| return billSettle; | return billSettle; | ||||
| } | } | ||||
| public void updateFreeze(List<WxBillSettleBill> billList){ | |||||
| public void updateFreeze(List<WxBillSettleBill> billList,int status){ | |||||
| for (WxBillSettleBill bill:billList) { | for (WxBillSettleBill bill:billList) { | ||||
| if(EnumBillType.RENT.getCode().equals(bill.getBillType())) { | if(EnumBillType.RENT.getCode().equals(bill.getBillType())) { | ||||
| WxBillRent wxBillRent = new WxBillRent(); | WxBillRent wxBillRent = new WxBillRent(); | ||||
| wxBillRent.setId(bill.getBillId()); | wxBillRent.setId(bill.getBillId()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| wxBillRent.setStatus(status); | |||||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { | }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { | ||||
| WxBillDeposit wxBillRent = new WxBillDeposit(); | WxBillDeposit wxBillRent = new WxBillDeposit(); | ||||
| wxBillRent.setId(bill.getBillId()); | wxBillRent.setId(bill.getBillId()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| wxBillRent.setStatus(status); | |||||
| wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { | }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { | ||||
| WxBillProperty wxBillRent = new WxBillProperty(); | WxBillProperty wxBillRent = new WxBillProperty(); | ||||
| wxBillRent.setId(bill.getBillId()); | wxBillRent.setId(bill.getBillId()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| wxBillRent.setStatus(status); | |||||
| wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); | WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); | ||||
| propertyDeposit.setId(bill.getBillId()); | propertyDeposit.setId(bill.getBillId()); | ||||
| propertyDeposit.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| propertyDeposit.setStatus(status); | |||||
| wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); | wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); | ||||
| }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { | }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { | ||||
| WxBillOther wxBillRent = new WxBillOther(); | WxBillOther wxBillRent = new WxBillOther(); | ||||
| wxBillRent.setId(bill.getBillId()); | wxBillRent.setId(bill.getBillId()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| wxBillRent.setStatus(status); | |||||
| wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { | }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { | ||||
| WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); | WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); | ||||
| wxBillRent.setId(bill.getBillId()); | wxBillRent.setId(bill.getBillId()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| wxBillRent.setStatus(status); | |||||
| wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| }else{ | }else{ | ||||
| WxBillDaily wxBillRent = new WxBillDaily(); | WxBillDaily wxBillRent = new WxBillDaily(); | ||||
| wxBillRent.setId(bill.getBillId()); | wxBillRent.setId(bill.getBillId()); | ||||
| wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); | |||||
| wxBillRent.setStatus(status); | |||||
| wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| } | } | ||||
| } | } | ||||
| @@ -132,8 +132,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| //改为冻结状态 | //改为冻结状态 | ||||
| if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { | if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { | ||||
| updateFreeze(record.getReceiveBillIds()); | |||||
| updateFreeze(record.getPayBillIds()); | |||||
| updateFreeze(record.getReceiveBillIds(),EnumBillRentStatus.FREEZE.getCode()); | |||||
| updateFreeze(record.getPayBillIds(),EnumBillRentStatus.FREEZE.getCode()); | |||||
| } | } | ||||
| //启动审批流 | //启动审批流 | ||||
| @@ -86,6 +86,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| private WxCouponService wxCouponService; | private WxCouponService wxCouponService; | ||||
| @Autowired | @Autowired | ||||
| private WxRentContractMapper wxRentContractMapper; | private WxRentContractMapper wxRentContractMapper; | ||||
| @Autowired | |||||
| private WxBillSettleMapper wxBillSettleMapper; | |||||
| /** | /** | ||||
| * 获取流程key | * 获取流程key | ||||
| @@ -270,6 +272,16 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| } | } | ||||
| wxCoupon.setApprovalType(operateType); | wxCoupon.setApprovalType(operateType); | ||||
| wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); | wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); | ||||
| }else if(EnumFlowKey.SETTLE.getCode().equals(flowType)){ | |||||
| WxBillSettle wxBillSettle = new WxBillSettle(); | |||||
| wxBillSettle.setId(businessId); | |||||
| wxBillSettle.setApplyStatus(applyStatus); | |||||
| wxBillSettleMapper.update(wxBillSettle); | |||||
| // 审批完成,账单解冻 | |||||
| if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| @@ -741,13 +741,31 @@ | |||||
| <if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> | <if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> | ||||
| <if test=" null != rentShopType"> and rc.rent_shop_type = #{rentShopType} </if> | <if test=" null != rentShopType"> and rc.rent_shop_type = #{rentShopType} </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| <if test=" null == sortColumns"> order by m.id desc </if> | <if test=" null == sortColumns"> order by m.id desc </if> | ||||
| </select> | </select> | ||||
| <select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | |||||
| select bill.* | |||||
| from ( | |||||
| select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' | |||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' | |||||
| endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime from wx_bill_rent_deposit where | |||||
| tenant_id=#{tenantId} | |||||
| union all | |||||
| select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' | |||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' | |||||
| endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime from wx_bill_property_deposit where | |||||
| tenant_id=#{tenantId} | |||||
| union all | |||||
| select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as | |||||
| bill_type,0 as | |||||
| need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, | |||||
| rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime | |||||
| from wx_bill_other_deposit where tenant_id=#{tenantId} | |||||
| ) bill | |||||
| <if test=" null != status"> and bill.status = #{status} </if> | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||
| @@ -257,26 +257,6 @@ public class SysMenuController extends BaseController { | |||||
| }}); | }}); | ||||
| // 5. 删除permission | // 5. 删除permission | ||||
| mallPermissionService.deleteById(menuId_Account); | mallPermissionService.deleteById(menuId_Account); | ||||
| // 6. sale_type | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(1L); | |||||
| setMenus( | |||||
| "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" | |||||
| ); | |||||
| }}); | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(2L); | |||||
| setMenus( | |||||
| "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" | |||||
| ); | |||||
| }}); | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(3L); | |||||
| setMenus( | |||||
| "[2,4,5,6,10,50,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932]" | |||||
| ); | |||||
| }}); | |||||
| } | } | ||||
| private void addMenusForContract() { | private void addMenusForContract() { | ||||
| @@ -403,25 +383,6 @@ public class SysMenuController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| // 5. sale_type | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(1L); | |||||
| setMenus( | |||||
| "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" | |||||
| ); | |||||
| }}); | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(2L); | |||||
| setMenus( | |||||
| "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" | |||||
| ); | |||||
| }}); | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(3L); | |||||
| setMenus( | |||||
| "[2,4,5,6,10,50,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932]" | |||||
| ); | |||||
| }}); | |||||
| } | } | ||||
| private void addMenusForBills() { | private void addMenusForBills() { | ||||
| @@ -432,25 +393,6 @@ public class SysMenuController extends BaseController { | |||||
| }}); | }}); | ||||
| addNewMunuFolder_ZhangdanList(); | addNewMunuFolder_ZhangdanList(); | ||||
| addNewMenuFolder_Duizhang(); | addNewMenuFolder_Duizhang(); | ||||
| // 8. sale_type | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(1L); | |||||
| setMenus( | |||||
| "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" | |||||
| ); | |||||
| }}); | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(2L); | |||||
| setMenus( | |||||
| "[1,2,3,4,5,6,8,9,10,50,101,102,103,104,105,106,107,108,201,202,203,204,205,206,211,212,221,222,251,299,300,301,302,303,304,305,306,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932,951,952,961,962,965,966,967,968]" | |||||
| ); | |||||
| }}); | |||||
| mallMenuMapper.updateMallSaleType(new MallSaleType(){{ | |||||
| setId(3L); | |||||
| setMenus( | |||||
| "[2,4,5,6,10,50,201,202,205,211,212,221,222,251,409,410,411,416,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,695,701,702,711,712,713,901,902,903,931,932]" | |||||
| ); | |||||
| }}); | |||||
| } | } | ||||
| private void addNewMunuFolder_ZhangdanList() { | private void addNewMunuFolder_ZhangdanList() { | ||||