|
|
|
@@ -1871,7 +1871,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
ffr.setId(idWorker.nextId()); |
|
|
|
ffr.setCreateTime(new Date()); |
|
|
|
ffr.setUpdateTime(new Date()); |
|
|
|
ffr.setStatus(record.getStatus()); |
|
|
|
ffr.setStatus(EnumFinanceFinishStatus.UN_AUDIT.getCode()); |
|
|
|
ffr.setFinishId(record.getId()); |
|
|
|
ffr.setReceiveId(receiveId); |
|
|
|
wxFinanceFinishReceiveMapper.insert(ffr); |
|
|
|
@@ -1889,5 +1889,39 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
}; |
|
|
|
return wxFinanceFinishReceiveMapper.findList(ffrq); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxFinanceReceive> findAuditedFinishReceiveList(WxFinanceFinish record) { |
|
|
|
WxFinanceFinishReceive ffrq = new WxFinanceFinishReceive(); |
|
|
|
ffrq.updateTenantInfo(record); |
|
|
|
ffrq.setFinishId(record.getId()); |
|
|
|
List<Long> receiveIds = wxFinanceFinishReceiveMapper.findReceiveIdList(ffrq); |
|
|
|
if (null != receiveIds && receiveIds.size() > 0 ) { |
|
|
|
WxFinanceReceive frq = new WxFinanceReceive(); |
|
|
|
frq.updateTenantInfo(record); |
|
|
|
frq.setIds(receiveIds); |
|
|
|
frq.setIsFinish(EnumYesOrNo.YES.getCode()); |
|
|
|
List<Integer> statusList = new ArrayList<Integer>(); |
|
|
|
statusList.add(EnumFinanceReceiveStatus.NORMAL.getCode()); |
|
|
|
statusList.add(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); |
|
|
|
frq.setStatusList(statusList); |
|
|
|
return wxFinanceReceiveMapper.findList(frq); |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
@Override |
|
|
|
public void deleteFinish(WxFinanceFinish record) { |
|
|
|
//删除之前的单据关联 |
|
|
|
WxFinanceFinishReceive frdel = new WxFinanceFinishReceive(); |
|
|
|
frdel.updateTenantInfo(record); |
|
|
|
frdel.setFinishId(record.getId());; |
|
|
|
wxFinanceFinishReceiveMapper.deleteByCondition(frdel); |
|
|
|
|
|
|
|
wxFinanceFinishMapper.deleteByConditon(record); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |