From 132119f2541528467e92e5fc9c0cc95d24336b46 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 06 Jan 2024 16:30:06 +0800
Subject: [PATCH] h5页面根据结束时间过滤
---
src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java | 2
src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java | 4 +-
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java | 2
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java | 53 ++++++++++----------------
src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml | 13 ++++++
5 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
index 0694adb..e19545f 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
@@ -16,34 +16,34 @@
*/
package org.springblade.modules.assessment.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
-import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
-import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
-import org.springblade.modules.assessment.wrapper.AssessmentSetAssessorWrapper;
-import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
+import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import org.springblade.modules.assessment.wrapper.AssessmentSetAssessorWrapper;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 考核任务考核人 控制器
@@ -83,20 +83,9 @@
@GetMapping("/listByAssessor")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "h5任务列表-分页", notes = "传入evaluateCandidateAssessor")
- public R<IPage<AssessmentSetAssessorVO>> listByAssessor(@ApiIgnore @RequestParam Map<String, Object> assessmentSetAssessor, Query query) {;
- IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(assessmentSetAssessor, AssessmentSetAssessorEntity.class));
- return R.data(AssessmentSetAssessorWrapper.build().h5PageVO(pages, Long.valueOf(assessmentSetAssessor.get("userId").toString())));
- }
-
- /**
- * 考核任务考核人 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入assessmentSetAssessor")
- public R<IPage<AssessmentSetAssessorVO>> page(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {
- IPage<AssessmentSetAssessorVO> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
- return R.data(pages);
+ public R<IPage<AssessmentSetAssessorVO>> listByAssessor(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {;
+ IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
+ return R.data(AssessmentSetAssessorWrapper.build().h5PageVO(pages, Long.valueOf(assessmentSetAssessor.getUserId())));
}
/**
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java
index 4c1ad0a..c791b10 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java
@@ -40,7 +40,7 @@
* @param assessmentSetAssessor
* @return
*/
- List<AssessmentSetAssessorVO> selectAssessmentSetAssessorPage(IPage page, AssessmentSetAssessorVO assessmentSetAssessor);
+ List<AssessmentSetAssessorEntity> selectAssessmentSetAssessorPage(IPage page, AssessmentSetAssessorVO assessmentSetAssessor);
/**
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml
index 4e69fb1..607f336 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml
@@ -25,7 +25,18 @@
<select id="selectAssessmentSetAssessorPage" resultMap="assessmentSetAssessorResultMap">
- select * from yw_assessment_set_assessor where is_deleted = 0
+ select DISTINCT a.* from (
+ select * from yw_assessment_set_assessor where is_deleted = 0
+ ) a
+ left JOIN yw_assessment_set b ON (a.assessment_set_id = b.id)
+ left JOIN yw_assessment_task c ON (b.assessment_task_id = c.id)
+ <where>
+ <if test="assessmentSetAssessor.userId != null and assessmentSetAssessor.userId != ''">
+ and a.user_id = #{assessmentSetAssessor.userId}
+ </if>
+ and c.is_assessment_ok = 0
+ </where>
+
</select>
diff --git a/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java b/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java
index ea0736a..7ae6d67 100644
--- a/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java
+++ b/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java
@@ -32,13 +32,13 @@
*/
public interface IAssessmentSetAssessorService extends BaseService<AssessmentSetAssessorEntity> {
/**
- * 自定义分页
+ * 查询任务状态未完成的分页数据
*
* @param page
* @param assessmentSetAssessor
* @return
*/
- IPage<AssessmentSetAssessorVO> selectAssessmentSetAssessorPage(IPage<AssessmentSetAssessorVO> page, AssessmentSetAssessorVO assessmentSetAssessor);
+ IPage<AssessmentSetAssessorEntity> selectAssessmentSetAssessorPage(IPage<AssessmentSetAssessorEntity> page, AssessmentSetAssessorVO assessmentSetAssessor);
/**
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
index 48e6617..41deb6e 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
@@ -37,7 +37,7 @@
public class AssessmentSetAssessorServiceImpl extends BaseServiceImpl<AssessmentSetAssessorMapper, AssessmentSetAssessorEntity> implements IAssessmentSetAssessorService {
@Override
- public IPage<AssessmentSetAssessorVO> selectAssessmentSetAssessorPage(IPage<AssessmentSetAssessorVO> page, AssessmentSetAssessorVO assessmentSetAssessor) {
+ public IPage<AssessmentSetAssessorEntity> selectAssessmentSetAssessorPage(IPage<AssessmentSetAssessorEntity> page, AssessmentSetAssessorVO assessmentSetAssessor) {
return page.setRecords(baseMapper.selectAssessmentSetAssessorPage(page, assessmentSetAssessor));
}
--
Gitblit v1.9.3