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

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

@@ -496,6 +496,10 @@
     <if test="expenseMain != null">
       and a.expense_main= #{expenseMain}
     </if>
+    <if test="secondaryType != null">
+      and a.secondary_type= #{secondaryType}
+    </if>
+
     order by a.status,a.create_time desc
     <if test="page_sql !=null">
       ${page_sql}
@@ -563,6 +567,9 @@
     <if test="expenseMain != null">
       and a.expense_main = #{expenseMain}
     </if>
+    <if test="secondaryType != null">
+      and a.secondary_type= #{secondaryType}
+    </if>
   </select>
 
   <select id="selectExpenseAccountTotalAmount" resultType="java.lang.Integer">
@@ -626,6 +633,9 @@
     <if test="expenseMain != null">
       and a.expense_main = #{expenseMain}
     </if>
+    <if test="secondaryType != null">
+      and a.secondary_type= #{secondaryType}
+    </if>
   </select>
 
 

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

@@ -20,10 +20,19 @@ public class InputPageListBo {
     private String payDep;
     private String checkNo;
     private Integer expenseMain;
+    private Integer secondaryType;
 
     private Integer pageNo;
     private Integer pageSize;
 
+    public Integer getSecondaryType() {
+        return secondaryType;
+    }
+
+    public void setSecondaryType(Integer secondaryType) {
+        this.secondaryType = secondaryType;
+    }
+
     public Integer getExpenseMain() {
         return expenseMain;
     }

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

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