Browse Source

报销开发子报销列表新增字段

anderx 2 years ago
parent
commit
7083e38e14

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

@@ -441,9 +441,10 @@
     from expense_account a
     left join admin d on a.aid =d.id left join t_order_new e on a.order_no =e.order_no
     left join t_order_mid tm on a.order_no =tm.order_no left join department f on d.department_id =f.id
-    left join admin d2 on f.finance_id =d2.id left join expense_relationship er on a.id=er.ea_id
-      left join expense_account mea on  er.id=mea.id
+    left join admin d2 on f.finance_id =d2.id
     <if test="expenseMain ==0">
+      left join expense_relationship er on a.id=er.id
+      left join expense_account mea on  er.ea_id=mea.id
       left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
     </if>
     <if test="expenseMain ==1">

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

@@ -52,11 +52,11 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.98
+#static.host=//static.jishutao.com/1.2.98
 rd.static.host=//static.jishutao.com/RD/1.0.03
 #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.81
+static.host=//172.16.1.187/1.2.98
 
 #\u5FAE\u4FE1\u6253\u5361\u5C0F\u7A0B\u5E8F
 wx.appId=wxff2f5720ed7d7f63