elink-star
/
epmet-cloud-yifengdian
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_guidance' into dev

master
jianjun 4 years ago
parent
3c356fd05b f43e9813c1
commit
0360206638
4 changed files with 20 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
  2. 8
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
  3. 7
      epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
  4. 10
      epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql

1
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
View File

@ -18,4 +18,5 @@ public class MyPointRankResultDTO implements Serializable {
private String headPhoto;
private String gridRank;
private String customerRank;
private String userName;
}

8
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
View File

@ -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<UserPo
}
MyPointRankResultDTO result = new MyPointRankResultDTO();
result.setHeadPhoto(myInfoResult.getData().get(0).getHeadImgUrl());
result.setUserName(myInfoResult.getData().get(0).getRealName());
//获取客户下用户积分
List<BizPointUserTotalDetailDTO> list = getUserPointList(tokenDto.getCustomerId(), null, null);
result.setCustomerRank(getRank(list, tokenDto.getUserId()));
@ -378,7 +380,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
if (!gridInfoResult.success()) {
throw new RenException(gridInfoResult.getCode());
}
result.setGridName(gridInfoResult.getData().getGridName());
result.setGridName(gridInfoResult.getData().getParentAgencyName() + StrConstant.HYPHEN + gridInfoResult.getData().getGridName());
String agencyId = gridInfoResult.getData().getParentAgencyId();
//获取客户下用户积分
List<BizPointUserTotalDetailDTO> list = getGridPointList(tokenDto.getCustomerId(), null);
@ -453,6 +455,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
private Boolean havePoint(List<BizPointUserTotalDetailDTO> list, String userId) {
Map<String, Integer> 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<UserPo
}
//如果当月网格没有积分变动，则积分为0
Map<String, Integer> 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);

7
epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
View File

@ -250,9 +250,7 @@
<if test="null != gridId and gridId != ''">
AND a.GRID_ID = #{gridId}
</if>
GROUP BY a.CUSTOMER_ID,
a.AGENCY_ID,
a.GRID_ID,
GROUP BY
a.USER_ID
</select>
<select id="selectGridPointByMonth" resultType="com.epmet.dto.BizPointUserTotalDetailDTO">
@ -273,8 +271,7 @@
<if test="null != agencyId and agencyId != ''">
AND a.AGENCY_ID = #{agencyId}
</if>
GROUP BY a.CUSTOMER_ID,
a.AGENCY_ID,
GROUP BY
a.GRID_ID
</select>
</mapper>

10
epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.9__insert_default_guide_module.sql
View File

@ -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');
Write Preview
Loading…
Cancel
Save