|
|
@@ -405,13 +405,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
public Object updateTypeOther(Integer id, String typeOther,String remarks,String orderNo) {
|
|
|
ExpenseAccount ea = new ExpenseAccount();
|
|
|
ea.setId(id);
|
|
|
- if (StringUtils.isNotEmpty(typeOther))ea.setTypeOther(typeOther);
|
|
|
- if (StringUtils.isNotEmpty(remarks))ea.setRemarks(remarks);
|
|
|
- if (StringUtils.isNotEmpty(orderNo)){
|
|
|
- ea.setOrderNo(orderNo);
|
|
|
- ea.setTargetType(1);
|
|
|
+ if (StringUtils.isNotEmpty(typeOther)){
|
|
|
+ ea.setTypeOther(typeOther);
|
|
|
+ expenseAccountMapper.updateByPrimaryKeySelective(ea);
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(remarks)){
|
|
|
+ ea.setRemarks(remarks);
|
|
|
+ expenseAccountMapper.updateByPrimaryKeySelective(ea);
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(orderNo)){
|
|
|
+ ea.setTargetType(0);
|
|
|
+ expenseAccountMapper.updateRemoveOrderNo(ea);
|
|
|
+ }else {
|
|
|
+
|
|
|
}
|
|
|
- expenseAccountMapper.updateByPrimaryKeySelective(ea);
|
|
|
if (StringUtils.isNotEmpty(typeOther)){
|
|
|
MainExpenseAccount mainExpenseAccount = expenseAccountMapper.selectbySonId(id);
|
|
|
StringBuffer types=new StringBuffer();
|