anderx před 2 roky
rodič
revize
2e3f9b050e

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

@@ -459,9 +459,9 @@
     from expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
     left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
     left join t_order_mid tm on a.order_no =tm.order_no left join admin ad on a.aid=ad.id
-    where a.status=2
+    where 1=1
     <if test="name != null">
-      and ad.name like concat('%','y','%')
+      and ad.name like concat('%',#{name},'%')
     </if>
     <if test="depId != null">
       and ad.department_id = #{depId}

+ 1 - 2
src/main/java/com/goafanti/expenseAccount/bo/InputExpenseAccountDetails.java

@@ -10,8 +10,7 @@ public class InputExpenseAccountDetails  extends ExpenseAccountDetails {
     @NotNull
     @Param(name = "报销编号")
     private Integer eaid;
-    @NotNull
-    @Param(name="时间")
+
     private String agreeTimes;
 
     public String getAgreeTimes() {

+ 3 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -120,7 +120,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setProcessStatus(1);
         }
         //计算总金额
-        in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
+        if (in.getTotalAmount()==null){
+            in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
+        }
         if (useEA.getStatus()==0){
             addExpenseAccountLogAndNoticEmail(in,1,"发起报销审核");
         }else if (useEA.getStatus()==3){