Procházet zdrojové kódy

报销开发费用明细列表,费用列表新增
主报销查询修改

anderx před 2 roky
rodič
revize
fae9b40829

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

@@ -806,9 +806,9 @@
     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
-    where 1=1 and b.expense_main =1
+    where 1=1 and b.expense_main =1 and b.status < 4
     <include refid="ExpenseMainSql"/>
-      order by b.status ,b.create_time desc
+      order by if(b.status=3,-1,b.status)  ,b.create_time desc
     ${page_sql}
   </select>
   <sql id="ExpenseMainSql">

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

@@ -779,8 +779,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }
         }else if (in.getStatus()==4){
             expenseAccountMapper.updateByMainId(in.getId(),0);
+            addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
         }
-
         update.setStatus(in.getStatus());
         update.setProcessStatus(outExpenseAccount.getProcessStatus());
         update.setId(in.getId());