添加评级子表

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

@@ -46,11 +46,12 @@ public class OrganizationRatingController {
 	public R list(@RequestParam(value = "pageNum") Integer pageNum,
 				  @RequestParam(value = "pageSize") Integer pageSize,
 				  @RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "organizationYearRatingId", required = false) String organizationYearRatingId,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @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);
+		IPage<OrganizationRating> list = organizationRatingService.list(pageNum, pageSize, id,organizationYearRatingId, binSection, year,organizationShortName,organizationId);
 		return R.ok().data(list);
 	}
 

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

@@ -18,9 +18,10 @@ import org.apache.ibatis.annotations.Param;
 public interface OrganizationRatingMapper extends BaseMapper<OrganizationRating> {
 
 	IPage<OrganizationRating> selectList(Page page, @Param("id") String id,
-											 @Param("binSection") String binSection,
-											 @Param("year") String year,
-										 @Param("organizationShortName")  String organizationShortName,
-										 @Param("organizationId")  String organizationId);
+										 @Param("organizationYearRatingId") String organizationYearRatingId,
+										 @Param("binSection") String binSection,
+										 @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

@@ -26,12 +26,18 @@ public class OrganizationRating extends Model {
      */
     private String id;
 
+	/**
+	 * 主表id
+	 */
+	private String organizationYearRatingId;
+
 
 	/**
 	 *考评组织名称（简称）
 	 */
 	private String organizationShortName;
 
+
 	/**
 	 * 考评组织ID
 	 */

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,String organizationShortName,String organizationId);
+	IPage<OrganizationRating> list(Integer pageNum, Integer pageSize, String id,String organizationYearRatingId, 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,String organizationShortName,String organizationId) {
+	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);
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
-		IPage<OrganizationRating> list = baseMapper.selectList(page,id,binSection,year,organizationShortName,organizationId);
+		IPage<OrganizationRating> list = baseMapper.selectList(page,id,organizationYearRatingId,binSection,year,organizationShortName,organizationId);
 		return list;
 	}
 }

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

@@ -17,6 +17,10 @@
             <if test="id !=null and id !=''">
                 and r.id=#{id}
             </if>
+            <if test="organizationYearRatingId !=null and organizationYearRatingId !=''">
+                and r.organization_year_rating_id=#{organizationYearRatingId}
+            </if>
+
 
             <if test="binSection !=null and binSection !=''">
                 and r.bin_section=#{binSection}