分页方法调用调整

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@@ -102,9 +102,9 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("categoryprojectlist")
-	public Result<CategoryProjectResultDTO> categoryProjectList(@RequestBody CategoryProjectFormDTO formDTO) {
+	public Result<CategoryProjectResultDTO> categoryProjectList(@LoginUser TokenDto tokenDto, @RequestBody CategoryProjectFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class);
-        //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        formDTO.setCustomerId(tokenDto.getCustomerId());
 		return new Result<CategoryProjectResultDTO>().ok(govProjectService.categoryProjectList(formDTO));
 	}
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -192,7 +192,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         do {
             //1.一千条一循环查询节点数据，封装每个组织对应数据
             projectEntity.setPageNo(pageNo);
-            processList = projectProcessService.getProcessList(projectEntity);
+            processList = projectProcessService.getProcessAgencyList(projectEntity);
             size = processList.size();
             pageNo++;
             //遍历删除项目节点表查询的无效数据
@@ -247,8 +247,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 if (mapList.containsKey(agency.getId())) {
                     entity = mapList.get(agency.getId());
                     entity.setProjectTotal(entity.getProjectTotal() + projectTotal.intValue());
-                    entity.setPendingTotal(entity.getProjectTotal() - closedTotal.intValue());
                     entity.setClosedTotal(entity.getClosedTotal() + closedTotal.intValue());
+                    entity.setPendingTotal(entity.getProjectTotal() - entity.getClosedTotal());
                     if (projectTotal.intValue() > NumConstant.ZERO) {
                         entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) entity.getProjectTotal())));
                         entity.setClosedRatio(new BigDecimal(numberFormat.format((float) entity.getClosedTotal() / (float) entity.getProjectTotal())));
@@ -286,7 +286,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         do {
             //3.一千条一循环查询项目数据，封装每个组织对应数据
             projectEntity.setPageNo(num);
-            projectList = projectService.getProjectList(projectEntity);
+            projectList = projectService.getProjectAgencyList(projectEntity);
             size = projectList.size();
             num++;
             //遍历删除项目主表查询的无效数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -45,6 +45,7 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
      **/
     List<ProjectProcessEntity> getProcessList(ProjectEntity projectEntity);
+    List<ProjectProcessEntity> getProcessAgencyList(ProjectEntity projectEntity);
 
     /**
      * 根据客户查询项目处理进展

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -47,6 +47,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @Description 根据客户Id查询客户项目业务表有效数据
      **/
     List<ProjectEntity> getProjectList(ProjectEntity projectEntity);
+    List<ProjectEntity> getProjectAgencyList(ProjectEntity projectEntity);
 
     /**
      * 已结案项目统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -63,6 +63,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      **/
     @Override
     public List<ProjectProcessEntity> getProcessList(ProjectEntity projectEntity) {
+        return baseDao.selectProcessList(projectEntity);
+    }
+    @Override
+    public List<ProjectProcessEntity> getProcessAgencyList(ProjectEntity projectEntity) {
         PageHelper.startPage(projectEntity.getPageNo(), projectEntity.getPageSize());
         return baseDao.selectProcessList(projectEntity);
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -55,6 +55,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 **/
 	@Override
 	public List<ProjectEntity> getProjectList(ProjectEntity projectEntity) {
+		return baseDao.selectProjectList(projectEntity);
+	}
+	@Override
+	public List<ProjectEntity> getProjectAgencyList(ProjectEntity projectEntity) {
 		PageHelper.startPage(projectEntity.getPageNo(), projectEntity.getPageSize());
 		return baseDao.selectProjectList(projectEntity);
 	}