Selaa lähdekoodia

Merge branch 'test2' into test

anderx 1 vuosi sitten
vanhempi
commit
7500f2fa71

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

@@ -1059,11 +1059,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         and dep.approval_aid= #{aid,jdbcType=VARCHAR}
       </if>
       <if test="approval ==0">
-        and a.process_status in(5)
+        and a.process_status in(4)
         and a.approval = 0
       </if>
       <if test="approval ==1">
-        and a.process_status in(5)
+        and a.process_status in(4)
         and a.approval in
         <if test="manageType ==0">
           (1)

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

@@ -438,7 +438,7 @@ public class ExpenseAccountController extends CertifyApiController {
     }
 
     /**
-     * 订单报销情&公出详情计算
+     * 订单报销情&公出详情计算触发接口
      */
     @RequestMapping(value = "/pushExpenseTotalAmount",method = RequestMethod.GET)
     public Result pushExpenseTotalAmount(){