submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -276,9 +276,9 @@ public class CommonController
     @ApiOperation("查询预开班官方班级编号")
     @PostMapping("common/free/officialGrade/num")
     public AjaxResult getOfficialGradeNum(@RequestBody ClassOfficialNumBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
+//        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+//            return AjaxResult.error("签名错误");
+//        }
         return AjaxResult.success(iClassGradeService.getOfficialGradeNum(bo));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseBusinessMapper.java

@@ -23,4 +23,7 @@ public interface CourseBusinessMapper extends BaseMapper<CourseBusiness> {
 
     @InterceptorIgnore(tenantLine = "true")
     CourseBusiness getBusinessByTenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CourseBusiness getBusinessByIdTenant(@Param("businessId") Long businessId,@Param("tenantId") Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseEducationTypeMapper.java

@@ -21,4 +21,7 @@ public interface CourseEducationTypeMapper extends BaseMapper<CourseEducationTyp
 
     @InterceptorIgnore(tenantLine = "true")
     CourseEducationType getEducationTypeBytenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CourseEducationType getEducationTypeByIdtenant(@Param("educationTypeId")Long educationTypeId,@Param("tenantId") Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseSubjectMapper.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.course.domain.CourseSubject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.course.vo.CourseSubjectVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeListBo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
@@ -34,4 +35,7 @@ public interface CourseSubjectMapper extends BaseMapper<CourseSubject> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<Long> getIdsByTenant(@Param("subNames")List<String> subNames);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<CourseSubject> listByIdsTenant(ClassGradeListBo bgListBo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseBusinessService.java

@@ -63,4 +63,6 @@ public interface ICourseBusinessService extends IService<CourseBusiness> {
 	String queryFullName(CourseBusinessQueryBo bo);
 
     CourseBusiness getBusinessByTenant(String encoder, Long newTenantId);
+
+	CourseBusiness getBusinessByIdTenant(Long businessId, Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseEducationTypeService.java

@@ -56,4 +56,6 @@ public interface ICourseEducationTypeService extends IService<CourseEducationTyp
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     CourseEducationType getEducationTypeBytenant(String encoder, Long newTenantId);
+
+    CourseEducationType getEducationByIdtenant(Long educationTypeId, Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSubjectService.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
 import com.zhongzheng.modules.course.bo.CourseSubjectAddBo;
 import com.zhongzheng.modules.course.bo.CourseSubjectEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.grade.bo.ClassGradeListBo;
 
 import java.util.Collection;
 import java.util.List;
@@ -56,4 +57,7 @@ public interface ICourseSubjectService extends IService<CourseSubject> {
 	CourseSubject getSubjectByTenant(String encoder, Long newTenantId);
 
     List<Long> getIdsByTenant(List<String> subNames);
+
+	List<CourseSubject> listByIdsTenant(ClassGradeListBo bgListBo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -237,4 +237,9 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
         return baseMapper.getBusinessByTenant(encoder,newTenantId);
     }
 
+    @Override
+    public CourseBusiness getBusinessByIdTenant(Long businessId, Long tenantId) {
+        return baseMapper.getBusinessByIdTenant(businessId, tenantId);
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseEducationTypeServiceImpl.java

@@ -188,4 +188,9 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
     public CourseEducationType getEducationTypeBytenant(String encoder, Long newTenantId) {
         return baseMapper.getEducationTypeBytenant(encoder,newTenantId);
     }
+
+    @Override
+    public CourseEducationType getEducationByIdtenant(Long educationTypeId, Long tenantId) {
+        return baseMapper.getEducationTypeByIdtenant(educationTypeId, tenantId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.zhongzheng.modules.course.domain.CourseSubjectProject;
 import com.zhongzheng.modules.course.service.ICourseSubjectProjectService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeListBo;
 import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
 import com.zhongzheng.modules.user.domain.SchoolProject;
 import com.zhongzheng.modules.user.vo.SchoolVo;
@@ -189,4 +190,9 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
     public List<Long> getIdsByTenant(List<String> subNames) {
         return baseMapper.getIdsByTenant(subNames);
     }
+
+    @Override
+    public List<CourseSubject> listByIdsTenant(ClassGradeListBo bgListBo) {
+        return baseMapper.listByIdsTenant(bgListBo);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsService.java

@@ -115,4 +115,6 @@ public interface IGoodsService extends IService<Goods> {
     List<GoodsVo> getShareList(Long time);
 
 	List<GoodsListAllVo> getUserGoodsListAll(UserGoodsListAllBo bo);
+
+    Goods getGoodsByIdTenant(Long goodsId, Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -3901,6 +3901,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return null;
     }
 
+    @Override
+    public Goods getGoodsByIdTenant(Long goodsId, Long tenantId) {
+        return baseMapper.queryGoodsByIdTenant(goodsId,tenantId);
+    }
+
     private Long getNewId(Long oldId, Integer type){
         if (ObjectUtils.isNull(oldId) || oldId <= 0L){
             return null;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeGoods.java

@@ -37,4 +37,6 @@ public class ClassGradeGoods implements Serializable {
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+
+    private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -73,4 +73,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<Long> getGoodsIdByBoTenant(ClassGradeListBo bgListBo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<ClassGrade> queryListByNameTenantId(@Param("className") String className,@Param("tenantId") Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1012,12 +1012,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         if (CollectionUtils.isEmpty(goodsIds)){
             throw new CustomException("改业务层次下不存在商品，请检查！");
         }
-        ServletUtils.getRequestAttributes().getRequest().setAttribute("TenantId",String.valueOf(tenantId));
         //生成预报名官方编号
         String encoded = ServletUtils.getEncoded("PIY");
         if (CollectionUtils.isEmpty(classGrades)){
             //创建新预报名班级
-            creatClass(goodsIds.get(0),encoded);
+            creatClass(goodsIds.get(0),tenantId,encoded);
         }else {
             //获取班级创建最多的机构
             Map<Long, List<ClassGrade>> map = classGrades.stream().collect(Collectors.groupingBy(ClassGrade::getTenantId));
@@ -1035,17 +1034,17 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                return classGrade.getRegisterCode();
             }else {
                 //创建新预报名班级
-                creatClass(goodsIds.get(0),encoded);
+                creatClass(goodsIds.get(0),tenantId,encoded);
             }
         }
         return encoded;
     }
 
     //创建预开班班级
-    private void creatClass(Long goodsId,String code){
+    private void creatClass(Long goodsId,Long tenantId,String code){
         //创建新班级
-        Goods goods = iGoodsService.getById(goodsId);
-        CourseBusinessVo businessVo = iCourseBusinessService.queryById(goods.getBusinessId());
+        Goods goods = iGoodsService.getGoodsByIdTenant(goodsId,tenantId);
+        CourseBusiness businessVo = iCourseBusinessService.getBusinessByIdTenant(goods.getBusinessId(),tenantId);
         boolean isConfigTp = false; //商品是否有配置选班模板
         if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateStatus()) && businessVo.getTemplateStatus() == 1) {
             isConfigTp = true;
@@ -1066,18 +1065,20 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 //        classGrade.setClassName(goodsName + gradeCode);
         //班级名称 年份+期数+业务层次（俗名）+教育类型+科目（存在多个科目时，显示多个科目，用“+”分割）
         String businessName = businessVo.getAliasName();
-        CourseEducationType educationType = courseEducationTypeService.getById(goods.getEducationTypeId());
+        CourseEducationType educationType = courseEducationTypeService.getEducationByIdtenant(goods.getEducationTypeId(),tenantId);
         String educationName = educationType.getEducationName();
         String className = businessName + educationName;
         if (net.polyv.common.v1.util.StringUtils.isNotBlank(goods.getSubjectIds())){
-            List<CourseSubject> subjects = iCourseSubjectService.listByIds(Arrays.stream(goods.getSubjectIds().split(",")).collect(Collectors.toList()));
+            ClassGradeListBo bgListBo = new ClassGradeListBo();
+            bgListBo.setSubIds(Arrays.stream(goods.getSubjectIds().split(",")).map(x -> Long.valueOf(x)).collect(Collectors.toList()));
+            bgListBo.setTenantId(tenantId);
+            List<CourseSubject> subjects = iCourseSubjectService.listByIdsTenant(bgListBo);
             List<String> names = subjects.stream().map(CourseSubject::getSubjectName).collect(Collectors.toList());
             className = String.format("%s(%s)",className,org.apache.commons.lang3.StringUtils.join(names,'+'));
         }
         Integer nameSort = 1;
         //获取排序值
-        List<ClassGrade> list = list(new LambdaQueryWrapper<ClassGrade>()
-                        .like(ClassGrade::getClassName, className));
+        List<ClassGrade> list = baseMapper.queryListByNameTenantId(className,tenantId);
         if (CollectionUtils.isNotEmpty(list)){
             List<Integer> collect = list.stream().filter(x -> x.getClassName().contains("第") && x.getClassName().contains("期")).map(item -> {
                 String name = item.getClassName();
@@ -1090,7 +1091,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             }
         }
         classGrade.setClassName(String.format("%s年第%s期%s",goods.getYear(),nameSort,className));
-
+        classGrade.setTenantId(tenantId);
         save(classGrade);
         //绑定班级商品
         ClassGradeGoods classGradeGoods = new ClassGradeGoods();
@@ -1098,6 +1099,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         classGradeGoods.setGoodsId(goodsId);
         classGradeGoods.setCreateTime(DateUtils.getNowTime());
         classGradeGoods.setUpdateTime(DateUtils.getNowTime());
+        classGradeGoods.setTenantId(tenantId);
         iClassGradeGoodsService.save(classGradeGoods);
     }
 

zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -102,4 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getBusinessByTenant" parameterType="map"  resultType="com.zhongzheng.modules.course.domain.CourseBusiness">
         SELECT * FROM course_business WHERE encoder = #{encoder} and tenant_id = #{newTenantId}
     </select>
+
+    <select id="getBusinessByIdTenant" parameterType="map"  resultType="com.zhongzheng.modules.course.domain.CourseBusiness">
+        SELECT * FROM course_business WHERE id = #{businessId} and tenant_id = #{tenantId}
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseEducationTypeMapper.xml

@@ -103,4 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * from course_education_type where encoder = #{encoder} and tenant_id = #{newTenantId}
     </select>
 
+    <select id="getEducationTypeByIdtenant" parameterType="map" resultType="com.zhongzheng.modules.course.domain.CourseEducationType">
+        SELECT * from course_education_type where id = #{educationTypeId} and tenant_id = #{tenantId}
+    </select>
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectMapper.xml

@@ -143,4 +143,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
     </select>
+
+    <select id="listByIdsTenant" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeListBo" resultType="com.zhongzheng.modules.course.domain.CourseSubject">
+        select * from course_subject where `status` = 1
+        <if test="subIds != null and subIds.size()!=0 ">
+            AND id in
+            <foreach collection="subIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -1009,4 +1009,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </if>
     </select>
+
+    <select id="queryListByNameTenantId" parameterType="map" resultType="com.zhongzheng.modules.grade.domain.ClassGrade">
+        SELECT
+            *
+        FROM
+            class_grade
+        where class_name like concat('%', #{className}, '%') and tenant_id = #{tenantId}
+    </select>
 </mapper>