|
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.epmet.commons.tools.constant.FieldConstant; |
|
|
import com.epmet.commons.tools.constant.FieldConstant; |
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
|
|
import com.epmet.commons.tools.enums.GenderEnum; |
|
|
import com.epmet.commons.tools.page.PageData; |
|
|
import com.epmet.commons.tools.page.PageData; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
import com.epmet.commons.tools.utils.Result; |
|
@ -57,8 +58,8 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf |
|
|
return ConvertUtils.sourceToTarget(entityList, IcResiUserConfirmDTO.class); |
|
|
return ConvertUtils.sourceToTarget(entityList, IcResiUserConfirmDTO.class); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private QueryWrapper<IcResiUserConfirmEntity> getWrapper(Map<String, Object> params){ |
|
|
private QueryWrapper<IcResiUserConfirmEntity> getWrapper(Map<String, Object> params) { |
|
|
String id = (String)params.get(FieldConstant.ID_HUMP); |
|
|
String id = (String) params.get(FieldConstant.ID_HUMP); |
|
|
|
|
|
|
|
|
QueryWrapper<IcResiUserConfirmEntity> wrapper = new QueryWrapper<>(); |
|
|
QueryWrapper<IcResiUserConfirmEntity> wrapper = new QueryWrapper<>(); |
|
|
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
|
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
@ -96,11 +97,11 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf |
|
|
@Override |
|
|
@Override |
|
|
public Result editMember(IcResiUserConfirmSubmitDTO dto) { |
|
|
public Result editMember(IcResiUserConfirmSubmitDTO dto) { |
|
|
IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId()); |
|
|
IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId()); |
|
|
if(null != oldEntity){ |
|
|
if (null != oldEntity) { |
|
|
dto.setId(oldEntity.getId()); |
|
|
dto.setId(oldEntity.getId()); |
|
|
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class); |
|
|
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class); |
|
|
updateById(entity); |
|
|
updateById(entity); |
|
|
}else{ |
|
|
} else { |
|
|
addMember(dto); |
|
|
addMember(dto); |
|
|
} |
|
|
} |
|
|
return new Result().ok("修改成功"); |
|
|
return new Result().ok("修改成功"); |
|
@ -124,11 +125,11 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf |
|
|
@Override |
|
|
@Override |
|
|
public Result delMember(IcResiUserConfirmSubmitDTO dto) { |
|
|
public Result delMember(IcResiUserConfirmSubmitDTO dto) { |
|
|
IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId()); |
|
|
IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId()); |
|
|
if(null != oldEntity){ |
|
|
if (null != oldEntity) { |
|
|
dto.setId(oldEntity.getId()); |
|
|
dto.setId(oldEntity.getId()); |
|
|
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class); |
|
|
IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class); |
|
|
updateById(entity); |
|
|
updateById(entity); |
|
|
}else{ |
|
|
} else { |
|
|
addMember(dto); |
|
|
addMember(dto); |
|
|
} |
|
|
} |
|
|
return new Result().ok("删除成功"); |
|
|
return new Result().ok("删除成功"); |
|
@ -137,6 +138,9 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf |
|
|
@Override |
|
|
@Override |
|
|
public Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto) { |
|
|
public Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto) { |
|
|
IcResiUserConfirmDTO result = icResiUserDao.selectMemberDetail(dto.getIcResiUserId()); |
|
|
IcResiUserConfirmDTO result = icResiUserDao.selectMemberDetail(dto.getIcResiUserId()); |
|
|
|
|
|
if (null != result && StringUtils.isBlank(result.getGender())) { |
|
|
|
|
|
result.setGender(GenderEnum.UN_KNOWN.getCode()); |
|
|
|
|
|
} |
|
|
return new Result().ok(result); |
|
|
return new Result().ok(result); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -161,7 +165,7 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf |
|
|
entity.setName(confirmEntity.getSurname() + confirmEntity.getName()); |
|
|
entity.setName(confirmEntity.getSurname() + confirmEntity.getName()); |
|
|
entity.setId(confirmEntity.getIcResiUserId()); |
|
|
entity.setId(confirmEntity.getIcResiUserId()); |
|
|
icResiUserDao.updateById(entity); |
|
|
icResiUserDao.updateById(entity); |
|
|
} else if ("delete".equals(confirmEntity.getSubmitType())){ |
|
|
} else if ("delete".equals(confirmEntity.getSubmitType())) { |
|
|
IcResiUserEntity entity = new IcResiUserEntity(); |
|
|
IcResiUserEntity entity = new IcResiUserEntity(); |
|
|
entity.setId(confirmEntity.getIcResiUserId()); |
|
|
entity.setId(confirmEntity.getIcResiUserId()); |
|
|
entity.setStatus(confirmEntity.getDeleteReason()); |
|
|
entity.setStatus(confirmEntity.getDeleteReason()); |
|
|