diff --git a/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java b/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java index 40ef18a..121c537 100644 --- a/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java +++ b/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java @@ -114,6 +114,17 @@ public class BusinessZcmxController { return R.ok().put("page", page); } + + /** + * 列表-支出查询合计 + */ + @RequestMapping("/zccxhj") + @RequiresPermissions("business:businesszcmx:list") + public R zccxhj(@RequestParam Map params){ + Map page = businessOutlayService.getZccxhj(params); + return R.ok().put("page", page); + } + /** * 列表-支出查询 */ diff --git a/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java b/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java index b2946f1..1528c6d 100644 --- a/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java +++ b/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java @@ -132,4 +132,11 @@ public interface BusinessOutlayDao extends BaseMapper { * @return */ List> yzList(Map params); + + + /** + * 列表-支出查询合计 + */ + Map getZccxhj(Map params); + } diff --git a/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java b/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java index 98006bc..69d7cfe 100644 --- a/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java +++ b/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java @@ -60,6 +60,7 @@ public interface BusinessOutlayService extends IService { */ Map getLatestTime() throws ParseException; + /** * 为了传入到 年度总结 * @param outTime @@ -98,5 +99,10 @@ public interface BusinessOutlayService extends IService { */ List> yzList(Map params); + /** + * 列表-支出查询合计 + */ + Map getZccxhj(Map params); + } diff --git a/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java b/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java index cb89ae5..7115982 100644 --- a/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java +++ b/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java @@ -441,4 +441,12 @@ public class BusinessOutlayServiceImpl extends ServiceImpl getZccxhj(Map params){ + return baseMapper.getZccxhj(params); + } + } 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 f42ba6a..8c4088d 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 @@ -221,9 +221,12 @@ public class BusinessPlanServiceImpl extends ServiceImpl - - and a.out_time >= #{start} + + and a.out_time >= #{startTime} - - and a.out_time <= #{end} - - - and date_format(a.out_time, '%Y-%m-%d') between #{startTime} and #{endTime} + + and a.out_time <= #{endTime} and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{gjz},'%') or a.out_money like CONCAT('%',#{gjz},'%') or a.out_nr like CONCAT('%',#{gjz},'%') or @@ -831,4 +828,48 @@ group by outin_date order by outin_date + + + \ No newline at end of file