修复BUG

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/OpinionUserClient.java

@@ -22,23 +22,26 @@ public interface OpinionUserClient {
      */
     String API_PREFIX = "/api/business/opinionUser";
 
+    /**
+     * 取消考核
+     */
     @PostMapping(API_PREFIX + "/cancelAssessment")
-    Boolean cancelAssessment(@RequestParam Long id);
+    Boolean cancelAssessment(@RequestParam String id);
 
     /**
      * 获取用户的被考核记录
      */
-    @GetMapping("/queryUserAssessmentByUserId")
-    List<AssessmentUser> queryUserAssessmentByUserId(@RequestParam Long userId);
+    @GetMapping(API_PREFIX + "/queryUserAssessmentByUserId")
+    List<AssessmentUser> queryUserAssessmentByUserId(@RequestParam String userId);
 
     /**
-     * 新增考核
+     * 获取详情
      */
     @PostMapping(API_PREFIX + "/getById")
-    AssessmentUser getById(@RequestParam Long id);
+    AssessmentUser getById(@RequestParam String id);
 
     /**
-     * 新增考核
+     * 修改考核
      */
     @PostMapping(API_PREFIX + "/updateUserAssessment")
     Boolean updateUserAssessment(@RequestBody AssessmentUser assessmentUser);
@@ -53,6 +56,6 @@ public interface OpinionUserClient {
      * 获取考核区列表
      */
     @GetMapping(API_PREFIX + "/queryUserAssessmentPage")
-    R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(@RequestParam Query query, @RequestParam AssessmentUserVOS vo);
+    R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(@RequestBody AssessmentUserVOS vo);
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/OpinionUserClientImpl.java

@@ -24,17 +24,17 @@ public class OpinionUserClientImpl implements OpinionUserClient {
     private final IAssessmentUserService assessmentUserService;
 
     @Override
-    public List<AssessmentUser> queryUserAssessmentByUserId(Long userId) {
+    public List<AssessmentUser> queryUserAssessmentByUserId(String userId) {
         return this.assessmentUserService.list(Wrappers.<AssessmentUser>lambdaQuery().eq(AssessmentUser::getIsDeleted, 0).eq(AssessmentUser::getAssessmentUser, userId));
     }
 
     @Override
-    public Boolean cancelAssessment(Long id) {
+    public Boolean cancelAssessment(String id) {
         return this.assessmentUserService.update(Wrappers.<AssessmentUser>lambdaUpdate().set(AssessmentUser::getIsDeleted, 1).eq(AssessmentUser::getId, id));
     }
 
     @Override
-    public AssessmentUser getById(Long id) {
+    public AssessmentUser getById(String id) {
         return this.assessmentUserService.getById(id);
     }
 
@@ -49,7 +49,11 @@ public class OpinionUserClientImpl implements OpinionUserClient {
     }
 
     @Override
-    public R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(Query query, AssessmentUserVOS vo) {
+    public R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(AssessmentUserVOS vo) {
+        Query query = new Query();
+        query.setSize(vo.getSize());
+        query.setCurrent(vo.getCurrent());
+
         return this.userOpinionFlowService.queryUserAssessmentPage(query, vo);
     }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/AssessmentUserController.java

@@ -2,6 +2,7 @@ package org.springblade.manager.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.mixsmart.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -11,7 +12,6 @@ import org.springblade.business.feign.OpinionUserClient;
 import org.springblade.business.vo.AssessmentUserContentVO;
 import org.springblade.business.vo.AssessmentUserVOS;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -59,7 +59,7 @@ public class AssessmentUserController extends BladeController {
             vo.setUserName(user.getRealName());
 
             //查询当前用户的考核记录
-            List<AssessmentUser> assessmentUsers = this.opinionUserClient.queryUserAssessmentByUserId(user.getId());
+            List<AssessmentUser> assessmentUsers = this.opinionUserClient.queryUserAssessmentByUserId(user.getId().toString());
             if(assessmentUsers != null && assessmentUsers.size() > 0){
                 for(DictBiz dictBiz : dictBizs){
                     //考核金额
@@ -112,9 +112,9 @@ public class AssessmentUserController extends BladeController {
     @PostMapping("/cancelAssessment")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "取消考核")
-    @ApiImplicitParam(value = "id", name = "分页中的assessmentId", required = true)
-    public R<Boolean> cancelAssessment(@RequestParam Long id){
-        if(id == -1){
+    @ApiImplicitParam(name = "id", value = "分页中的assessmentId", required = true)
+    public R<Boolean> cancelAssessment(@RequestParam String id){
+        if("-1".equals(id) || StringUtils.isEmpty(id)){
             return R.data(-1, false, "缺少id或id不能为-1");
         }
         return R.data(this.opinionUserClient.cancelAssessment(id));
@@ -126,8 +126,8 @@ public class AssessmentUserController extends BladeController {
     @PostMapping("/getById")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "详情查看")
-    @ApiImplicitParam(value = "id", name = "分页中的assessmentId", required = true)
-    public R<AssessmentUser> getById(@RequestParam Long id){
+    @ApiImplicitParam(name = "id", value = "分页中的assessmentId", required = true)
+    public R<AssessmentUser> getById(@RequestParam String id){
         return R.data(this.opinionUserClient.getById(id));
     }
 
@@ -167,11 +167,7 @@ public class AssessmentUserController extends BladeController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "考核区分页")
     public R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(AssessmentUserVOS vo){
-        Query query = new Query();
-        query.setSize(vo.getSize());
-        query.setCurrent(vo.getCurrent());
-
-        return this.opinionUserClient.queryUserAssessmentPage(query, vo);
+        return this.opinionUserClient.queryUserAssessmentPage(vo);
     }
 
 }