Ver código fonte

地址切换

anderx 1 ano atrás
pai
commit
8fe2fef943

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -940,7 +940,7 @@
     tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id
-    left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
+    left join t_order_new o on a.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
     left join department dep on mea.apply_dep =dep.id
     left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on a.aid=ad.id
     left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id =ad2.id

+ 25 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -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());

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -51,12 +51,12 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.3.04
-rd.static.host=//static.jishutao.com/RD/1.0.03
+#static.host=//static.jishutao.com/1.3.04
+static.host=//172.16.1.187/1.3.04
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
-#static.host=//172.16.1.187/1.2.98
+avatar.host=//static.jishutao.com
+rd.static.host=//static.jishutao.com/RD/1.0.03
 
 #\u5FAE\u4FE1\u6253\u5361\u5C0F\u7A0B\u5E8F
 wx.appId=wxff2f5720ed7d7f63