考评权重添加年度字段he筛选条件

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

@@ -55,8 +55,9 @@ public class OrganizationEvaluationRuleController {
 				  @RequestParam(value = "organizationType", required = false) String organizationType,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage,
-				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
-		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
+				  @RequestParam(value = "year", required = false) String year) {
+		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle,year);
 		return R.ok().data(list);
 	}
 
@@ -70,8 +71,9 @@ public class OrganizationEvaluationRuleController {
 				  @RequestParam(value = "organizationType", required = false) String organizationType,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage,
-				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
-		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
+				  @RequestParam(value = "year", required = false) String year) {
+		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle,year);
 		return R.ok().data(list);
 	}
 
@@ -96,8 +98,9 @@ public class OrganizationEvaluationRuleController {
 		@RequestParam(value = "organizationType", required = false) String organizationType,
 		@RequestParam(value = "binSection", required = false) String binSection,
 		@RequestParam(value = "binStage", required = false) String binStage,
-		@RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
-		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
+		@RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
+		@RequestParam(value = "year", required = false) String year) {
+		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle,year);
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/OrganizationEvaluationRuleMapper.java

@@ -24,7 +24,8 @@ public interface OrganizationEvaluationRuleMapper extends BaseMapper<Organizatio
 										   @Param("organizationType") String organizationType,
 										   @Param("binSection") String binSection,
 										   @Param("binStage") String binStage,
-										   @Param("evaluationCycle") String evaluationCycle);
+										   @Param("evaluationCycle") String evaluationCycle,
+										   @Param("year") String year);
 
 
 	List<OrganizationEvaluationRule> selectListAll(@Param("id")String id,
@@ -33,7 +34,8 @@ public interface OrganizationEvaluationRuleMapper extends BaseMapper<Organizatio
 												   @Param("organizationType") String organizationType,
 												   @Param("binSection") String binSection,
 												   @Param("binStage") String binStage,
-												   @Param("evaluationCycle") String evaluationCycle);
+												   @Param("evaluationCycle") String evaluationCycle,
+												   @Param("year") String year);
 
 
 	List<OrganizationEvaluationRule> selectOrganizationRuleId(@Param("ids") List<String> ids);

ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationEvaluationRule.java

@@ -145,5 +145,10 @@ public class OrganizationEvaluationRule extends Model {
 	 */
 	private String businessType;
 
+	/**
+	 * 年
+	 */
+	private String year;
+
 
 }

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

@@ -17,12 +17,12 @@ import java.util.List;
  */
 public interface IOrganizationEvaluationRuleService extends IService<OrganizationEvaluationRule> {
 
-	IPage<OrganizationEvaluationRule> list( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle);
+	IPage<OrganizationEvaluationRule> list( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year);
 
-	List<OrganizationEvaluationRule> listAll( String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle);
+	List<OrganizationEvaluationRule> listAll( String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year);
 
 
-	IPage<OrganizationEvaluationRule> list2( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle);
+	IPage<OrganizationEvaluationRule> list2( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year);
 
 	List<OrganizationEvaluationRule> listByIsCheck(String organizationType,String evaluationCycle,Boolean isCheck,Boolean delFlag);
 

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

@@ -46,7 +46,7 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 
 
 	@Override
-	public IPage<OrganizationEvaluationRule> list(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
+	public IPage<OrganizationEvaluationRule> list(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year) {
 		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
 		//构造分页构造器
 		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
@@ -80,7 +80,9 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		if (StringUtils.isNotEmpty(evaluationCycle)) {
 			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, evaluationCycle);
 		}
-
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(OrganizationEvaluationRule::getYear, year);
+		}
 
 		qw.lambda().eq(OrganizationEvaluationRule::getDelFlag, false);
 
@@ -98,10 +100,10 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 	}
 
 	@Override
-	public List<OrganizationEvaluationRule> listAll(String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
+	public List<OrganizationEvaluationRule> listAll(String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year) {
 
 
-		List<OrganizationEvaluationRule> list = baseMapper.selectListAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
+		List<OrganizationEvaluationRule> list = baseMapper.selectListAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle,year);
 
 		list().stream().forEach(l->{
 			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
@@ -129,9 +131,9 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 	}
 
 	@Override
-	public IPage<OrganizationEvaluationRule> list2(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
+	public IPage<OrganizationEvaluationRule> list2(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year) {
 		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
-		IPage<OrganizationEvaluationRule>  list = baseMapper.list(page, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
+		IPage<OrganizationEvaluationRule>  list = baseMapper.list(page, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle,year);
 		list.getRecords().stream().forEach(l->{
 
 			StringBuilder binStageName =  new StringBuilder();

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationRuleMapper.xml

@@ -67,6 +67,11 @@
                     AND r.evaluation_cycle = #{evaluationCycle}
                 </if>
 
+                <if test="year !=null and year !=''">
+                    AND r.year = #{year}
+                </if>
+
+
                 order by r.organization_short_name asc
 
             </where>
@@ -111,6 +116,10 @@
                 AND r.evaluation_cycle = #{evaluationCycle}
             </if>
 
+            <if test="year !=null and year !=''">
+                AND r.year = #{year}
+            </if>
+
             order by order_num asc
 
         </where>