|
|
@@ -787,7 +787,7 @@ public class WxFinanceController extends BaseController { |
|
|
}) |
|
|
}) |
|
|
public ResultData checkOutList(@ModelAttribute WxFinanceCheckOut record, Integer pageNum, Integer pageSize) { |
|
|
public ResultData checkOutList(@ModelAttribute WxFinanceCheckOut record, Integer pageNum, Integer pageSize) { |
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
record.setSortColumns("period desc"); |
|
|
|
|
|
|
|
|
record.setSortColumns("end_date desc"); |
|
|
PageInfo<WxFinanceCheckOut> page = wxFinanceService.checkOutListAsPage(record, pageNum, pageSize); |
|
|
PageInfo<WxFinanceCheckOut> page = wxFinanceService.checkOutListAsPage(record, pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
@@ -796,6 +796,41 @@ public class WxFinanceController extends BaseController { |
|
|
@PostMapping("saveCheckOut") |
|
|
@PostMapping("saveCheckOut") |
|
|
public ResultData saveCheckOut(@RequestBody WxFinanceCheckOut record) { |
|
|
public ResultData saveCheckOut(@RequestBody WxFinanceCheckOut record) { |
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
//是否已经存在年月,或者开始时间,结束时间的 |
|
|
|
|
|
if (StringUtils.isBlank(record.getPeroid())) { |
|
|
|
|
|
return new ResultData(Result.ERROR,"请选择年月"); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == record.getStartDate()) { |
|
|
|
|
|
return new ResultData(Result.ERROR,"请选择开始日期"); |
|
|
|
|
|
} |
|
|
|
|
|
if (null == record.getEndDate()) { |
|
|
|
|
|
return new ResultData(Result.ERROR,"请选择结束日期"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
WxFinanceCheckOut periodFindq = new WxFinanceCheckOut(); |
|
|
|
|
|
periodFindq.updateTenantInfo(record); |
|
|
|
|
|
periodFindq.setPeroid(record.getPeroid()); |
|
|
|
|
|
List<WxFinanceCheckOut> list = wxFinanceService.getCheckOutList(periodFindq); |
|
|
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
|
|
return new ResultData(Result.ERROR,"已存在改年月的结账记录"); |
|
|
|
|
|
} |
|
|
|
|
|
//校验收款单是否都已审核 |
|
|
|
|
|
WxFinanceReceive frq = new WxFinanceReceive(); |
|
|
|
|
|
frq.updateTenantInfo(record); |
|
|
|
|
|
frq.setReceiveDateBegin(record.getStartDate()); |
|
|
|
|
|
frq.setReceiveDateEnd(record.getEndDate()); |
|
|
|
|
|
List<Integer> statusList = new ArrayList<Integer>(); |
|
|
|
|
|
statusList.add(EnumFinanceReceiveStatus.NORMAL.getCode()); |
|
|
|
|
|
statusList.add(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); |
|
|
|
|
|
statusList.add(EnumFinanceReceiveStatus.AUDITING.getCode()); |
|
|
|
|
|
statusList.add(EnumFinanceReceiveStatus.AUDITING_REJECT.getCode()); |
|
|
|
|
|
frq.setStatusList(statusList); |
|
|
|
|
|
frq.setIsFinish(EnumYesOrNo.NO.getCode()); |
|
|
|
|
|
List<WxFinanceReceive> relist = wxFinanceService.findReceiveList(frq); |
|
|
|
|
|
if (null != relist && relist.size() > 0 ) { |
|
|
|
|
|
return new ResultData(Result.ERROR,"存在未审核的单据"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
wxFinanceService.saveOrUpdateCheckOut(record, getUser()); |
|
|
wxFinanceService.saveOrUpdateCheckOut(record, getUser()); |
|
|
return new ResultData(); |
|
|
return new ResultData(); |
|
|
} |
|
|
} |
|
|
|