|
|
@@ -1122,6 +1122,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
|
public MainExpenseAccount mainExpense(Integer id) {
|
|
|
MainExpenseAccount res = expenseAccountMapper.selectByMainId(id);
|
|
|
+ pushData(res);
|
|
|
res.setExamine(0);
|
|
|
if (res.getAid().equals(TokenManager.getAdminId())){
|
|
|
res.setExamine(2);
|
|
|
@@ -1131,6 +1132,30 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ private void pushData(MainExpenseAccount res) {
|
|
|
+ List<SonExpenseAccount> sonList = res.getSonList();
|
|
|
+ sonList.stream().forEach(e->{
|
|
|
+ if (StringUtils.isNotEmpty(e.getUserNames())){
|
|
|
+ String userNames = e.getUserNames();
|
|
|
+ String districtName = e.getDistrictName();
|
|
|
+ int start=userNames.indexOf("[");
|
|
|
+ if (start>0){
|
|
|
+ userNames = userNames.substring(0,start);
|
|
|
+ districtName=districtName.replace(userNames,"");
|
|
|
+ e.setUserNames(userNames);
|
|
|
+ e.setDistrictName(districtName);
|
|
|
+ }else {
|
|
|
+ districtName=districtName.replace(userNames,"");
|
|
|
+ e.setDistrictName(districtName);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public Object updateMain(MainExpenseAccount in) {
|
|
|
OutExpenseAccount outExpenseAccount = expenseAccountMapper.selectByid(in.getId());
|