Browse Source

报销开发

anderx 2 years ago
parent
commit
dd6cb09206

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

@@ -402,7 +402,12 @@
     <if test="processStatus ==1">
       eae.type eaeType,
     </if>
+    <if test="expenseMain ==0">
       mea.status  ,mea.examine_name examineName,mea.check_no checkNo,
+    </if>
+    <if test="expenseMain ==1">
+      a.status  ,a.examine_name examineName,a.check_no checkNo,
+    </if>
     f.name depName,d2.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
     b.name appDepName, c.name payDepName
     from expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
@@ -464,7 +469,7 @@
       and a.pay_dep = #{payDep}
     </if>
     <if test="expenseMain != null">
-       #{expenseMain}
+      and a.expense_main= #{expenseMain}
     </if>
     order by a.status,a.create_time desc
     <if test="page_sql !=null">

+ 3 - 3
src/main/java/com/goafanti/expenseAccount/bo/InputPageListBo.java

@@ -19,16 +19,16 @@ public class InputPageListBo {
     private String applyDep;
     private String payDep;
     private String checkNo;
-    private String expenseMain;
+    private Integer expenseMain;
 
     private Integer pageNo;
     private Integer pageSize;
 
-    public String getExpenseMain() {
+    public Integer getExpenseMain() {
         return expenseMain;
     }
 
-    public void setExpenseMain(String expenseMain) {
+    public void setExpenseMain(Integer expenseMain) {
         this.expenseMain = expenseMain;
     }
 

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

@@ -894,7 +894,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getType()!=null)param.put("type",in.getType());
         if (in.getCheckNo()!=null)param.put("checkNo",in.getCheckNo());
         //固定传0查看子列表
-        if (in.getExpenseMain()!=null)param.put("expenseMain",0);
+        in.setExpenseMain(1);
+        if (in.getExpenseMain()!=null)param.put("expenseMain",in.getExpenseMain());
     }
 
     /**