|
@@ -629,8 +629,16 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
|
|
|
}
|
|
|
//主表编辑 flag==4
|
|
|
else if ("4".equals(expenseInfo.getFlag())) {
|
|
|
- expenseInfo.setStatusFlag(StatusEnum.COST_RECEIVED.getFlag());
|
|
|
- expenseInfo.setStatus(StatusEnum.COST_RECEIVED.getName());
|
|
|
+ //收入
|
|
|
+ if ("1".equals(expenseInfo1.getExpensesType())) {
|
|
|
+ expenseInfo.setStatusFlag(StatusEnum.TO_BE_CONFIRMED.getFlag());
|
|
|
+ expenseInfo.setStatus(StatusEnum.TO_BE_CONFIRMED.getName());
|
|
|
+ }
|
|
|
+ //支出
|
|
|
+ else {
|
|
|
+ expenseInfo.setStatusFlag(StatusEnum.COST_PAYMENT.getFlag());
|
|
|
+ expenseInfo.setStatus(StatusEnum.COST_PAYMENT.getName());
|
|
|
+ }
|
|
|
//合同粮款校验
|
|
|
if ("1".equals(expenseInfo1.getCostType()) && "1".equals(expenseInfo1.getExpensesPurpose())) {
|
|
|
ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|