yangdamao 2 жил өмнө
parent
commit
3c9dccefdd

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -76,4 +76,7 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private Long oId;
+
+    @TableField(exist = false)
+    private String templateName;
 }

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

@@ -241,8 +241,8 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 (ObjectUtils.isNull(bo.getClassStatus()) || 0 == bo.getClassStatus())) {
             Long goodsId = bo.getClassGradeGoodsAddBos()[0];
             Goods goods = iGoodsService.getById(goodsId);
-            CourseBusiness business = iCourseBusinessService.getById(goods.getBusinessId());
-            if (ObjectUtils.isNotNull(business) && ObjectUtils.isNotNull(business.getTemplateStatus()) && business.getTemplateStatus() == 1){
+            CourseBusinessVo business = iCourseBusinessService.queryById(goods.getBusinessId());
+            if (Validator.isNotEmpty(business) && Validator.isNotEmpty(business.getTemplateName()) && business.getTemplateName().equals("班级")) {
                 if (net.polyv.common.v1.util.StringUtils.isNotBlank(business.getAliasName()) &&
                         (business.getAliasName().equals("二级建造师") || business.getAliasName().equals("二级造价工程师"))){
                     List<Goods> goodsList = iGoodsService.list(new LambdaQueryWrapper<Goods>()
@@ -1337,7 +1337,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         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) {
+        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateName()) && businessVo.getTemplateName().equals("班级")) {
             isConfigTp = true;
         }
         ClassGrade classGrade = new ClassGrade();

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1734,7 +1734,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //创建新班级
         CourseBusinessVo businessVo = iCourseBusinessService.queryById(businessId);
         boolean isConfigTp = false; //商品是否有配置选班模板
-        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateStatus()) && businessVo.getTemplateStatus() == 1) {
+//        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateStatus()) && businessVo.getTemplateStatus() == 1) {
+//            isConfigTp = true;
+//        }
+        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateName()) && businessVo.getTemplateName().equals("班级")) {
             isConfigTp = true;
         }
         ClassGrade classGrade = new ClassGrade();

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

@@ -104,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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 b.*,t.name as templateName FROM course_business b
+        LEFT JOIN order_input_template t ON b.template_status = t.id
+        WHERE b.id = #{businessId} and b.tenant_id = #{tenantId}
     </select>
 </mapper>