elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

志愿者模块 增加黑名单功能

feature/dangjian
zhangyongzhangyong 6 years ago
parent
dfff7dd580
commit
1eabd31f3c
6 changed files with 59 additions and 51 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. 56
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
  2. 12
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagRelationDao.java
  3. 11
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagRelationService.java
  4. 16
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagRelationServiceImpl.java
  5. 5
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml
  6. 10
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

56
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
View File

@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.UserTagDTO;
@ -60,26 +61,9 @@ public class VolunteerInfoController {
@Autowired
private UserTagRelationService userTagRelationService; //用户标签关系表
/**
* 新增时 赋默认值
* 查询到数据 返回的是志愿者表中的基础数据
* 没查到数据 返回的是用户表中的数据
* @return
*/
// @PostMapping("/defaultValue")
// public Result<VolunteerInfoDTO> defaultValue(){
// Long userId = SecurityUser.getUserId();
// String id = "2303cb67e81d3163bdb15043baac7e27";
// VolunteerInfoDTO volunteerInfo = volunteerInfoService.get(id);
// if(volunteerInfo == null){ //返回 用户表 数据
// Result<VolunteerInfoDTO> userInfo = volunteerInfoService.getVolunteerUserDefaultValue(id);
// return userInfo;
// }
// return new Result<VolunteerInfoDTO>().ok(volunteerInfo);
// }
/**
* 查询列表数据
* @Description 查询列表数据
* @param params
* @return
*/
@ -92,6 +76,7 @@ public class VolunteerInfoController {
/**
* 根据志愿者ID，查询志愿者 单条详情
* 积分需要连user表查询
* @Description 查询志愿者 单条详情
* @param id
* @return
*/
@ -104,16 +89,8 @@ public class VolunteerInfoController {
@PostMapping
public Result save(@RequestBody VolunteerInfoDTO dto){
//效验数据
//ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
//2019-12-10 09:16:39
// Long userId = SecurityUser.getUserId();
// dto.setRegistTime(new Date());
// dto.setRevision(1);
// dto.setCreatedBy(userId.toString());
// dto.setCreatedTime(new Date());
// dto.setUpdatedTime(new Date());
// dto.setUpdatedBy(userId.toString());
// volunteerInfoService.save(dto);
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
volunteerInfoService.save(dto);
return new Result();
}
@ -131,6 +108,7 @@ public class VolunteerInfoController {
* 向用户标签表epdc_user_tag 和 用户标签关系表epdc_user_tag_relation 添加用户身份
*
* 消息进行推送
* @Description 志愿者 申请审批
* @param dto 志愿者表id，是否通过，审核不通过的原因
* @return
*/
@ -142,13 +120,11 @@ public class VolunteerInfoController {
dto.setAuditTime(date);
dto.setUpdatedBy(userId.toString());
dto.setUpdatedTime(date);
//效验数据
//ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
VolunteerInfoDTO data = volunteerInfoService.get(dto.getId());//查询志愿者表，该志愿者的最新信息
String auditStatus = dto.getAuditStatus(); //申请是否通过
if (auditStatus.equals("1")){ //通过
if (auditStatus.equals("1")){ //通过
volunteerInfoService.updateVolunteerInfo(dto);//修改志愿者表 是否通过字段及更新时间
VolunteerInfoDTO data = volunteerInfoService.get(dto.getId());//查询志愿者表，该志愿者的最新信息
//向标签表中，查询唯一志愿者标签：tag_code = volunteer
UserTagDTO userTag = volunteerInfoService.volunteerTagQuery("volunteer");
@ -156,25 +132,13 @@ public class VolunteerInfoController {
userTagRelationDTO.setUserId(data.getUserId());
userTagRelationDTO.setTagId(userTag.getId());
userTagRelationService.save(userTagRelationDTO);
}else if (auditStatus.equals("2")){ //不通过
}else if (auditStatus.equals("2") || auditStatus.equals("3")){ //不通过/拉黑
volunteerInfoService.updateVolunteerInfo(dto);//修改志愿者表 字段为：审核人 审核时间 审核状态 审核不通过原因
userTagRelationService.deleteUserTagRelation(data.getUserId());
}
return new Result();
}
/**
* 积分调整，对用户表总积分数进行修改
* 向积分日志表插入积分调整信息
* @param map 志愿者表id，志愿者用户id，志愿者表总积分，积分日志表积分操作
* @return
*/
@PostMapping("pointsAdjust")
public Result pointsAdjust(@RequestBody Map<Object,Object> map){
return new Result();
}
//-----------------------------------------------------------------------------
@PutMapping
public Result update(@RequestBody VolunteerInfoDTO dto){
//效验数据

12
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagRelationDao.java
View File

@ -29,5 +29,15 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface UserTagRelationDao extends BaseDao<UserTagRelationEntity> {
/**
* 根据user_id 删除
* 用户标签关系表
*
* @param userId
* @return void
* @author zy
* @date 2019-12-16
*/
void deleteUserTagRelation(String userId);
}

11
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagRelationService.java
View File

@ -92,4 +92,15 @@ public interface UserTagRelationService extends BaseService<UserTagRelationEntit
* @date 2019-09-30
*/
void delete(String[] ids);
/**
* 根据user_id 删除
* 用户标签关系表
*
* @param userId
* @return void
* @author zy
* @date 2019-12-16
*/
void deleteUserTagRelation(String userId);
}

16
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagRelationServiceImpl.java
View File

@ -48,6 +48,8 @@ public class UserTagRelationServiceImpl extends BaseServiceImpl<UserTagRelationD
@Autowired
private UserTagRelationRedis userTagRelationRedis;
@Autowired
private UserTagRelationDao userTagRelationDao;
@Override
public PageData<UserTagRelationDTO> page(Map<String, Object> params) {
@ -101,4 +103,18 @@ public class UserTagRelationServiceImpl extends BaseServiceImpl<UserTagRelationD
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* 根据user_id 删除
* 用户标签关系表
*
* @param userId
* @return void
* @author zy
* @date 2019-12-16
*/
@Override
public void deleteUserTagRelation(String userId) {
userTagRelationDao.deleteUserTagRelation(userId);
}
}

5
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml
View File

@ -15,5 +15,8 @@
<result property="delFlag" column="DEL_FLAG"/>
</resultMap>
<update id="deleteUserTagRelation" parameterType="String">
UPDATE epdc_user_tag_relation
SET del_flag='1' WHERE USER_ID = #{userId} AND del_flag='0'
</update>
</mapper>

10
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
View File

@ -44,10 +44,12 @@
v.FULL_NAME fullName,
v.SEX sex,
v.BIRTHDAY birthday,
date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString,
v.MOBILE mobile,
v.IDENTITY_NO identityNo,
v.KINDNESS_TIME kindnessTime,
u.POINTS points,
date_format(v.REGIST_TIME,'%Y.%m.%d %H.%i') registTimeString,
v.REGIST_TIME registTime,
v.AUDIT_STATUS auditStatus
FROM
@ -91,11 +93,13 @@
v.FULL_NAME fullName,
v.SEX sex,
v.BIRTHDAY birthday,
date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString,
v.MOBILE mobile,
v.IDENTITY_NO identityNo,
v.ADDRESS address,
v.INTRODUCE introduce,
u.POINTS points,
date_format(v.REGIST_TIME,'%Y.%m.%d %H.%i') registTimeString,
v.REGIST_TIME registTime
FROM
epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID
@ -108,15 +112,15 @@
eu.REAL_NAME fullName,
eu.MOBILE mobile,
eu.IDENTITY_NO identityNo,
eugr.GRID_ID girdId,
eugr.GRID_ID girdId,
eu.PARENT_DEPT_IDS parentDeptIds,
eu.PARENT_DEPT_NAMES parentDeptNames,
eu.ALL_DEPT_IDS allDeptIds,
eu.ALL_DEPT_NAMES allDeptNames,
eu.ROAD road,
eu.VILLAGE_NAME villageName,
eu.DWELLING_PLACE dwellingPlace,
eu.ADDRESS address
eu.DWELLING_PLACE dwellingPlace,
eu.ADDRESS address
FROM
epdc_user eu
Left Join (select * from epdc_user_grid_relation where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr

Write Preview
Loading…
Cancel
Save