评级处理详情处理

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

@@ -7,6 +7,8 @@ import com.ims.eval.entity.OrganizationRating;
 import com.ims.eval.entity.OrganizationRatingRule;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 年度评级 Mapper 接口
@@ -24,4 +26,9 @@ public interface OrganizationRatingMapper extends BaseMapper<OrganizationRating>
 										 @Param("organizationShortName") String organizationShortName,
 										 @Param("organizationId") String organizationId);
 
+
+	List<OrganizationRating> selectListSating(@Param("organizationYearRatingId")String organizationYearRatingId,
+											  @Param("year")String year,
+											  @Param("organizationId")String organizationId);
+
 }

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

@@ -21,6 +21,6 @@ public interface IOrganizationRatingService extends IService<OrganizationRating>
 
 	boolean generateRating(String organizationYearRatingId, String year);
 
-	List<OrganizationRating> list(String organizationYearRatingId, String year, String organizationId);
+	List<OrganizationRating> getListSating(String organizationYearRatingId, String year, String organizationId);
 
 }

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

@@ -1,9 +1,7 @@
 package com.ims.eval.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.OrganizationRatingMapper;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.entity.OrganizationRating;
@@ -11,6 +9,7 @@ import com.ims.eval.entity.OrganizationRatingRule;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import com.ims.eval.service.IOrganizationRatingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -30,7 +29,9 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 
 
 
+	@Autowired
 	private IOrganizationEvaluationRuleService organizationEvaluationRuleService;
+
 	@Override
 	public IPage<OrganizationRating> list(Integer pageNum, Integer pageSize, String id,String organizationYearRatingId, String binSection, String year,String organizationShortName,String organizationId) {
 		Page<OrganizationRatingRule> page = new Page<>(pageNum, pageSize);
@@ -43,9 +44,9 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 
 	@Override
 	public boolean generateRating(String organizationYearRatingId, String year) {
-		List<OrganizationRating> ratings = list( organizationYearRatingId,  year,  "");
+		List<OrganizationRating> ratings = getListSating( organizationYearRatingId,  year,  "");
 		List<String> collect = ratings.stream().map(OrganizationRating::getOrganizationId).collect(Collectors.toList());
-		List<OrganizationEvaluationRule> evaluationRules =  organizationEvaluationRuleService.listByIsCheck("","NDKP",year,true,false);
+		List<OrganizationEvaluationRule> evaluationRules =  organizationEvaluationRuleService.listByIsCheck("DWKP","NDKP",year,true,false);
 
 		List<OrganizationRating> addRatings = new ArrayList<>();
 		for (OrganizationEvaluationRule rule : evaluationRules){
@@ -56,8 +57,9 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 			rating.setOrganizationYearRatingId(organizationYearRatingId);
 			rating.setOrganizationShortName(rule.getOrganizationShortName());
 			rating.setOrganizationId(rule.getOrganizationId());
-			rating.setYearRate(year);
-			rating.setBinSection(rule.getBinSection());
+			rating.setYear(year);
+			rating.setYearRate("A");
+			rating.setBinSection(rule.getBinSection().split(",")[0]);
 			addRatings.add(rating);
 		}
 
@@ -66,22 +68,9 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 	}
 
 	@Override
-	public List<OrganizationRating> list(String organizationYearRatingId, String year, String organizationId) {
-		QueryWrapper<OrganizationRating> qw = new QueryWrapper<>();
-
-		if (StringUtils.isNotEmpty(organizationYearRatingId)) {
-			qw.lambda().eq(OrganizationRating::getOrganizationYearRatingId, organizationYearRatingId);
-		}
-
-		if (StringUtils.isNotEmpty(year)) {
-			qw.lambda().eq(OrganizationRating::getYear, year);
-		}
-
-		if (StringUtils.isNotEmpty(organizationId)) {
-			qw.lambda().eq(OrganizationRating::getOrganizationId, organizationId);
-		}
+	public List<OrganizationRating> getListSating(String organizationYearRatingId, String year, String organizationId) {
 
-		List<OrganizationRating> list = baseMapper.selectList(qw);
+		List<OrganizationRating> list = baseMapper.selectListSating(organizationYearRatingId,year,organizationId);
 		return list;
 	}
 }

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

@@ -40,4 +40,23 @@
         </where>
 
     </select>
+    <select id="selectListSating" resultType="com.ims.eval.entity.OrganizationRating">
+        select
+        *
+        from
+        organization_rating r
+        <where>
+            <if test="organizationYearRatingId !=null and organizationYearRatingId !=''">
+                and r.organization_year_rating_id=#{organizationYearRatingId}
+            </if>
+            <if test="year !=null and year !=''">
+                and r.year=#{year}
+            </if>
+            <if test="organizationId !=null and organizationId !=''">
+                and r.organization_id=#{organizationId}
+            </if>
+
+        </where>
+
+    </select>
 </mapper>