问题修改

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentPerformanceAppraisalRatingController.java

@@ -65,8 +65,9 @@ public class DepartmentPerformanceAppraisalRatingController {
 	 * @return 结果
 	 */
 	@GetMapping(value = "/listAll")
-	public R listAll() {
-		List<EvaluationDeptRating> list = evaluationDeptRatingService.list();
+	public R listAll(@RequestParam(value = "deptName", required = false) String deptName,
+					 @RequestParam(value = "annual", required = false) String annual) {
+		List<EvaluationDeptRating> list = evaluationDeptRatingService.list(deptName, annual);
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationDeptRatingService.java

@@ -16,4 +16,6 @@ public interface IEvaluationDeptRatingService extends IService<EvaluationDeptRat
 	IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptName, String annual);
 
 	boolean saveOrUpdate(EvaluationDeptRating evaluationDeptRating);
+
+	List<EvaluationDeptRating> list(String deptName, String annual);
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptRatingServiceImpl.java

@@ -8,10 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptRatingMapper;
-import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 import com.ims.eval.entity.EvaluationDeptRating;
 import com.ims.eval.service.IEvaluationDeptRatingService;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -89,4 +87,16 @@ public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptR
 		evaluationDeptRating.setAcount(Convert.toStr(count));
 		return super.saveOrUpdate(evaluationDeptRating);
 	}
+
+	@Override
+	public List<EvaluationDeptRating> list(String deptName, String annual) {
+		QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(deptName)) {
+			qw.lambda().eq(EvaluationDeptRating::getDeptName, deptName);
+		}
+		if (StringUtils.isNotEmpty(annual)) {
+			qw.lambda().eq(EvaluationDeptRating::getAnnual, annual);
+		}
+		return super.list(qw);
+	}
 }