diff --git a/src/main/java/io/renren/modules/business/controller/BusinessOutlayController.java b/src/main/java/io/renren/modules/business/controller/BusinessOutlayController.java index 3c5e911..239fc95 100644 --- a/src/main/java/io/renren/modules/business/controller/BusinessOutlayController.java +++ b/src/main/java/io/renren/modules/business/controller/BusinessOutlayController.java @@ -344,8 +344,11 @@ public class BusinessOutlayController { */ @RequestMapping("/export") public void export(HttpServletResponse response, HttpServletRequest request){ + String start = request.getParameter("start"); + String end = request.getParameter("end"); Map params = new HashMap<>(); - //params.put("writeUserId",getUserId()); + params.put("start",start); + params.put("end",end); List list = businessOutlayService.pcListNoPage(params); ExcelUtil util = new ExcelUtil(BusinessOutlayEntity.class); R r = util.exportExcel(list, "支出明细"); diff --git a/src/main/java/io/renren/modules/business/controller/BusinessOutlayIncomeController.java b/src/main/java/io/renren/modules/business/controller/BusinessOutlayIncomeController.java index 102d31d..d876915 100644 --- a/src/main/java/io/renren/modules/business/controller/BusinessOutlayIncomeController.java +++ b/src/main/java/io/renren/modules/business/controller/BusinessOutlayIncomeController.java @@ -211,8 +211,12 @@ public class BusinessOutlayIncomeController { */ @RequestMapping("/export") public void export(HttpServletResponse response, HttpServletRequest request){ + String start = request.getParameter("start"); + String end = request.getParameter("end"); Map params = new HashMap<>(); params.put("writeUserId",getUserId()); + params.put("start",start); + params.put("end",end); List list = businessOutlayIncomeService.pcListNoPage(params); ExcelUtil util = new ExcelUtil(BusinessOutlayIncomeEntity.class); R r = util.exportExcel(list, "收支总结"); diff --git a/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java b/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java index 8c4088d..affe3ec 100644 --- a/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java +++ b/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java @@ -163,7 +163,8 @@ public class BusinessPlanServiceImpl extends ServiceImpl 0) { for (BusinessPlanEntity i : list) { @@ -216,17 +217,15 @@ public class BusinessPlanServiceImpl extends ServiceImpl 0) { for (BusinessTotalEntity i : list) { @@ -125,9 +126,9 @@ public class BusinessTotalServiceImpl extends ServiceImpl out_project = #{item} - GROUP BY out_type + GROUP BY out_project,out_type ) t GROUP BY out_project) a RIGHT Join (SELECT * FROM business_project WHERE diff --git a/src/main/resources/mapper/business/BusinessProjectDao.xml b/src/main/resources/mapper/business/BusinessProjectDao.xml index d4a31a8..08beeba 100644 --- a/src/main/resources/mapper/business/BusinessProjectDao.xml +++ b/src/main/resources/mapper/business/BusinessProjectDao.xml @@ -78,6 +78,9 @@ LEFT JOIN business_worker g on a.project_lly_id = g.user_id LEFT JOIN (select distinct total_project_id,select_persion_id from business_total) gr on a.project_id = gr.total_project_id + + and FIND_IN_SET(a.project_id,(select GROUP_CONCAT(project_id) FROM business_contract where contract_jsdw_id = #{projectJsdwId})) = 0 + and ( a.project like CONCAT('%',#{gjz},'%') or a.project_new_name like CONCAT('%',#{gjz},'%') or