diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java index 1d8b7eb7ba..927e157db0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java @@ -134,5 +134,5 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao lists); - - /** - * @Description 删除治理能力旧纪录 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/19 4:31 下午 - */ - void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId); - -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java deleted file mode 100644 index 198bcf57dc..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.epmet.service.evaluationindex.extract; - -import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; - -import java.util.List; - -/** - * 党建能力-网格相关事实表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-09-19 - */ -public interface FactIndexPartyAbilityGridMonthlyService{ - - /** - * @Description 网格党建能力插入 - * @param lists - * @author zxc - * @date 2020/9/19 10:32 上午 - */ - void insertPartyAbility(List lists); - - /** - * @Description 删除旧的党建能力记录 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/19 10:45 上午 - */ - void deleteOldPartyAbility(String customerId,String monthId); -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java index 86eff5d1ca..04dcd9ab0b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java @@ -19,6 +19,8 @@ import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; import com.epmet.dto.extract.result.*; import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity; import com.epmet.service.evaluationindex.extract.*; +import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService; +import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService; import com.epmet.service.stats.FactArticlePublishedGridDailyService; import com.epmet.service.stats.user.FactRegUserGridMonthlyService; import lombok.extern.slf4j.Slf4j; @@ -48,10 +50,6 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { @Autowired private IssueExtractService issueExtractService; @Autowired - private FactIndexGovernAbilityGridMonthlyService governAbilityGridMonthlyService; - @Autowired - private FactIndexPartyAbilityGridMonthlyService partyAbilityGridMonthlyService; - @Autowired private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; @Autowired private FactOriginProjectMainDailyService projectMainService; @@ -67,7 +65,10 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { private GroupExtractService groupExtractService; @Autowired private FactOriginTopicLogDailyService topicLogService; - + @Autowired + private FactIndexPartyAblityOrgMonthlyService partyAbilityOrgMonthlyService; + @Autowired + private FactIndexGovrnAblityOrgMonthlyService governAbilityOrgMonthlyService; @Autowired private FactIndexServiceAbilityGridMonthlyService factIndexServiceAbilityGridMonthlyService; @Autowired @@ -224,7 +225,11 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { }); } }); - delAndInsertPartyAbility(result,customerId,monthId); + delPartyAbility(customerId, monthId); + List> partition = ListUtils.partition(result, NumConstant.ONE_HUNDRED); + partition.forEach(r -> { + insertPartyAbility(r); + }); return true; } @@ -372,7 +377,11 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { } }); }); - delAndInsertGovernAbility(result,customerId,monthId); + delGovernAbility(customerId, monthId); + List> resultList = ListUtils.partition(result, NumConstant.ONE_HUNDRED); + resultList.forEach(r -> { + insertGovernAbility(r); + }); return true; } @@ -574,30 +583,58 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { } /** - * @Description 删除并插入党建能力的记录 + * @Description 插入党建能力的记录 * @param result * @author zxc * @date 2020/9/19 4:06 下午 */ @Transactional(rollbackFor = Exception.class) - public void delAndInsertPartyAbility(List result,String customerId,String monthId){ + public void insertPartyAbility(List result){ if (!CollectionUtils.isEmpty(result)){ - partyAbilityGridMonthlyService.deleteOldPartyAbility(customerId, monthId); - partyAbilityGridMonthlyService.insertPartyAbility(result); + partyAbilityOrgMonthlyService.insertPartyAbility(result); } } /** - * @Description 删除并插入治理能力的记录 + * @Description 删除党建能力的记录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 4:06 下午 + */ + @Transactional(rollbackFor = Exception.class) + public void delPartyAbility(String customerId,String monthId){ + Integer delNum; + do { + delNum = partyAbilityOrgMonthlyService.deleteOldPartyAbility(customerId, monthId); + }while (delNum > NumConstant.ZERO); + } + + /** + * @Description 插入治理能力的记录 * @param result * @author zxc * @date 2020/9/19 4:06 下午 */ @Transactional(rollbackFor = Exception.class) - public void delAndInsertGovernAbility(List result,String customerId,String monthId){ + public void insertGovernAbility(List result){ if (!CollectionUtils.isEmpty(result)){ - governAbilityGridMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId); - governAbilityGridMonthlyService.insertGovernAbilityRecord(result); + governAbilityOrgMonthlyService.insertGovernAbilityRecord(result); } } + + /** + * @Description 删除治理能力的记录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 4:06 下午 + */ + @Transactional(rollbackFor = Exception.class) + public void delGovernAbility(String customerId,String monthId){ + Integer delNum; + do { + delNum = governAbilityOrgMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId); + }while (delNum > NumConstant.ZERO); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java deleted file mode 100644 index 64096f1935..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.epmet.service.evaluationindex.extract.impl; - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao; -import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; -import com.epmet.service.evaluationindex.extract.FactIndexGovernAbilityGridMonthlyService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 治理能力-网格相关事实表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-09-19 - */ -@Service -@Slf4j -@DataSource(DataSourceConstant.EVALUATION_INDEX) -public class FactIndexGovernAbilityGridMonthlyServiceImpl implements FactIndexGovernAbilityGridMonthlyService { - - @Autowired - private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; - - @Override - public void insertGovernAbilityRecord(List lists) { - governAbilityDao.insertGovernAbilityRecord(lists); - } - - @Override - public void deleteOldGovernAbilityRecord(String customerId, String monthId) { - governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId); - } -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java deleted file mode 100644 index 922e429ac9..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.epmet.service.evaluationindex.extract.impl; - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao; -import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; -import com.epmet.service.evaluationindex.extract.FactIndexPartyAbilityGridMonthlyService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 党建能力-网格相关事实表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-09-19 - */ -@Service -@Slf4j -@DataSource(DataSourceConstant.EVALUATION_INDEX) -public class FactIndexPartyAbilityGridMonthlyServiceImpl implements FactIndexPartyAbilityGridMonthlyService { - - @Autowired - private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao; - - @Override - public void insertPartyAbility(List lists) { - partyAbilityGridDao.insertPartyAbility(lists); - } - - @Override - public void deleteOldPartyAbility(String customerId, String monthId) { - partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId); - } -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java index 089fa9fdbd..9c664f4007 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java @@ -137,9 +137,12 @@ public class GroupExtractServiceImpl implements GroupExtractService { List partyIds = userService.getPartymembersByCustomerId(param.getCustomerId()); List heartedIds = userService.getWarmHeartedByCustomerId(param.getCustomerId()); - - factOriginGroupMainDailyDao.updatePartyFlag(partyIds,param.getCustomerId()); - factOriginGroupMainDailyDao.updateHeartedFlag(heartedIds,param.getCustomerId()); + if(!partyIds.isEmpty()) { + factOriginGroupMainDailyDao.updatePartyFlag(partyIds, param.getCustomerId()); + } + if(!heartedIds.isEmpty()) { + factOriginGroupMainDailyDao.updateHeartedFlag(heartedIds, param.getCustomerId()); + } } } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java index c2e3b3a179..272da9faef 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java @@ -1,7 +1,11 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author zhaoqifeng @@ -19,4 +23,21 @@ public interface FactIndexGovrnAblityOrgMonthlyService extends BaseService lists); + + /** + * @Description 删除治理能力旧纪录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 4:31 下午 + */ + Integer deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java index 0227a835f8..cc541f597f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java @@ -1,8 +1,11 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity; +import java.util.List; + /** * @author zhaoqifeng * @dscription @@ -19,4 +22,21 @@ public interface FactIndexPartyAblityOrgMonthlyService extends BaseService lists); + + /** + * @Description 删除旧的党建能力记录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 10:45 上午 + */ + Integer deleteOldPartyAbility(String customerId,String monthId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java index a1665b836c..e2f2170f67 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java @@ -3,11 +3,16 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao; import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao; +import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity; import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author zhaoqifeng * @dscription @@ -16,8 +21,22 @@ import org.springframework.stereotype.Service; @Service @DataSource(DataSourceConstant.EVALUATION_INDEX) public class FactIndexGovrnAblityOrgMonthlyServiceImpl extends BaseServiceImpl implements FactIndexGovrnAblityOrgMonthlyService { + + @Autowired + private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; + @Override public void deleteByCustomer(String customerId, String monthId, String type) { baseDao.deleteByCustomer(customerId, monthId, type); } + + @Override + public void insertGovernAbilityRecord(List lists) { + governAbilityDao.insertGovernAbilityRecord(lists); + } + + @Override + public Integer deleteOldGovernAbilityRecord(String customerId, String monthId) { + return governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java index 7964b2788b..5c66bd92f9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java @@ -3,11 +3,16 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao; import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao; +import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity; import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author zhaoqifeng * @dscription @@ -16,8 +21,22 @@ import org.springframework.stereotype.Service; @Service @DataSource(DataSourceConstant.EVALUATION_INDEX) public class FactIndexPartyAblityOrgMonthlyServiceImpl extends BaseServiceImpl implements FactIndexPartyAblityOrgMonthlyService { + + @Autowired + private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao; + @Override public void deleteByCustomer(String customerId, String monthId, String type) { baseDao.deleteByCustomer(customerId, monthId, type); } + + @Override + public void insertPartyAbility(List lists) { + partyAbilityGridDao.insertPartyAbility(lists); + } + + @Override + public Integer deleteOldPartyAbility(String customerId, String monthId) { + return partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java index ad5ce2728f..71e16ac3a8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -127,6 +128,21 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService })); } + //办结数 + Map agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(customerId,dimId.getMonthId(),"month"); + Map responseMap = factOriginProjectLogDailyService.getAgencyResponseRatio(customerId,dimId.getMonthId(),"month"); + list.forEach(entity ->{ + entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId())); + BigDecimal element = entity.getClosedProjectRatio(); + //办结率 + entity.setClosedProjectRatio( + element.divide(new BigDecimal(entity.getTransferedCount()), NumConstant.SIX, RoundingMode.HALF_UP) + ); + //响应度 + entity.setRespProjectRatio(responseMap.get(entity.getAgencyId())); + }); + + factIndexGovrnAblityOrgMonthlyService.deleteByCustomer(customerId, dimId.getMonthId(), OrgTypeConstant.COMMUNITY); factIndexGovrnAblityOrgMonthlyService.insertBatch(list); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml index d07e74fae7..da7cb183e7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml @@ -71,8 +71,7 @@ DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} - AND - + GROUP_OWNER_ID = #{ownerId} @@ -84,8 +83,7 @@ DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} - AND - + (GROUP_OWNER_ID = #{item.userId} AND GRID_ID = #{item.gridId}) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index d6825a5eb1..2cf8eb9b10 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -8,7 +8,7 @@ WHERE CUSTOMER_ID = #{customerId} - DATE_ID = #{date} + AND DATE_ID = #{date} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index 99a6ac97a4..2c3abdd2ca 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -108,7 +108,7 @@ WHERE CUSTOMER_ID = #{customerId} - DATE_ID = #{date} + AND DATE_ID = #{date} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml index ef87296be2..37064faf46 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml @@ -82,7 +82,7 @@