学校绑定经销商

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/basicteachingplan/QuerySuperviseForm.java

@@ -30,6 +30,9 @@ public class QuerySuperviseForm {
 
 	@ApiModelProperty("省下面所有学校的集合")
 	private List<Integer> schools;
+
+	@ApiModelProperty("学校名称")
+	private String schoolName;
 	
 	
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/basicteachingplan/FgBasicTeachingPlanMapper.java

@@ -325,12 +325,13 @@ public interface FgBasicTeachingPlanMapper extends BaseMapper<BasicTeachingPlan>
 	 * @data 2019年9月5日 下午3:27:17
 	 */
 	@Select("<script>"
-			+ " SELECT s.relationId,s.academicLevel from me_basic_teaching_plan s "
-			+ " WHERE 1=1 and s.status != -1 "
+			+ " SELECT s.relationId,s.academicLevel from me_basic_teaching_plan s,`jgjy-member`.me_school m "
+			+ " WHERE 1=1 and s.status != -1 and s.relationId = m.id "
 			+ " eq(s.relationId,query.relationId) "
 			+ " eq(s.academicLevel,query.academicLevel) "
 			+ " in(s.superviseId,query.superviseIds) "
-			+ " in(s.relationId,query.schools) "
+			+ " in(s.relationId,query.schools) " +
+			" like(m.name,query.schoolName) "
 			+ " group by s.relationId,s.academicLevel "
 			+ "</script>")
 	List<SuperviseVo> superviseList(@Param("query") QuerySuperviseForm form);

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/biddingcycle/FgBiddingCycleServiceImpl.java

@@ -146,12 +146,7 @@ public class FgBiddingCycleServiceImpl extends BaseModelServiceImpl<BiddingCycle
             throw new BaseException("请首先创建征订流程");
         }
 
-        try {
-            bookRecommendService.insertBookRecommendList(depth, form);
-        } catch (Exception e) {
-            log.info("开启征订周期是同步推荐教材数据失败" + e);
-            throw new BaseException("创建征订周期失败");
-        }
+        bookRecommendService.insertBookRecommendList(depth, form);
 
         return true;
     }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/book/BookRecommendServiceImpl.java

@@ -142,7 +142,7 @@ public class BookRecommendServiceImpl extends BaseModelServiceImpl<BookRecommend
         List<FgPublicBasicRelationVo> relationVos = relationService.list(cycle);
         if (relationVos == null || relationVos.size() == 0) {
             log.warn("BookRecommendServiceImpl#insertBookRecommendList：" + "depth:" +depth + "获取教材推荐relationVos为0直接返回");
-            throw new BaseException("获取公共基础课程推荐教材为空");
+            throw new BaseException("当前征订季对应的推荐教材不能为空");
         }
 
         List<BookRecommend> recommends = BeanUtils.copyList(relationVos, BookRecommend.class);