Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj

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

@@ -185,13 +185,15 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         projectEntity.setCustomerId(customerId);
         projectEntity.setCreatedTime(date);
         projectEntity.setStatus(ProjectConstant.CLOSED);
-        projectEntity.setPageSize(NumConstant.ONE_THOUSAND);
+        projectEntity.setPageSize(NumConstant.FIFTY);
         int pageNo = NumConstant.ONE;
+        int size = NumConstant.ZERO;
         List<ProjectProcessEntity> processList = new ArrayList<>();
         do {
             //1.一千条一循环查询节点数据，封装每个组织对应数据
             projectEntity.setPageNo(pageNo);
             processList = projectProcessService.getProcessList(projectEntity);
+            size = processList.size();
             pageNo++;
             //遍历删除项目节点表查询的无效数据
             if (list.size() > NumConstant.ZERO) {
@@ -248,8 +250,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                     entity.setPendingTotal(entity.getPendingTotal() + projectTotal.intValue() - closedTotal.intValue());
                     entity.setClosedTotal(entity.getClosedTotal() + closedTotal.intValue());
                     if (projectTotal.intValue() > NumConstant.ZERO) {
-                        entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) projectTotal.intValue())));
+                        entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) entity.getProjectTotal())));
-                        entity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue())));
+                        entity.setClosedRatio(new BigDecimal(numberFormat.format((float) entity.getClosedTotal() / (float) entity.getProjectTotal())));
                     }
                     entity.setProjectIncr(entity.getProjectIncr() + projectIncr.intValue());
                     entity.setPendingIncr(entity.getPendingIncr() + projectIncr.intValue());
@@ -267,8 +269,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                     entity.setPendingTotal(projectTotal.intValue() - closedTotal.intValue());
                     entity.setClosedTotal(closedTotal.intValue());
                     if (projectTotal.intValue() > NumConstant.ZERO) {
-                        entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) projectTotal.intValue())));
+                        entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) entity.getProjectTotal())));
-                        entity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue())));
+                        entity.setClosedRatio(new BigDecimal(numberFormat.format((float) entity.getClosedTotal() / (float) entity.getProjectTotal())));
                     }
                     entity.setProjectIncr(projectIncr.intValue());
                     entity.setPendingIncr(projectIncr.intValue());
@@ -276,7 +278,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 }
                 mapList.put(agency.getId(), entity);
             }
-        } while (!CollectionUtil.isEmpty(processList) && processList.size() == NumConstant.ONE_THOUSAND);
+        } while (size == NumConstant.FIFTY);
 
         //二、再分页查询项目表数据，封装每个组织的已结案已解决总数、已结案未解决总数;日增量中已结案已解决总数、已结案未解决总数
         int num = NumConstant.ONE;
@@ -285,6 +287,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
             //3.一千条一循环查询项目数据，封装每个组织对应数据
             projectEntity.setPageNo(num);
             projectList = projectService.getProjectList(projectEntity);
+            size = projectList.size();
             num++;
             //遍历删除项目主表查询的无效数据
             if (list.size() > NumConstant.ZERO) {
@@ -343,8 +346,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                     entity.setResolvedTotal(entity.getResolvedTotal() + resolvedTotal.intValue());
                     entity.setUnresolvedTotal(entity.getUnresolvedTotal() + unResolvedTotal.intValue());
                     if (entity.getClosedTotal() > NumConstant.ZERO) {
-                        entity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) entity.getClosedTotal())));
+                        entity.setResolvedRatio(new BigDecimal(numberFormat.format((float) entity.getResolvedTotal() / (float) entity.getClosedTotal())));
-                        entity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) entity.getClosedTotal())));
+                        entity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) entity.getUnresolvedTotal() / (float) entity.getClosedTotal())));
                     }
                     entity.setResolvedIncr(entity.getResolvedIncr() + resolvedIncr.intValue());
                     entity.setUnresolvedIncr(entity.getUnresolvedIncr() + unResolvedIncr.intValue());
@@ -371,7 +374,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 }
                 mapList.put(agency.getId(), entity);
             }
-        } while (!CollectionUtil.isEmpty(projectList) && projectList.size() == NumConstant.ONE_THOUSAND);
+        } while (size == NumConstant.FIFTY);
 
         List<FactAgencyProjectDailyEntity> projectDateEntityList = new ArrayList<>(mapList.values());
         //三、批量保存数据，先删后增

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

@@ -34,6 +34,7 @@ import com.epmet.dto.screen.ScreenProjectProcessDTO;
 import com.epmet.entity.project.ProjectEntity;
 import com.epmet.entity.project.ProjectProcessEntity;
 import com.epmet.service.project.ProjectProcessService;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -62,6 +63,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      **/
     @Override
     public List<ProjectProcessEntity> getProcessList(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

@@ -28,6 +28,7 @@ import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
 import com.epmet.service.project.ProjectService;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -54,6 +55,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 **/
 	@Override
 	public List<ProjectEntity> getProjectList(ProjectEntity projectEntity) {
+		PageHelper.startPage(projectEntity.getPageNo(), projectEntity.getPageSize());
 		return baseDao.selectProjectList(projectEntity);
 	}
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -5,7 +5,10 @@
 
     <select id="selectProjectList" resultType="com.epmet.entity.project.ProjectEntity">
         SELECT
-            *
+            id,
+            customer_id,
+            agency_id,
+            closed_status
         FROM
             project
         WHERE