实名认证修改

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/UserAccountQO.java

@@ -44,7 +44,7 @@ public class UserAccountQO implements Serializable {
     @ApiModelProperty(value = "结束时间", example = "2023-10-18 23:59:59")
     private String endTime;
 
-    @ApiModelProperty(value = "实名认证状态（0未通过，1通过）", hidden = true)
+    @ApiModelProperty(value = "实名认证状态（0未通过，1通过）")
     private Integer realAuthStatus;
 
     @ApiModelProperty(value = "企业认证状态（0未通过，1通过）", example = "1")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/RealNameAuthController.java

@@ -55,4 +55,11 @@ public class RealNameAuthController extends BaseController {
     public ResultBody listPage(@RequestBody RealNameAuthQO realNameAuthQO) {
         return realNameAuthService.listPage(realNameAuthQO);
     }
+
+    @ApiOperation(value = "备注修改")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("updateRemark")
+    public ResultBody updateRemark(@RequestParam Integer id, @RequestParam(required = false) String remark) {
+        return realNameAuthService.updateRealNameAuthRemark(id, remark);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/RealNameAuthDao.java

@@ -31,4 +31,6 @@ public interface RealNameAuthDao {
     List<RealNameAuthDO> listRealNameAuth(RealNameAuthQO realNameAuthQO);
 
     RealNameAuthDO userDetail(Integer userAccountId);
+
+    void updateRealNameAuthRemark(Integer id, String remark);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/RealNameAuthService.java

@@ -15,7 +15,9 @@ public interface RealNameAuthService {
 
     ResultBody<RealNameAuthDetailDTO> detail(Integer id);
 
-    ResultBody listPage(RealNameAuthQO realNameAuthQO);
+    ResultBody<RealNameAuthDTO> listPage(RealNameAuthQO realNameAuthQO);
 
     ResultBody<RealNameAuthDTO> userDetail(Integer userAccountId);
+
+    ResultBody updateRealNameAuthRemark(Integer id, String remark);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RealNameAuthServiceImpl.java

@@ -124,7 +124,7 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
     }
 
     @Override
-    public ResultBody listPage(RealNameAuthQO realNameAuthQO) {
+    public ResultBody<RealNameAuthDTO> listPage(RealNameAuthQO realNameAuthQO) {
         int count = realNameAuthDao.countListRealNameAuth(realNameAuthQO);
         if (count == 0) {
             return ResultBody.success(PageResult.buildPage(realNameAuthQO.getPageNo(), realNameAuthQO.getPageSize(), count));
@@ -147,6 +147,12 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody updateRealNameAuthRemark(Integer id, String remark) {
+        realNameAuthDao.updateRealNameAuthRemark(id, remark);
+        return ResultBody.success();
+    }
+
     public Date getDate(String str, String format) {
         Date date = null;
         try {

csm-service/cms-service-user/src/main/resources/mapper/RealNameAuthDao.xml

@@ -69,6 +69,10 @@
         where id = #{id}
     </update>
 
+    <update id="updateRealNameAuthRemark">
+        update real_name_auth set remark = #{remark} where id = #{id}
+    </update>
+
     <select id="existHasBeenAuth" resultType="java.lang.Integer">
         select count(*) from real_name_auth where union_id <![CDATA[<>]]> #{unionId} and id_number = #{idNumber} and check_status = 1
     </select>
@@ -110,7 +114,7 @@
         <if test="keyword != null and keyword != '' ">
             and ( ua.id like concat('%',#{keyword},'%')
             or
-            ua.user_name like concat('%',#{keyword},'%')
+            rna.user_name like concat('%',#{keyword},'%')
             or ua.phone_num like
             concat('%',#{keyword},'%')
             )
@@ -123,14 +127,14 @@
     <select id="listRealNameAuth" resultType="com.mmc.iuav.user.entity.RealNameAuthDO"
             parameterType="com.mmc.iuav.user.model.qo.RealNameAuthQO">
         select
-        rna.id,rna.user_account_id,ua.nick_name,rna.user_name,ua.phone_num,rna.check_status,rna.create_time,ua.remark
+        rna.id,rna.user_account_id,ua.nick_name,rna.user_name,ua.phone_num,rna.check_status,rna.create_time,rna.remark
         from user_account ua inner join real_name_auth rna on
         ua.id=rna.user_account_id
         where ua.`disable` = 0
         <if test="keyword != null and keyword != '' ">
             and ( ua.id like concat('%',#{keyword},'%')
             or
-            ua.user_name like concat('%',#{keyword},'%')
+            rna.user_name like concat('%',#{keyword},'%')
             or ua.phone_num like
             concat('%',#{keyword},'%')
             )

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -257,6 +257,7 @@
         user_account ua
         LEFT JOIN company_member cm ON cm.user_account_id = ua.id
         LEFT JOIN company_info ci ON ci.id = cm.company_info_id
+        LEFT JOIN real_name_auth rna ON rna.user_account_id = ua.id
         WHERE
         ua.disable = 0 and ua.port_type = 100
         <if test="companyInfoId != null">
@@ -271,6 +272,12 @@
         <if test="companyAuthStatus == 1">
             AND ci.company_name is not null
         </if>
+        <if test="realAuthStatus == 1">
+            AND rna.check_status = #{realAuthStatus}
+        </if>
+        <if test="companyAuthStatus == 1">
+            AND ( rna.check_status is not null or rna.check_status = 0 )
+        </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}
         </if>
@@ -336,6 +343,12 @@
         <if test="companyAuthStatus == 1">
             AND ci.company_name is not null
         </if>
+        <if test="realAuthStatus == 1">
+            AND rna.check_status = #{realAuthStatus}
+        </if>
+        <if test="companyAuthStatus == 1">
+            AND ( rna.check_status is not null or rna.check_status = 0 )
+        </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}
         </if>