|
|
|
@@ -28,6 +28,7 @@ import com.iformall.domain.vo.WxFinanceReceiveBillSum; |
|
|
|
import com.iformall.domain.vo.WxFinanceReceiveCountVo; |
|
|
|
import com.iformall.domain.vo.WxFinanceReceiveSumVo; |
|
|
|
import com.iformall.domain.vo.WxFinanceReceiveVo; |
|
|
|
import com.iformall.enums.EnumFeesType; |
|
|
|
import com.iformall.enums.EnumFinanceCashierType; |
|
|
|
import com.iformall.enums.EnumFinanceFinishStatus; |
|
|
|
import com.iformall.enums.EnumFinanceReceiveStatus; |
|
|
|
@@ -73,46 +74,6 @@ public class WxFinanceController extends BaseController { |
|
|
|
@Autowired |
|
|
|
WxFlowService wxFlowService; |
|
|
|
|
|
|
|
// /** |
|
|
|
// * 账单合同类型(可自定义的) |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @GetMapping("contractBillTypes") |
|
|
|
// public ResultData contractBillTypes() { |
|
|
|
// List<Map> list = new ArrayList<Map>(); |
|
|
|
// for (EnumBillAllType t : EnumBillAllType.values()) { |
|
|
|
// if (t == EnumBillAllType.RENT_DEPOSIT || t == EnumBillAllType.PROPERTY) { |
|
|
|
// Map m = new HashMap(); |
|
|
|
// m.put("id", t.getCode()); |
|
|
|
// m.put("name", t.getMessage()); |
|
|
|
// m.put("isFixedPrice", t.isFixedPrice()); |
|
|
|
// m.put("isDeposit", t.isDeposit()); |
|
|
|
// list.add(m); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// return new ResultData(list); |
|
|
|
// } |
|
|
|
|
|
|
|
// /** |
|
|
|
// * 账单临时类型(可自定义的) |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @GetMapping("otherBillTypes") |
|
|
|
// public ResultData otherBillTypes() { |
|
|
|
// List<Map> list = new ArrayList<Map>(); |
|
|
|
// for (EnumBillAllType t : EnumBillAllType.values()) { |
|
|
|
// if (t == EnumBillAllType.OTHER || t == EnumBillAllType.OTHER_DEPOSIT) { |
|
|
|
// Map m = new HashMap(); |
|
|
|
// m.put("id", t.getCode()); |
|
|
|
// m.put("name", t.getMessage()); |
|
|
|
// m.put("isFixedPrice", t.isFixedPrice()); |
|
|
|
// m.put("isDeposit", t.isDeposit()); |
|
|
|
// list.add(m); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// return new ResultData(list); |
|
|
|
// } |
|
|
|
|
|
|
|
@GetMapping("receiveCashierTypes") |
|
|
|
public ResultData receiveCashierTypes() { |
|
|
|
List<Map> list = new ArrayList<Map>(); |
|
|
|
@@ -134,6 +95,7 @@ public class WxFinanceController extends BaseController { |
|
|
|
public ResultData feesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
record.setFeesType(EnumFeesType.NOMAL.getCode()); |
|
|
|
//record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); |
|
|
|
PageInfo<WxFinanceFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -148,6 +110,7 @@ public class WxFinanceController extends BaseController { |
|
|
|
public ResultData advanceFeesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
record.setFeesType(EnumFeesType.ADVANCE.getCode()); |
|
|
|
//record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); |
|
|
|
PageInfo<WxFinanceFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -206,6 +169,16 @@ public class WxFinanceController extends BaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("预收科目新增修改") |
|
|
|
@PostMapping("saveAdvanceFees") |
|
|
|
public ResultData saveAdvanceType(@RequestBody WxFinanceFees record) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setFeesType(EnumFeesType.ADVANCE.getCode()); |
|
|
|
record.setIsDespoit(EnumYesOrNo.NO.getCode()); |
|
|
|
wxEnergyService.saveOrUpdateFees(record); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("feesUpdateIsDel") |
|
|
|
public ResultData feesUpdateIsDel(@RequestBody WxFinanceFees record) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
@@ -242,16 +215,6 @@ public class WxFinanceController extends BaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("预收科目新增修改") |
|
|
|
@PostMapping("saveAdvanceFees") |
|
|
|
public ResultData saveAdvanceType(@RequestBody WxFinanceFees record) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
//record.setBillType(EnumBillAllType.ADVANCE.getCode()); |
|
|
|
//record.setFixedPrice(EnumYesOrNo.YES.getCode()); |
|
|
|
wxEnergyService.saveOrUpdateFees(record); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("增加临时费用") |
|
|
|
@PostMapping("createTempFees") |
|
|
|
public ResultData createTempFees(@RequestBody WxAllBill record) { |
|
|
|
|