1、查询详情中返回班级关系表数据

2、解决修改报错问题

src/main/java/com/xjrsoft/module/textbook/controller/TextbookController.java

@@ -67,6 +67,7 @@ public class TextbookController {
         if (textbook == null) {
            return RT.error("找不到此数据！");
         }
+        textbook.setTextbookClassRelationList(textbookService.getClassRelation(textbook.getId()));
         return RT.ok(BeanUtil.toBean(textbook, TextbookVo.class));
     }
 

src/main/java/com/xjrsoft/module/textbook/mapper/TextbookMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
+import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
 import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
@@ -60,4 +61,7 @@ public interface TextbookMapper extends MPJBaseMapper<Textbook> {
      */
     List<TextbookClassWarehouseVo> warehouseList(Long id);
 
+
+    List<TextbookClassRelation> getClassRelation(Long id);
+
 }

src/main/java/com/xjrsoft/module/textbook/service/ITextbookService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
+import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
 import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
@@ -75,4 +76,6 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      */
     List<TextbookClassWarehouseVo> warehouseList(Long id);
 
+
+    List<TextbookClassRelation> getClassRelation(Long id);
 }

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -251,5 +251,14 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         return textbookTextbookMapper.warehouseList(id);
     }
 
+    @Override
+    public List<TextbookClassRelation> getClassRelation(Long id) {
+        List<TextbookClassRelation> classRelation = textbookTextbookMapper.getClassRelation(id);
+        if(!classRelation.isEmpty()){
+            return classRelation;
+        }
+        return new ArrayList<>();
+    }
+
 
 }

src/main/java/com/xjrsoft/module/textbook/vo/TextbookVo.java

@@ -111,4 +111,10 @@ public class TextbookVo {
      */
     @ApiModelProperty("入学年级(base_grade)")
     private Long gradeId;
+
+    /**
+     * 入学年级(base_grade)
+     */
+    @ApiModelProperty("textbookClassRelation子表")
+    private List<TextbookClassRelationVo> textbookClassRelationList;
 }

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -49,4 +49,8 @@
         LEFT JOIN xjr_user t2 IN t1.create_user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.textbook_id = #{id} order by t1.sort_code
     </select>
+
+    <select id="getClassRelation" resultType="com.xjrsoft.module.textbook.entity.TextbookClassRelation">
+        SELECT * FROM textbook_class_relation WHERE delete_mark = 0 AND textbook_id = #{id}
+    </select>
 </mapper>