Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

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);
@@ -52,7 +55,13 @@ public interface OpinionUserClient {
     /**
      * 获取考核区列表
      */
-    @GetMapping(API_PREFIX + "/queryUserAssessmentPage")
-    R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(@RequestParam Query query, @RequestParam AssessmentUserVOS vo);
+    @GetMapping(API_PREFIX + "/queryUserAssessmentPageList")
+    List<AssessmentUserVOS> queryUserAssessmentPageList(@RequestBody AssessmentUserVOS vo);
+
+    /**
+     * 统计考核区列表
+     */
+    @GetMapping(API_PREFIX + "/countUserAssessmentPageList")
+    Integer countUserAssessmentPageList(@RequestBody AssessmentUserVOS vo);
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/BusinessUserOpinionController.java

@@ -12,15 +12,15 @@ import org.apache.commons.lang.StringUtils;
 import org.springblade.business.entity.UserOpinionFlow;
 import org.springblade.business.service.IUserOpinionFlowService;
 import org.springblade.business.service.IUserOpinionService;
+import org.springblade.business.vo.AssessmentUserVOS;
 import org.springblade.business.vo.BusinessUserOpinionVO;
 import org.springblade.business.vo.UserOpinionFlowVO;
+import org.springblade.core.mp.support.Condition;
 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;
 import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -34,6 +34,29 @@ public class BusinessUserOpinionController {
 
     private final IUserOpinionFlowService userOpinionFlowService;
 
+    /**
+     * 考核区分页
+     */
+    @GetMapping("/queryUserAssessmentPage")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "考核区分页")
+    public R<IPage<AssessmentUserVOS>> queryUserAssessmentPageList(AssessmentUserVOS vo){
+        Query query = new Query();
+        query.setCurrent(vo.getCurrent());
+        query.setSize(vo.getSize());
+        //分页信息
+        IPage<AssessmentUserVOS> iPage = Condition.getPage(query);
+        //总数
+        Integer count = this.userOpinionFlowService.countUserAssessmentPageList(vo);
+        //分页数据
+        List<AssessmentUserVOS> result = this.userOpinionFlowService.queryUserAssessmentPage(vo);
+
+        iPage.setTotal(count);
+        iPage.setRecords(result);
+
+        return R.data(iPage);
+    }
+
     /**
      * 获取所有工单及处理进度
      * @param query 分页信息

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,12 @@ public class OpinionUserClientImpl implements OpinionUserClient {
     }
 
     @Override
-    public R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(Query query, AssessmentUserVOS vo) {
-        return this.userOpinionFlowService.queryUserAssessmentPage(query, vo);
+    public List<AssessmentUserVOS> queryUserAssessmentPageList(AssessmentUserVOS vo) {
+        return this.userOpinionFlowService.queryUserAssessmentPage(vo);
     }
+
+    public Integer countUserAssessmentPageList(AssessmentUserVOS vo){
+        return this.userOpinionFlowService.countUserAssessmentPageList(vo);
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/UserOpinionFlowMapper.xml

@@ -44,11 +44,8 @@
         (
             select id,date_format(create_time,'%Y-%m-%d %H:%i') as createTime from u_user_opinion_flow where
                 is_deleted = 0
-                /*查最后环节*/
                 and sort = 4
-                /*最后环节已经结束*/
                 and is_current = 2
-                /*属于不满意并投诉*/
                 and evaluation = 3
             <if test="vo.userId != null">
                 and manage_user = #{vo.userId}
@@ -76,8 +73,8 @@
             select
                 uof.id AS uoFlowId,
                 au.id AS assessmentId,
-                date_format(au.create_time,'%Y-%m-%d %H:%i') as createTime
-                au.assessment_money AS assessmentMoney
+                date_format(au.create_time,'%Y-%m-%d %H:%i') as createTime,
+                au.assessment_money AS assessmentMoney,
                 au.assessment_content AS assessmentContent,
                 pi.project_name AS projectName,
                 ci.contract_name AS contractName,
@@ -91,11 +88,8 @@
             left join m_contract_info AS ci on uo.contract_id = ci.id
             where
               uof.is_deleted = 0 and au.is_deleted = 0 and uo.is_deleted = 0
-            /*查最后环节*/
             and uof.sort = 4
-            /*最后环节已经结束*/
             and uof.is_current = 2
-            /*属于不满意并投诉*/
             and uof.evaluation = 3
             <if test="vo.userId != null">
                 and uof.manage_user = #{vo.userId}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/UserOpinionMapper.xml

@@ -27,7 +27,7 @@
         <result column="manageTime" property="manageTime"/>
         <result column="create_time" property="createTime"/>
         <result column="projectName" property="projectName"/>
-        <result column="contractId" property="contractName"/>
+        <result column="contractName" property="contractName"/>
         <result column="problemType" property="problemType"/>
         <result column="opinionContent" property="opinionContent"/>
         <result column="isCurrent" property="isCurrent"/>
@@ -66,7 +66,7 @@
                 and sort = 4 order by number DESC
             ) as uof group by uof.user_opinion_id
         ) as uof on uof.user_opinion_id = uo.id
-        where uo.is_deleted = 0;
+        where uo.is_deleted = 0
     </select>
 
     <select id="queryCurrentUserOpinionList" resultMap="userOpinionResultMap">

blade-service/blade-business/src/main/java/org/springblade/business/service/IUserOpinionFlowService.java

@@ -33,7 +33,9 @@ import java.util.List;
  */
 public interface IUserOpinionFlowService extends BaseService<UserOpinionFlow> {
 
-	R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(Query query, AssessmentUserVOS vo);
+	Integer countUserAssessmentPageList(AssessmentUserVOS vo);
+
+	List<AssessmentUserVOS> queryUserAssessmentPage(AssessmentUserVOS vo);
 
 	/**
 	 * 获取前一个流程的维护人员

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UserOpinionFlowServiceImpl.java

@@ -41,19 +41,14 @@ import org.springblade.core.mp.support.Query;
 public class UserOpinionFlowServiceImpl extends BaseServiceImpl<UserOpinionFlowMapper, UserOpinionFlow> implements IUserOpinionFlowService {
 
 	@Override
-	public R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(Query query, AssessmentUserVOS vo) {
-		//设置分页信息
-		IPage<AssessmentUserVOS> page = Condition.getPage(query);
-		long current = (page.getCurrent() - 1L) * page.getSize();
-		//查询总量
-		Integer count = this.baseMapper.countUserAssessmentPage(vo);
-		//获取分页
-		List<AssessmentUserVOS> result = this.baseMapper.queryUserAssessmentPage(current, page.getSize(), vo);
-
-		page.setTotal(count);
-		page.setRecords(result);
+	public Integer countUserAssessmentPageList(AssessmentUserVOS vo) {
+		return this.baseMapper.countUserAssessmentPage(vo);
+	}
 
-		return R.data(page);
+	@Override
+	public List<AssessmentUserVOS> queryUserAssessmentPage(AssessmentUserVOS vo) {
+		long current = (vo.getCurrent() - 1L) * vo.getSize();
+		return this.baseMapper.queryUserAssessmentPage(current, vo.getSize().longValue(), vo);
 	}
 
 	@Override

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

@@ -1,7 +1,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;
@@ -9,9 +9,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.business.entity.AssessmentUser;
 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;
@@ -20,7 +18,6 @@ import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.user.entity.User;
 import org.springframework.web.bind.annotation.*;
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -33,7 +30,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/assessmentUser")
-@Api(value = "考核区接口")
+@Api(value = "考核区接口", tags = "考核区接口")
 public class AssessmentUserController extends BladeController {
 
     private final OpinionUserClient opinionUserClient;
@@ -59,7 +56,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){
                     //考核金额
@@ -82,7 +79,6 @@ public class AssessmentUserController extends BladeController {
             //设置返回结果
             result.add(vo);
         });
-
         return R.data(result);
     }
 
@@ -112,9 +108,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 +122,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));
     }
 
@@ -160,18 +156,27 @@ public class AssessmentUserController extends BladeController {
         return R.data(this.opinionUserClient.saveUserAssessment(assessmentUser));
     }
 
-    /**
-     * 考核区分页
-     */
-    @GetMapping("/queryUserAssessmentPage")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "考核区分页")
-    public R<IPage<AssessmentUserVOS>> queryUserAssessmentPage(@RequestBody AssessmentUserVOS vo){
-        Query query = new Query();
-        query.setSize(vo.getSize());
-        query.setCurrent(vo.getCurrent());
-
-        return this.opinionUserClient.queryUserAssessmentPage(query, vo);
-    }
+//    /**
+//     * 考核区分页
+//     */
+//    @GetMapping("/queryUserAssessmentPage")
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation(value = "考核区分页")
+//    public R<IPage<AssessmentUserVOS>> queryUserAssessmentPageList(AssessmentUserVOS vo){
+//        Query query = new Query();
+//        query.setCurrent(vo.getCurrent());
+//        query.setSize(vo.getSize());
+//        //分页信息
+//        IPage<AssessmentUserVOS> iPage = Condition.getPage(query);
+//        //总数
+//        Integer count = this.opinionUserClient.countUserAssessmentPageList(vo);
+//        //分页数据
+//        List<AssessmentUserVOS> result = this.opinionUserClient.queryUserAssessmentPageList(vo);
+//
+//        iPage.setTotal(count);
+//        iPage.setRecords(result);
+//
+//        return R.data(iPage);
+//    }
 
 }