Просмотр исходного кода

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

anderx лет назад: 2
Родитель
Сommit
93b25df2b0

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

@@ -806,12 +806,12 @@
     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 and b.status < 4
     <include refid="ExpenseMainSql"/>
       order by if(b.status=3,-1,b.status)  ,b.create_time desc
     ${page_sql}
   </select>
   <sql id="ExpenseMainSql">
+    where 1=1 and b.expense_main =1 and b.status &lt; 4
     <if test="checkNo !=null">
       and b.check_no like concat('%',#{checkNo},'%')
     </if>
@@ -868,7 +868,6 @@
     from expense_account b
     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
     <include refid="ExpenseMainSql"/>
   </select>
 

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

@@ -195,6 +195,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private void addExpenseAccountLogAndNoticEmail(ExpenseAccount in, Integer status, String str) {
         String aid=TokenManager.getAdminId();
         addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
+        if (status==0)in.setProcessStatus(1);
         Admin admin = adminMapper.selectByPrimaryKey(aid);
         if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
             in.setProcessStatus(in.getProcessStatus()+1);
@@ -360,10 +361,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         int maxProcessStatus=0;
         if (!list.isEmpty()){
         OutExpenseAccountLog lastout=list.get(list.size()-1);
-        if (lastout.getStatus()!=3)maxProcessStatus=lastout.getProcessStatus();
+        if (lastout.getStatus()!=3){
+            List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
+            list.addAll(eaelist);
+            }
         }
-        List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
-        list.addAll(eaelist);
         return list;
     }
 
@@ -770,10 +772,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
             if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
             if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
-            outExpenseAccount.setProcessStatus(1);
             addExpenseAccountExamine(in.getId(),update);
             if (outExpenseAccount.getStatus()==0){
-                addExpenseAccountLogAndNoticEmail(outExpenseAccount,0,"发起报销审核");
+                addExpenseAccountLogAndNoticEmail(outExpenseAccount,outExpenseAccount.getStatus(),"发起报销审核");
             }else if (outExpenseAccount.getStatus()==3){
                 addExpenseAccountLogAndNoticEmail(outExpenseAccount,4,"修改并发起审核");
             }