Browse Source

代码提交 党员亮身份bug-代码提交

master
zhangfh 4 years ago
parent
commit
9c40de7b10
  1. 11
      epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java
  2. 2
      epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java
  3. 2
      epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java
  4. 2
      epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java
  5. 4
      epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml

11
epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java

@ -1,6 +1,5 @@
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
@ -17,21 +16,21 @@ import org.springframework.web.bind.annotation.*;
* create time: 2021/8/29$ 10:32$
*/
@RestController
@RequestMapping(Constant.APP_USER_FLAG+"partyMember")
@RequestMapping("partyMember")
public class EpdcAppPartyMemberController {
@Autowired
private UserInfoService userInfoService;
@PostMapping("showIdentity")
public Result save(@RequestBody EpdcAppShowIdentityFormDTO formDto){
public Result saveShowIdentity(@RequestBody EpdcAppShowIdentityFormDTO formDto){
ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
userInfoService.save(formDto);
return new Result();
}
@GetMapping("dentityDetail/{userId}")
public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(@PathVariable("userId") Long userId){
public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(@PathVariable("userId") String userId){
EpdcAppIdentityDetailResultDTO data = userInfoService.getDentityDetail(userId);
return new Result<EpdcAppIdentityDetailResultDTO>().ok(data);
}
@ -43,7 +42,7 @@ public class EpdcAppPartyMemberController {
* @author zhangfenghe
* @since 2021/8/30 9:26
*/
@PostMapping("partyBuilding/brightIdentity/recommended")
@PostMapping("brightIdentity/recommended/{id}")
public Result recommended(@PathVariable("id") String id){
return userInfoService.recommended(id);
}
@ -55,7 +54,7 @@ public class EpdcAppPartyMemberController {
* @author zhangfenghe
* @since 2021/8/30 9:26
*/
@PostMapping("partyBuilding/brightIdentity/recommendedCancel")
@PostMapping("brightIdentity/recommendedCancel/{id}")
public Result recommendedCancel(@PathVariable("id") String id){
return userInfoService.recommendedCancel(id);
}

2
epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java

@ -20,7 +20,7 @@ public interface UserInfoDao extends BaseDao<UserInfoEntity> {
* @author jyyzz
* @since 2021/8/29 11:44
*/
EpdcAppIdentityDetailResultDTO selectDentityDetail(Long userId);
EpdcAppIdentityDetailResultDTO selectDentityDetail(String userId);
/**
* 党建引领-党员亮身份推荐

2
epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java

@ -18,7 +18,7 @@ public interface UserInfoService extends BaseService<UserInfoEntity> {
*/
void save(EpdcAppShowIdentityFormDTO dto);
EpdcAppIdentityDetailResultDTO getDentityDetail(Long userId);
EpdcAppIdentityDetailResultDTO getDentityDetail(String userId);
/**
* 党建引领-党员亮身份推荐

2
epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java

@ -29,7 +29,7 @@ public class UserInfoServiceImpl extends BaseServiceImpl<UserInfoDao, UserInfoEn
}
@Override
public EpdcAppIdentityDetailResultDTO getDentityDetail(Long userId) {
public EpdcAppIdentityDetailResultDTO getDentityDetail(String userId) {
EpdcAppIdentityDetailResultDTO dentityDetail = baseDao.selectDentityDetail(userId);
return dentityDetail;
}

4
epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml

@ -3,12 +3,12 @@
<mapper namespace="com.elink.esua.epdc.dao.UserInfoDao">
<select id="selectDentityDetail" resultMap="com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO">
<select id="selectDentityDetail" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO">
SELECT
ui.HEAD_URL,
ui.MOTTO,
ui.PROMISE,
ui.SERVICE_ARE
ui.SERVICE_AREA
FROM epdc_user_info ui
WHERE ui.USER_ID = #{userId}
AND ui.DEL_FLAG = '0'

Loading…
Cancel
Save