Browse Source

报销开发

anderx 2 years ago
parent
commit
1509247409

+ 5 - 0
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -261,6 +261,11 @@ public class ExpenseAccountController extends CertifyApiController {
         return newExcelUtil.exportExcel(list,"报销统计",uploadPath);
     }
 
+    /**
+     * 合并报销
+     * @param ids
+     * @return
+     */
     @RequestMapping(value = "/merge",method = RequestMethod.GET)
     public Result merge(String ids){
         Result res =new Result();

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

@@ -902,7 +902,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         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)in.setExpenseMain(0);
         if (in.getExpenseMain()!=null)param.put("expenseMain",in.getExpenseMain());
     }