diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java index 47b9cdf..fbb49fb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java @@ -4,6 +4,7 @@ package com.easy.admin.modules.huzhou.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.easy.admin.common.core.annotation.ResponseResult; +import com.easy.admin.modules.huzhou.vo.CountOV; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import com.easy.admin.common.api.vo.Result; @@ -12,6 +13,7 @@ import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.ProjectApproveOV; +import com.easy.admin.modules.huzhou.vo.ProjectProgressOV; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -168,4 +170,15 @@ public class HuzhouProjectController { public void batchdownloadProject(HttpServletResponse response,HuzhouProjectinfo projectinfo){ projectinfoService.batchdownloadProject(response,projectinfo); } + /** + * 项目统计 + * @param + * @param + */ + @GetMapping("/count") + public Result CountProject(){ + ProjectProgressOV result = projectinfoService.countProjectProgress(); + return Result.OK(result); + + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java index 236e54a..474097d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import org.apache.ibatis.annotations.Mapper; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -37,6 +38,6 @@ public interface HuzhouProjectinfoMapper extends BaseMapper { * @param info 查询条件 * @return List */ - List getProjectAndChildInfoPageList( HuzhouProjectinfo info); + List getProjectAndChildInfoPageList(@Param("info") HuzhouProjectinfo info); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java index 75f150d..00c3016 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java @@ -95,4 +95,8 @@ public interface IHuzhouPlaninfoService extends IService { void downloadPlanInfo(HttpServletResponse response, String projectid); List