diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java index 96256ea..8592033 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java @@ -14,6 +14,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.UserInfo; import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateUserInfoReq; +import com.ruoyi.xq.dto.admin.user.req.UpdateUserinfoFilterReq; import com.ruoyi.xq.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -78,6 +79,16 @@ public class UserInfoController extends BaseController { return R.ok(); } + + @SaCheckPermission("xq:userInfo:edit") + @Log(title = "用户信息择偶修改", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/filter") + public R edit(@RequestBody UpdateUserinfoFilterReq bo) { + userInfoService.updateInfoFilter(bo); + return R.ok(); + } + /** * 删除用户信息 * diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java new file mode 100644 index 0000000..74e8822 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java @@ -0,0 +1,51 @@ +package com.ruoyi.xq.dto.admin.user.req; + +import lombok.Data; + +@Data +public class UpdateUserinfoFilterReq { + + private Long id; + + /** + * 择偶条件-年龄 + */ + private String filterAge; + /** + * 择偶条件-身高 + */ + private String filterHeight; + /** + * 择偶条件-体型 + */ + private String filterSomatotype; + /** + * 择偶条件-婚况 + */ + private String filterMarriage; + /** + * 择偶条件-学历 + */ + private Integer filterEducation; + /** + * 择偶条件-地区 + */ + private String filterResidence; + private Integer filterResidenceCode; + /** + * 择偶条件-年收入 + */ + private Integer filterAnnualIncome; + /** + * 择偶条件-小孩情况 + */ + private Integer filterChildStatus; + /** + * 择偶条件-住房情况 + */ + private Integer filterHousingStatus; + /** + * 择偶条件-购车情况 + */ + private Integer filterCarStatus; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java index de54885..2e5ec2d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java @@ -7,6 +7,7 @@ import com.ruoyi.xq.domain.UserInfo; import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo; import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateUserInfoReq; +import com.ruoyi.xq.dto.admin.user.req.UpdateUserinfoFilterReq; /** * 用户信息Service接口 @@ -24,4 +25,6 @@ public interface UserInfoService extends IService { UpdateUserInfoReq getUserInfoUpdate(Long userId); void updateInfo(UpdateUserInfoReq bo); + + void updateInfoFilter(UpdateUserinfoFilterReq bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java index 5d89aba..3833472 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.xq.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,6 +11,7 @@ import com.ruoyi.xq.domain.UserInfo; import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo; import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateUserInfoReq; +import com.ruoyi.xq.dto.admin.user.req.UpdateUserinfoFilterReq; import com.ruoyi.xq.mapper.UserInfoMapper; import com.ruoyi.xq.service.UserInfoService; import com.ruoyi.xq.service.UserService; @@ -83,5 +85,23 @@ public class UserInfoServiceImpl extends ServiceImpl im this.updateById(userInfo); } + @Override + public void updateInfoFilter(UpdateUserinfoFilterReq bo) { + LambdaUpdateWrapper set = Wrappers.lambdaUpdate(UserInfo.class) + .eq(UserInfo::getId, bo.getId()) + .set(UserInfo::getFilterAge, bo.getFilterAge()) + .set(UserInfo::getFilterHeight, bo.getFilterHeight()) + .set(UserInfo::getFilterSomatotype, bo.getFilterSomatotype()) + .set(UserInfo::getFilterMarriage, bo.getFilterMarriage()) + .set(UserInfo::getFilterEducation, bo.getFilterEducation()) + .set(UserInfo::getFilterResidence, bo.getFilterResidence()) + .set(UserInfo::getFilterResidenceCode, bo.getFilterResidenceCode()) + .set(UserInfo::getFilterAnnualIncome, bo.getFilterAnnualIncome()) + .set(UserInfo::getFilterChildStatus, bo.getFilterChildStatus()) + .set(UserInfo::getFilterHousingStatus, bo.getFilterHousingStatus()) + .set(UserInfo::getFilterCarStatus, bo.getFilterCarStatus()); + this.update(set); + } + }