From 84b06adb5ecc2fe9196fc908be2bfdcbf3c3f0e9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 22 Sep 2020 16:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=8C=87=E6=A0=87=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/indexcal/GridSubScoreDTO.java | 52 +++++++++++++++++++ .../indexcal/GridSubScoreDao.java | 18 +++++-- .../evaluationindex/screen/IndexGroupDao.java | 2 + .../screen/IndexGroupDetailDao.java | 2 + .../screen/IndexGroupDetailEntity.java | 7 ++- .../IndexGroupDetailTemplateEntity.java | 7 ++- .../screen/IndexGroupEntity.java | 17 +++--- .../screen/IndexGroupTemplateEntity.java | 17 +++--- .../epmet/model/IndexExcelDataListener.java | 9 +++- .../main/java/com/epmet/model/IndexModel.java | 42 +++++++++++++++ .../impl/GridCorreLationServiceImpl.java | 17 ++++++ .../screen/impl/IndexGroupServiceImpl.java | 20 +++---- .../evaluationindex/indexcal/GridScoreDao.xml | 4 +- .../indexcal/GridSubScoreDao.xml | 32 ++++++++++++ .../evaluationindex/screen/IndexGroupDao.xml | 4 ++ .../screen/IndexGroupDetailDao.xml | 6 ++- .../screen/IndexGroupDetailTemplateDao.xml | 2 +- .../screen/IndexGroupTemplateDao.xml | 2 +- 18 files changed, 224 insertions(+), 36 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/GridSubScoreDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/GridSubScoreDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/GridSubScoreDTO.java new file mode 100644 index 0000000000..a1624409c2 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/GridSubScoreDTO.java @@ -0,0 +1,52 @@ +package com.epmet.dto.indexcal; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 网格相关分值 + * + * @author yinzuomei@elink-cn.com + * @date 2020/8/31 16:38 + */ +@Data +public class GridSubScoreDTO implements Serializable { + /** + * 网格Id + */ + private String gridId; + + /** + * 客户Id + */ + private String customerId; + + /** + * 网格所属的机关Id + */ + private String agencyId; + + /** + * 所有上级ID，用英文逗号分开 + */ + private String allParentIds; + + /** + * 季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4 + */ + private String quarterId; + + /** + * 年度ID: yyyy + */ + private String yearId; + + /** + * 月维度Id: yyyyMM + */ + private String monthId; + + private List detailList; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java index 1005fcf781..cae75ea905 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java @@ -18,6 +18,7 @@ package com.epmet.dao.evaluationindex.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcal.GridSubScoreDTO; import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,7 +53,18 @@ public interface GridSubScoreDao extends BaseDao { * @Date 2020/9/10 13:36 **/ int deleteBatches(@Param("customerId") String customerId, - @Param("monthId") String monthId, - @Param("allParentIndexCode") String allParentIndexCode, - @Param("deleteSize") Integer deleteSize); + @Param("monthId") String monthId, + @Param("allParentIndexCode") String allParentIndexCode, + @Param("deleteSize") Integer deleteSize); + + /** + * desc:获取网格5级指标分数 明细 + * + * @param customerId + * @param monthId + * @param offset + * @param pageSize + * @return + */ + List selectSubListGroup(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("offset") int offset, @Param("pageSize") int pageSize); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDao.java index 26cb71f2ec..2a3e617b75 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDao.java @@ -31,4 +31,6 @@ import org.apache.ibatis.annotations.Mapper; public interface IndexGroupDao extends BaseDao { int inertGroupFromTable(String customerId); + + int deleteByCustomerId(String customerId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java index d67b86e887..85d05705ad 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java @@ -36,4 +36,6 @@ public interface IndexGroupDetailDao extends BaseDao { List getDetailListByParentCode(@Param("customerId") String customerId, @Param("indexCode") String indexCode); List getAllIndexWeightList(String customerId); + + int deleteByCustomerId(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailEntity.java index 8a1b94fb3c..8db661ce1b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailEntity.java @@ -73,10 +73,15 @@ public class IndexGroupDetailEntity extends BaseEpmetEntity { private BigDecimal threshold; /** - * 所有指标code拼接的字符串 冒号隔开 + * 所有有权重的指标code拼接的字符串 冒号隔开 */ private String allParentIndexCode; + /** + * 所有指标code 冒号隔开 + */ + private String allIndexCodePath; + /** * 正相关：positive；负相关：negative */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java index 0d06fe6955..e75d36927b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java @@ -68,10 +68,15 @@ public class IndexGroupDetailTemplateEntity extends BaseEpmetEntity { private BigDecimal threshold; /** - * 所有指标code拼接的字符串 冒号隔开 + * 所有有权重的指标code拼接的字符串 冒号隔开 */ private String allParentIndexCode; + /** + * 所有指标code 冒号隔开 + */ + private String allIndexCodePath; + /** * 正相关：positive；负相关：negative */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupEntity.java index dfe57f7d8d..b25f4d1d82 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupEntity.java @@ -50,14 +50,19 @@ public class IndexGroupEntity extends BaseEpmetEntity { */ private String indexCode; - /** - * 是否启用：启用：enable 禁用：disabled - */ + /** + * 是否启用：启用：enable 禁用：disabled + */ private String status; - /** - * 当前指标关联的上一级指标分组，如果没有上一级，则为0 - */ + /** + * 当前指标关联的上一级指标分组，如果没有上一级，则为0 + */ private String parentIndexGroupId; + /** + * 所有指标code 冒号隔开 + */ + private String allIndexCodePath; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java index e22f7e6f2f..f8cdc843c5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java @@ -45,14 +45,19 @@ public class IndexGroupTemplateEntity extends BaseEpmetEntity { */ private String indexCode; - /** - * 是否启用：启用：enable 禁用：disabled - */ + /** + * 是否启用：启用：enable 禁用：disabled + */ private String status; - /** - * 当前指标关联的上一级指标分组，如果没有上一级，则为0 - */ + /** + * 当前指标关联的上一级指标分组，如果没有上一级，则为0 + */ private String parentIndexGroupId; + /** + * 所有指标code 冒号隔开 + */ + private String allIndexCodePath; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java index 57eead6c35..fc8ec41c57 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java @@ -139,6 +139,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { group1.setParentIndexGroupId("0"); group1.setId(UniqueIdGenerator.generate()); group1.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), true, 4)); + group1.setAllIndexCodePath(index.getAllIndexCodePath(0)); indexGroupMap.put(index.getLevel1Index(), group1); } StringBuilder allIndexCodeSb = new StringBuilder(group1.getIndexCode()); @@ -154,6 +155,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { group2.setParentIndexGroupId(group1.getId()); group2.setId(UniqueIdGenerator.generate()); group2.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), false, 4)); + group2.setAllIndexCodePath(index.getAllIndexCodePath(3)); indexGroupMap.put(level4IndexDetailKey, group2); //构建 分组明细 templateEntity = indexGroupDetailMap.get(index.getLevel1Index() + level4Index); @@ -164,6 +166,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { templateEntity.setAllParentIndexCode(allIndexCodeSb.toString()); templateEntity.setId(UniqueIdGenerator.generate()); templateEntity.setCorrelation(index.getCorrelation()); + templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(3)); buildIndexGroupDetail(templateEntity, indexDictEntity, index, 2); indexGroupDetailMap.put(index.getLevel1Index() + level4Index, templateEntity); } @@ -181,6 +184,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { templateEntity.setAllParentIndexCode(allIndexCodeSb.toString()); templateEntity.setId(UniqueIdGenerator.generate()); templateEntity.setCorrelation(index.getCorrelation()); + templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(4)); buildIndexGroupDetail(templateEntity, indexDictEntity, index, 5); indexGroupDetailMap.put(level5IndexDetailKey, templateEntity); } @@ -195,6 +199,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { group1.setParentIndexGroupId("0"); group1.setId(UniqueIdGenerator.generate()); group1.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), false, 4)); + group1.setAllIndexCodePath(index.getAllIndexCodePath(0)); indexGroupMap.put(index.getLevel1Index(), group1); } StringBuilder allIndexCodeSb = new StringBuilder(group1.getIndexCode()); @@ -209,7 +214,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { group2.setParentIndexGroupId(group1.getId()); group2.setId(UniqueIdGenerator.generate()); group2.setIndexCode(Pinyin4jUtil.getSpellPinYin(indexDictEntity.getIndexName(), false, 4)); - + group2.setAllIndexCodePath(index.getAllIndexCodePath(1)); indexGroupMap.put(level2IndexGroupKey, group2); //构建 分组明细 templateEntity = indexGroupDetailMap.get(level2IndexGroupKey); @@ -220,6 +225,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { templateEntity.setAllParentIndexCode(allIndexCodeSb.toString()); templateEntity.setId(UniqueIdGenerator.generate()); templateEntity.setCorrelation(index.getCorrelation()); + templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(1)); buildIndexGroupDetail(templateEntity, indexDictEntity, index, 2); indexGroupDetailMap.put(level2IndexGroupKey, templateEntity); } @@ -236,6 +242,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { templateEntity.setAllParentIndexCode(allIndexCodeSb.toString()); templateEntity.setId(UniqueIdGenerator.generate()); templateEntity.setCorrelation(index.getCorrelation()); + templateEntity.setAllIndexCodePath(index.getAllIndexCodePath(4)); buildIndexGroupDetail(templateEntity, indexDictEntity, index, 5); indexGroupDetailMap.put(level5IndexGroupKey, templateEntity); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java index 77a0fd3138..b2e124ff09 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexModel.java @@ -1,6 +1,8 @@ package com.epmet.model; import com.alibaba.excel.annotation.ExcelProperty; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.util.Pinyin4jUtil; import lombok.Data; @Data @@ -29,4 +31,44 @@ public class IndexModel { */ @ExcelProperty(value = "相关性") private String correlation; + + /** + * desc:获取所有codepath 顶级为0 + * + * @param level + * @return + */ + public String getAllIndexCodePath(Integer level) { + StringBuilder result = new StringBuilder(); + switch (level) { + case 1: + result.append(Pinyin4jUtil.getSpellPinYin(level1Index, false, 4)); + break; + case 2: + result.append(Pinyin4jUtil.getSpellPinYin(level1Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level2Index, false, 4)); + break; + case 3: + result.append(Pinyin4jUtil.getSpellPinYin(level1Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level2Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level3Index, false, 4)); + break; + case 4: + result.append(Pinyin4jUtil.getSpellPinYin(level1Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level2Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level3Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level4Index, false, 4)); + break; + case 5: + result.append(Pinyin4jUtil.getSpellPinYin(level1Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level2Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level3Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level4Index, false, 4)) + .append(StrConstant.COLON).append(Pinyin4jUtil.getSpellPinYin(level5Index, false, 4)); + break; + default: + return "0"; + } + return result.toString(); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java index a4d6f3579e..21e398445c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java @@ -90,9 +90,26 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { calculateGridFuWu(formDTO); //4、计算网格相关总分 calculateGridTotal(formDTO); + //4、计算自身和下级的分数 + calculateSelfSubScore(formDTO); return true; } + private void calculateSelfSubScore(CalculateCommonFormDTO formDTO) { + /* List gridIdList = gridScoreDao.selectListGridId(formDTO.getCustomerId(), formDTO.getMonthId()); + if (CollectionUtils.isEmpty(gridIdList)){ + log.warn("calculateSelfSubScore have not any record"); + return; + } + List> partGridIds = ListUtils.partition(gridIdList, NumConstant.ONE_HUNDRED); + partGridIds.forEach(gridIds->{ + int pageNo = NumConstant.ONE; + int pageSize = 2;//NumConstant.ONE_HUNDRED; + List list = gridSubScoreDao.selectSubListGroup(formDTO.getCustomerId(),formDTO.getMonthId(),(pageNo-NumConstant.ONE)*pageSize,pageSize); + });*/ + + } + /** * @param formDTO * @return void diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupServiceImpl.java index e455120eef..50092d64db 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/IndexGroupServiceImpl.java @@ -68,28 +68,22 @@ private IndexGroupTemplateDao indexGroupTemplateDao; public Boolean initCustomerIndexGroup(String customerId) { List groupTempList = indexGroupTemplateDao.selectAll(); List groupDetailTempList = indexGroupDetailTemplateDao.selectAll(); - if (CollectionUtils.isEmpty(groupTempList) || CollectionUtils.isEmpty(groupDetailTempList)){ + if (CollectionUtils.isEmpty(groupTempList) || CollectionUtils.isEmpty(groupDetailTempList)) { throw new RenException("没有需要初始化的数据"); } Map groupMap = groupTempList.stream().collect(Collectors.toMap(IndexGroupTemplateEntity::getId, o -> o)); - Map groupEntityMap = new HashMap<>(); - Map groupNewIdMap = new HashMap<>(); + Map groupNewIdMap = new HashMap<>(); + + indexGroupDetailDao.deleteByCustomerId(customerId); + baseDao.deleteByCustomerId(customerId); List insertGroupList = new ArrayList<>(); - groupMap.forEach((oldGroupTempId,o)->{ + groupMap.forEach((oldGroupTempId, o) -> { IndexGroupEntity newGroupEntity = ConvertUtils.sourceToTarget(o, IndexGroupEntity.class); String newGroupId = UniqueIdGenerator.generate(); newGroupEntity.setId(newGroupId); newGroupEntity.setCustomerId(customerId); - String oldPid = newGroupEntity.getParentIndexGroupId(); - String newPid = groupNewIdMap.get(oldPid); - /*if (StringUtils.isBlank(newPid)){ - newPid = UniqueIdGenerator.generate(); - groupNewIdMap.put(oldPid,newPid); - }*/ - //newGroupEntity.setParentIndexGroupId(newPid); - groupNewIdMap.put(oldGroupTempId,newGroupId); - //groupEntityMap.put(newGroupId,newGroupEntity); + groupNewIdMap.put(oldGroupTempId, newGroupId); insertGroupList.add(newGroupEntity); }); insertGroupList.forEach(o-> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml index 499f3349f4..aab983a94f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml @@ -110,8 +110,8 @@ m.YEAR_ID, m.MONTH_ID, m.IS_TOTAL, - M.SCORE, - M.INDEX_CODE + m.SCORE, + m.INDEX_CODE FROM fact_index_grid_score m WHERE diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml index e0707ee17b..36305146f3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml @@ -65,4 +65,36 @@ limit #{deleteSize} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDao.xml index 668ba89e2d..4f0c4d0c75 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDao.xml @@ -6,4 +6,8 @@ + + + delete from index_group where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml index 76bec7b257..0fe297d9b0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml @@ -6,7 +6,7 @@ + + + delete from index_group_detail where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml index a8e5f55a2e..5769bd5818 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml @@ -7,7 +7,7 @@ delete from index_group_detail_template diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupTemplateDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupTemplateDao.xml index 92067e3247..e1fd380618 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupTemplateDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupTemplateDao.xml @@ -7,7 +7,7 @@ \ No newline at end of file