Browse Source

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

anderx 2 years ago
parent
commit
3e1318a4df

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

@@ -833,10 +833,8 @@
     from expense_relationship a
     left join expense_account b on a.id =b.id
     left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
-    left join t_order_new o on b.order_no =o.order_no
-    left join expense_account c on a.ea_id =c.id
-    left join admin ad on b.aid=ad.id
-    left join department adDep on ad .department_id=adDep.id
+    left join t_order_new o on b.order_no =o.order_no left join expense_account c on a.ea_id =c.id
+    left join admin ad on b.aid=ad.id left join department adDep on ad .department_id=adDep.id
     where 1=1 and b.expense_main =1
     <if test=" status != null">
       and b.status = #{status}

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -333,7 +333,7 @@ public class ExpenseAccountController extends CertifyApiController {
      * @param in
      * @return
      */
-    @RequestMapping(value = "/updateMain",method = RequestMethod.GET)
+    @RequestMapping(value = "/updateMain",method = RequestMethod.POST)
     public Result updateMain(MainExpenseAccount in){
         Result res =new Result();
         if (in.getId()==null){