diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java index 484c8f8055..2eb5afc433 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java @@ -18,4 +18,5 @@ public class MyPointRankResultDTO implements Serializable { private String headPhoto; private String gridRank; private String customerRank; + private String userName; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index 5842e34bf6..c6a23b59df 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.common.enu.AroundPartyConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -351,6 +352,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list = getUserPointList(tokenDto.getCustomerId(), null, null); result.setCustomerRank(getRank(list, tokenDto.getUserId())); @@ -378,7 +380,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list = getGridPointList(tokenDto.getCustomerId(), null); @@ -453,6 +455,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list, String userId) { Map map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getUserId, BizPointUserTotalDetailDTO::getTotalPoint)); + String point = null == map.get(userId)?"0":Integer.toString(map.get(userId)); + log.info("userPoint:" + point); return null != map.get(userId); } @@ -463,6 +467,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getGridId, BizPointUserTotalDetailDTO::getTotalPoint)); + String points = null == map.get(gridId)?"0":Integer.toString(map.get(gridId)); + log.info("gridPoint:" + points); if (null == map.get(gridId)) { BizPointUserTotalDetailDTO dto = new BizPointUserTotalDetailDTO(); dto.setGridId(gridId); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml index 6bd5f6b76a..69c6148f63 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml @@ -250,9 +250,7 @@ AND a.GRID_ID = #{gridId} - GROUP BY a.CUSTOMER_ID, - a.AGENCY_ID, - a.GRID_ID, + GROUP BY a.USER_ID diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql new file mode 100644 index 0000000000..d6a28ecaf4 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql @@ -0,0 +1,10 @@ +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10001', 'basic_info', '基本信息', 1, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10002', 'handling_info', '办理信息', 2, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10003', 'setting_basis', '设定依据', 3, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10004', 'handling_process', '办理流程', 4, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10005', 'legal_remedy', '法律救济', 5, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10006', 'accept_condition', '受理条件', 6, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10007', 'material_catalog', '材料目录', 7, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10008', 'consultation_method', '咨询方式', 8, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10009', 'complaint_method', '投诉方式', 9, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15'); +INSERT INTO `epmet_gov_voice`.`guide_module_dict_default` (`ID`, `MODULE_VALUE`, `MODULE_NAME`, `SORT`, `STATUS`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10010', 'charging_info', '收费信息', 10, 'enable', '0', 0, '1', '2021-09-08 17:33:07', '1', '2021-09-08 17:33:15');