diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageApplicantMarriageInformationContactApplyQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageApplicantMarriageInformationContactApplyQueryParams.java index d9fa789..7392a6b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageApplicantMarriageInformationContactApplyQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageApplicantMarriageInformationContactApplyQueryParams.java @@ -1,5 +1,6 @@ package com.qniao.dam.api.query.mica.user.request; +import com.qniao.dam.domian.aggregate.mica.constant.MarriageInformationContactApplyStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,4 +10,10 @@ public class UserPageApplicantMarriageInformationContactApplyQueryParams { @ApiModelProperty(hidden = true) private Long applicantUserId; + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("是否解锁") + private Boolean unlocked; + } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageTargetMarriageInformationContactApplyQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageTargetMarriageInformationContactApplyQueryParams.java index c8009ff..ca7b3af 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageTargetMarriageInformationContactApplyQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/request/UserPageTargetMarriageInformationContactApplyQueryParams.java @@ -6,8 +6,13 @@ import lombok.Data; @Data public class UserPageTargetMarriageInformationContactApplyQueryParams { - @ApiModelProperty(hidden = true) private Long targetUserId; + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("是否解锁") + private Boolean unlocked; + } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java index 92d83a9..d46b4b7 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java @@ -78,6 +78,12 @@ public class UserPageApplicantMarriageInformationContactApplyVo { @ApiModelProperty("收入中文") private String income; + @ApiModelProperty("行业编码") + private Integer industryCode; + + @ApiModelProperty("行业中文") + private String industry; + @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml b/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml index c3f734d..8a45e39 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml @@ -25,12 +25,20 @@ dami.education, dami.education_code, dami.income_code, - dami.income + dami.income, + dami.industry, + dami.industry_code from da_marriage_information_contact_apply as damica LEFT JOIN da_marriage_information as dami on damica.target_mi_id=dami.id LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=damica.target_user_id WHERE damica.is_delete=0 and damica.applicant_user_id=#{queryParams.applicantUserId} + + and damica.`status` = #{queryParams.status} + + + and damica.unlocked = #{queryParams.unlocked} + ORDER BY damica.`status` ASC,damica.create_time desc @@ -52,12 +60,24 @@ damica.`status`, damica.unlocked, damica.create_time, - daa.tid as phone + daa.tid as phone, + dami.education, + dami.education_code, + dami.income_code, + dami.income, + dami.industry, + dami.industry_code from da_marriage_information_contact_apply as damica LEFT JOIN da_marriage_information as dami on damica.applicant_mi_id = dami.id LEFT JOIN da_account as daa on daa.is_delete=0 and daa.user_id=damica.applicant_user_id and daa.type=2 WHERE damica.is_delete = 0 and damica.target_user_id = #{queryParams.targetUserId} + + and damica.`status` = #{queryParams.status} + + + and damica.unlocked = #{queryParams.unlocked} + ORDER BY damica.`status` ASC, damica.create_time desc