资料审核

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

@@ -50,6 +50,7 @@ public class UserProfileController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<UserProfileVo> list(UserProfileQueryBo bo) {
         startPage();
+        bo.setTypeStatus(1L);
         List<UserProfileVo> list = iUserProfileService.queryList(bo);
         return getDataTable(list);
     }
@@ -62,6 +63,7 @@ public class UserProfileController extends BaseController {
     @GetMapping("/listRecord")
     public TableDataInfo<UserProfileVo> listRecord(UserProfileQueryBo bo) {
         startPage();
+        bo.setTypeStatus(1L);
         List<UserProfileVo> list = iUserProfileService.listRecord(bo);
         return getDataTable(list);
     }

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

@@ -0,0 +1,82 @@
+package com.zhongzheng.controller.base;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.base.bo.UserProfileEditBo;
+import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
+import com.zhongzheng.modules.base.service.IUserProfileService;
+import com.zhongzheng.modules.base.vo.UserProfileVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 填写资料审核Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+@Api(value = "填写盖章审核控制器", tags = {"填写盖章审核控制器"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/base/profileStamp")
+public class UserProfileStampController extends BaseController {
+
+    private final IUserProfileService iUserProfileService;
+
+    /**
+     * 查询填写资料审核列表
+     */
+    @ApiOperation("查询填写盖章审核列表")
+    @PreAuthorize("@ss.hasPermi('system:profile:list')")
+    @GetMapping("/list")
+    public TableDataInfo<UserProfileVo> list(UserProfileQueryBo bo) {
+        startPage();
+        bo.setTypeStatus(2L);
+        List<UserProfileVo> list = iUserProfileService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询填写资料审核列表
+     */
+    @ApiOperation("查询填写盖章审记录列表")
+    @PreAuthorize("@ss.hasPermi('system:profile:list')")
+    @GetMapping("/listRecord")
+    public TableDataInfo<UserProfileVo> listRecord(UserProfileQueryBo bo) {
+        startPage();
+        bo.setTypeStatus(2L);
+        List<UserProfileVo> list = iUserProfileService.listRecord(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取填写资料审核详细信息
+     */
+    @ApiOperation("获取填写盖章审核详细信息")
+    @PreAuthorize("@ss.hasPermi('system:profile:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<UserProfileVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iUserProfileService.queryById(id));
+    }
+
+    /**
+     * 修改填写资料审核
+     */
+    @ApiOperation("审核盖章")
+    @PreAuthorize("@ss.hasPermi('system:profile:edit')")
+    @Log(title = "填写盖章审核", businessType = BusinessType.UPDATE)
+    @PostMapping()
+    public AjaxResult<Void> edit(@RequestBody UserProfileEditBo bo) {
+        return toAjax(iUserProfileService.updateAuditByEditBo(bo) ? 1 : 0);
+    }
+
+}

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

@@ -62,4 +62,8 @@ public class UserProfileAddBo {
     /** 审核时间 */
     @ApiModelProperty("审核时间")
     private Long auditTime;
+
+    /**  1 为资料审核  2为盖章审核 */
+    @ApiModelProperty(" 1 为资料审核  2为盖章审核")
+    private Integer typeStatus;
 }

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

@@ -69,4 +69,8 @@ public class UserProfileEditBo {
     @ApiModelProperty("审核时间")
     private Long auditTime;
 
+    /**  1 为资料审核  2为盖章审核 */
+    @ApiModelProperty(" 1 为资料审核  2为盖章审核")
+    private Integer typeStatus;
+
 }

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

@@ -100,4 +100,9 @@ public class UserProfileQueryBo extends BaseEntity {
 	@Excel(name = "名字")
 	@ApiModelProperty("名字")
 	private String realname;
+
+	/** 所属专业 */
+	@Excel(name = "类型")
+	@ApiModelProperty("类型")
+	private Long typeStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/UserProfile.java

@@ -56,4 +56,7 @@ private static final long serialVersionUID=1L;
     private String text;
     /** 审核时间 */
     private Long auditTime;
+
+    /**  1 为资料审核  2为盖章审核 */
+    private Integer typeStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/UserProfileVo.java

@@ -102,4 +102,7 @@ public class UserProfileVo {
 	/** 审核时间 */
 	@ApiModelProperty("审核时间")
 	private Long auditTime;
+
+	/**  1 为资料审核  2为盖章审核 */
+	private Integer typeStatus;
 }

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

@@ -69,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id !='' ">
             AND up.id =#{id}
         </if>
+        <if test="typeStatus != null and typeStatus !='' ">
+            and up.type_status = #{typeStatus}
+        </if>
         <if test="userId != null and userId !='' ">
             AND up.user_id =#{userId}
         </if>
@@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         user_profile up
         where 1=1
           and up.current_status = 1
+        and up.type_status = 1
         <if test="status != null and status.size()!=0 ">
             AND up.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
@@ -145,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         user_profile up
         where 1=1
+        and up.type_status = 1
         <if test="status != null and status.size()!=0 ">
             AND up.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
@@ -172,8 +177,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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 test="changeStatus != null and changeStatus !='' ">
+            AND up.change_status =#{changeStatus}
         </if>
         order by up.create_time desc
     </select>