资料审核

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileController.java

@@ -54,6 +54,18 @@ public class UserProfileController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询填写资料审核列表
+     */
+    @ApiOperation("查询填写资料审记录列表")
+    @PreAuthorize("@ss.hasPermi('system:profile:list')")
+    @GetMapping("/listRecord")
+    public TableDataInfo<UserProfileVo> listRecord(UserProfileQueryBo bo) {
+        startPage();
+        List<UserProfileVo> list = iUserProfileService.listRecord(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 获取填写资料审核详细信息
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/UserProfileQueryBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.base.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -77,4 +78,21 @@ public class UserProfileQueryBo extends BaseEntity {
 	/** 审核时间 */
 	@ApiModelProperty("审核时间")
 	private Long auditTime;
+
+	/** 教育类型id */
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 所属院校 */
+	@Excel(name = "所属院校")
+	@ApiModelProperty("所属院校")
+	private Long schoolId;
+	/** 所属专业 */
+	@Excel(name = "所属专业")
+	@ApiModelProperty("所属专业")
+	private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/UserProfileMapper.java

@@ -18,4 +18,6 @@ public interface UserProfileMapper extends BaseMapper<UserProfile> {
     List<UserProfileVo> selectUserProfile(UserProfileQueryBo bo);
 
     UserProfileVo getInfo(UserProfileQueryBo bo);
+
+    List<UserProfileVo> listRecord(UserProfileQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IUserProfileService.java

@@ -55,4 +55,6 @@ public interface IUserProfileService extends IService<UserProfile> {
 	UserProfileVo getInfo(UserProfileQueryBo bo);
 
 	boolean updateAuditByEditBo(UserProfileEditBo bo);
+
+	List<UserProfileVo> listRecord(UserProfileQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -174,6 +174,11 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         return this.updateById(update);
     }
 
+    @Override
+    public List<UserProfileVo> listRecord(UserProfileQueryBo bo) {
+        return baseMapper.listRecord(bo);
+    }
+
     /**
      * 远程读取image转换为Base64字符串
      *

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         user_profile up
         where 1=1
+        and up.current_status = 1
         <if test="status != null and status.size()!=0 ">
             AND up.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
@@ -68,6 +69,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id !='' ">
             AND up.id =#{id}
         </if>
+        <if test="userId != null and userId !='' ">
+            AND up.user_id =#{userId}
+        </if>
+        <if test="goodsId != null and goodsId !='' ">
+            AND up.goods_id =#{goodsId}
+        </if>
+        <if test="educationTypeId != null and educationTypeId !='' ">
+            AND g.education_type_id =#{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId !='' ">
+            AND g.business_id =#{businessId}
+        </if>
+        <if test="schoolId != null and schoolId !='' ">
+            AND g.school_id =#{schoolId}
+        </if>
+        <if test="majorId != null and majorId !='' ">
+            AND g.major_id =#{majorId}
+        </if>
+        <if test="change_status != null and goodsId !='' ">
+            AND up.change_status =#{goodsId}
+        </if>
         order by up.create_time desc
     </select>
 
@@ -104,4 +126,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by up.create_time desc LIMIT 1
     </select>
+
+    <select id="listRecord" parameterType="com.zhongzheng.modules.base.bo.UserProfileQueryBo" resultMap="UserProfileVo">
+        SELECT
+        up.*,
+        (SELECT u.realname FROM `user` u where u.user_id = up.user_id) as realname,
+        (SELECT u.user_account FROM `user` u where u.user_id = up.user_id) as user_account,
+        (SELECT u.telphone FROM `user` u where u.user_id = up.user_id) as telphone,
+        (SELECT u.id_card FROM `user` u where u.user_id = up.user_id) as id_card,
+        (SELECT g.goods_name FROM goods g where up.goods_id = g.goods_id) as goods_name,
+        (SELECT g.`code` FROM goods g where up.goods_id = g.goods_id) as goods_code,
+        (SELECT cet.education_name FROM goods g LEFT JOIN course_education_type cet on g.education_type_id = cet.id where up.goods_id = g.goods_id) as education_name,
+        (SELECT cet.project_name FROM goods g LEFT JOIN course_project_type cet on g.project_id = cet.id where up.goods_id = g.goods_id) as project_name,
+        (SELECT cet.business_name FROM goods g LEFT JOIN course_business cet on g.business_id = cet.id where up.goods_id = g.goods_id) as business_name
+        FROM
+        user_profile up
+        where 1=1
+        <if test="status != null and status.size()!=0 ">
+            AND up.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="id != null and id !='' ">
+            AND up.id =#{id}
+        </if>
+        <if test="userId != null and userId !='' ">
+            AND up.user_id =#{userId}
+        </if>
+        <if test="goodsId != null and goodsId !='' ">
+            AND up.goods_id =#{goodsId}
+        </if>
+        <if test="educationTypeId != null and educationTypeId !='' ">
+            AND g.education_type_id =#{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId !='' ">
+            AND g.business_id =#{businessId}
+        </if>
+        <if test="schoolId != null and schoolId !='' ">
+            AND g.school_id =#{schoolId}
+        </if>
+        <if test="majorId != null and majorId !='' ">
+            AND g.major_id =#{majorId}
+        </if>
+        <if test="change_status != null and goodsId !='' ">
+            AND up.change_status =#{goodsId}
+        </if>
+        order by up.create_time desc
+    </select>
 </mapper>