diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java index 559e02070a..f153301c9a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java @@ -128,7 +128,7 @@ public interface ProjectProcessDao extends BaseDao { * @author wangc * @date 2020.10.23 11:13 */ - List selectProjectOrgPeriodDirectly(@Param("customerId") String customerId, @Param("projectId") String projectId); + List selectProjectOrgPeriodDirectly(@Param("customerId") String customerId, @Param("datetId")String datetId, @Param("projectId") String projectId); /** * @param projects diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index 164387d70b..551ba144a4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java @@ -452,7 +452,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { @Override public void extractProjectPeriodData(ExtractOriginFormDTO param) { List extractData = - projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getObjectId()); + projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getDateId(), param.getObjectId()); List formattingData = new LinkedList<>(); extractData.forEach(original -> { FactOriginProjectOrgPeriodDailyEntity dest diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java index 11e6f99e26..afc59242bb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java @@ -112,7 +112,7 @@ public interface ProjectProcessService extends BaseService * @author wangc * @date 2020.10.23 09:10 */ - List getProjectPeriodDirectly(String customerId, String projectId); + List getProjectPeriodDirectly(String customerId, String datetId, String projectId); /** * 获取办结组织 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java index 97df52fdbe..f976d68ac7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java @@ -101,15 +101,15 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl * @author wangc * @date 2020.10.23 09:10 */ @Override - public List getProjectPeriodDirectly(String customerId, String projectId) { - return baseDao.selectProjectOrgPeriodDirectly(customerId, projectId); + public List getProjectPeriodDirectly(String customerId, String datetId, String projectId) { + return baseDao.selectProjectOrgPeriodDirectly(customerId, datetId, projectId); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml index 4173e8cecb..a1e6a233d0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml @@ -177,7 +177,7 @@ FROM PROJECT_STAFF staff INNER JOIN PROJECT_ORG_RELATION relation ON staff.ID = relation.PROJECT_STAFF_ID AND relation.DEL_FLAG = '0' - + AND (DATE_FORMAT(FIRST_DEALT_DATE,"%Y%m%d") >= #{datetId} OR DATE_FORMAT(HANDLED_DATE,"%Y%m%d") >= #{datetId} OR DATE_FORMAT(INFORMED_DATE,"%Y%m%d") >= #{datetId}) WHERE staff.DEL_FLAG = '0' AND staff.PROJECT_ID = #{projectId}