单位考评评级

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

@@ -41,9 +41,11 @@ public class OrganizationRatingController {
 				  @RequestParam(value = "pageSize") Integer pageSize,
 				  @RequestParam(value = "id", required = false) String id,
 				  @RequestParam(value = "binSection", required = false) String binSection,
-				  @RequestParam(value = "year", required = false) String year) {
-		IPage<OrganizationRating> list = organizationRatingService.list(pageNum, pageSize, id, binSection, year);
-		return R.ok().data(null);
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "organizationShortName", required = false) String organizationShortName,
+				  @RequestParam(value = "organizationId", required = false) String organizationId) {
+		IPage<OrganizationRating> list = organizationRatingService.list(pageNum, pageSize, id, binSection, year,organizationShortName,organizationId);
+		return R.ok().data(list);
 	}
 
 

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

@@ -19,6 +19,8 @@ public interface OrganizationRatingMapper extends BaseMapper<OrganizationRating>
 
 	IPage<OrganizationRating> selectList(Page page, @Param("id") String id,
 											 @Param("binSection") String binSection,
-											 @Param("year") String year);
+											 @Param("year") String year,
+										 @Param("organizationShortName")  String organizationShortName,
+										 @Param("organizationId")  String organizationId);
 
 }

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

@@ -25,6 +25,17 @@ public class OrganizationRating extends Model {
      */
     private String id;
 
+
+	/**
+	 *考评组织名称（简称）
+	 */
+	private String organizationShortName;
+
+	/**
+	 * 考评组织ID
+	 */
+	private String organizationId;
+
     /**
      * 年度
      */

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

@@ -14,6 +14,6 @@ import com.ims.eval.entity.OrganizationRating;
  */
 public interface IOrganizationRatingService extends IService<OrganizationRating> {
 
-	IPage<OrganizationRating> list(Integer pageNum, Integer pageSize, String id, String binSection, String year);
+	IPage<OrganizationRating> list(Integer pageNum, Integer pageSize, String id, String binSection, String year,String organizationShortName,String organizationId);
 
 }

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

@@ -21,12 +21,12 @@ import org.springframework.stereotype.Service;
 public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatingMapper, OrganizationRating> implements IOrganizationRatingService {
 
 	@Override
-	public IPage<OrganizationRating> list(Integer pageNum, Integer pageSize, String id, String binSection, String year) {
+	public IPage<OrganizationRating> list(Integer pageNum, Integer pageSize, String id, String binSection, String year,String organizationShortName,String organizationId) {
 		Page<OrganizationRatingRule> page = new Page<>(pageNum, pageSize);
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
-		IPage<OrganizationRating> list = baseMapper.selectList(page,id,binSection,year);
+		IPage<OrganizationRating> list = baseMapper.selectList(page,id,binSection,year,organizationShortName,organizationId);
 		return list;
 	}
 }

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

@@ -7,10 +7,10 @@
 
         select
             r.*,
-            bs.section_name binsectionname,
+            bs.section_name binsectionname
         from
             organization_rating r
-            left join bin_section bs on bs.id = r.bin_stage
+            left join bin_section bs on bs.section_code = r.bin_section
         <where>
 
 
@@ -21,14 +21,16 @@
             <if test="binSection !=null and binSection !=''">
                 and r.bin_section=#{binSection}
             </if>
+            <if test="year !=null and year !=''">
+                and r.year=#{year}
+            </if>
 
-
-            <if test="ruleName !=null and ruleName !=''">
-                AND  r.rule_name like CONCAT('%',#{ruleName},'%')
+            <if test="organizationShortName !=null and organizationShortName !=''">
+                AND  r.organization_short_name like CONCAT('%',#{organizationShortName},'%')
             </if>
 
-            <if test="checkCycle !=null and checkCycle !=''">
-                and r.check_cycle=#{checkCycle}
+            <if test="organizationId !=null and organizationId !=''">
+                and r.organization_id=#{organizationId}
             </if>
 
         </where>

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

@@ -40,4 +40,3 @@
 
     </select>
 </mapper>
--