Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/xjrsoft/module/textbook/entity/TextbookClassWarehouse.java
#	src/main/java/com/xjrsoft/module/textbook/vo/TextbookClassWarehouseVo.java

src/main/java/com/xjrsoft/module/teacher/service/impl/AttendanceRecordServiceImpl.java

@@ -178,10 +178,16 @@ public class AttendanceRecordServiceImpl extends MPJBaseServiceImpl<AttendanceRe
                 .eq(XjrUser::getId,dto.getUserId());
         List<PresentUserCheckInfoVo> presentUserCheckInfoVoList1 = xjrUserMapper.selectJoinList(PresentUserCheckInfoVo.class, queryWrapper3);
 
-        if(ObjectUtil.isNull(presentUserCheckInfoVoList1) || presentUserCheckInfoVoList1.size() <= 0){
-            throw new MyException("用户信息出现未知错误，请联系管理员");
+        PresentUserCheckInfoVo presentUserCheckInfoVo = new PresentUserCheckInfoVo();
+        if(ObjectUtil.isNotNull(presentUserCheckInfoVoList1) && presentUserCheckInfoVoList1.size() > 0){
+            presentUserCheckInfoVo = presentUserCheckInfoVoList1.get(0);
+        }else{
+            LambdaQueryWrapper<XjrUser> queryWrapper4 = new LambdaQueryWrapper<>();
+            queryWrapper4
+                    .eq(XjrUser::getId,dto.getUserId());
+            XjrUser xjrUser = xjrUserMapper.selectOne(queryWrapper4);
+            presentUserCheckInfoVo.setUserName(xjrUser.getName());
         }
-        PresentUserCheckInfoVo presentUserCheckInfoVo = presentUserCheckInfoVoList1.get(0);
 
         LambdaQueryWrapper<AttendanceConfig> queryWrapper02 = new LambdaQueryWrapper<>();
         queryWrapper02

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

@@ -0,0 +1,116 @@
+package com.xjrsoft.module.textbook.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
+import com.xjrsoft.module.textbook.dto.UpdateTextbookClassWarehouseDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.textbook.dto.TextbookClassWarehousePageDto;
+import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
+import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
+import com.xjrsoft.module.textbook.vo.TextbookClassWarehousePageVo;
+
+import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 教材入库
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/textbookClassWarehouse")
+@Api(value = "/textbook"  + "/textbookClassWarehouse",tags = "教材入库代码")
+@AllArgsConstructor
+public class TextbookClassWarehouseController {
+
+
+    private final ITextbookClassWarehouseService textbookClassWarehouseService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="教材入库列表(分页)")
+    @SaCheckPermission("textbookclasswarehouse:detail")
+    public RT<PageOutput<TextbookClassWarehousePageVo>> page(@Valid TextbookClassWarehousePageDto dto){
+
+        LambdaQueryWrapper<TextbookClassWarehouse> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(TextbookClassWarehouse::getId)
+                .select(TextbookClassWarehouse.class,x -> VoToColumnUtil.fieldsToColumns(TextbookClassWarehousePageVo.class).contains(x.getProperty()));
+        IPage<TextbookClassWarehouse> page = textbookClassWarehouseService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<TextbookClassWarehousePageVo> pageOutput = ConventPage.getPageOutput(page, TextbookClassWarehousePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询教材入库信息")
+    @SaCheckPermission("textbookclasswarehouse:detail")
+    public RT<TextbookClassWarehouseVo> info(@RequestParam Long id){
+        TextbookClassWarehouse textbookClassWarehouse = textbookClassWarehouseService.getById(id);
+        if (textbookClassWarehouse == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(textbookClassWarehouse, TextbookClassWarehouseVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增教材入库")
+    @SaCheckPermission("textbookclasswarehouse:add")
+    public RT<Boolean> add(@Valid @RequestBody AddTextbookClassWarehouseDto dto){
+        TextbookClassWarehouse textbookClassWarehouse = BeanUtil.toBean(dto, TextbookClassWarehouse.class);
+        boolean isSuccess = textbookClassWarehouseService.save(textbookClassWarehouse);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改教材入库")
+    @SaCheckPermission("textbookclasswarehouse:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateTextbookClassWarehouseDto dto){
+
+        TextbookClassWarehouse textbookClassWarehouse = BeanUtil.toBean(dto, TextbookClassWarehouse.class);
+        return RT.ok(textbookClassWarehouseService.updateById(textbookClassWarehouse));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除教材入库")
+    @SaCheckPermission("textbookclasswarehouse:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(textbookClassWarehouseService.removeBatchByIds(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid TextbookClassWarehousePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<TextbookClassWarehousePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookClassWarehousePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookClassWarehousePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookClassWarehouseDto.java

@@ -0,0 +1,68 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 教材入库
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class AddTextbookClassWarehouseDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材管理编号
+    */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+    /**
+    * 入库数量
+    */
+    @ApiModelProperty("入库数量")
+    private Integer warehouseNumber;
+    /**
+    * 来源
+    */
+    @ApiModelProperty("来源")
+    private String source;
+    /**
+    * 定价(元)
+    */
+    @ApiModelProperty("定价(元)")
+    private BigDecimal price;
+    /**
+    * 折扣
+    */
+    @ApiModelProperty("折扣")
+    private Double discount;
+    /**
+    * 小计（元）
+    */
+    @ApiModelProperty("小计（元）")
+    private BigDecimal subtotal;
+    /**
+    * 总价（元）
+    */
+    @ApiModelProperty("总价（元）")
+    private BigDecimal totalPrice;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/TextbookClassWarehousePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 教材入库分页查询入参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TextbookClassWarehousePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/UpdateTextbookClassWarehouseDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 教材入库
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class UpdateTextbookClassWarehouseDto extends AddTextbookClassWarehouseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/textbook/entity/TextbookClassWarehouse.java

@@ -2,26 +2,30 @@ package com.xjrsoft.module.textbook.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
 import java.util.Date;
 
 
 /**
-* @title: 教材教辅班级引用
+* @title: 教材入库
 * @Author szs
-* @Date: 2023-12-25
+* @Date: 2023-12-26
 * @Version 1.0
 */
 @Data
 @TableName("textbook_class_warehouse")
-@ApiModel(value = "textbook_class_warehouse", description = "教材教辅出库记录")
+@ApiModel(value = "textbook_class_warehouse", description = "教材入库")
 public class TextbookClassWarehouse implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -80,10 +84,35 @@ public class TextbookClassWarehouse implements Serializable {
     @ApiModelProperty("教材管理编号")
     private Long textbookId;
     /**
-    * 班级编号
+    * 入库数量
+    */
+    @ApiModelProperty("入库数量")
+    private Integer warehouseNumber;
+    /**
+    * 来源
+    */
+    @ApiModelProperty("来源")
+    private String source;
+    /**
+    * 定价(元)
+    */
+    @ApiModelProperty("定价(元)")
+    private BigDecimal price;
+    /**
+    * 折扣
+    */
+    @ApiModelProperty("折扣")
+    private Double discount;
+    /**
+    * 小计（元）
+    */
+    @ApiModelProperty("小计（元）")
+    private BigDecimal subtotal;
+    /**
+    * 总价（元）
     */
-    @ApiModelProperty("班级编号")
-    private Long classId;
+    @ApiModelProperty("总价（元）")
+    private BigDecimal totalPrice;
 
 
 }

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

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材入库
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Mapper
+public interface TextbookClassWarehouseMapper extends MPJBaseMapper<TextbookClassWarehouse> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 教材入库
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+
+public interface ITextbookClassWarehouseService extends MPJBaseService<TextbookClassWarehouse> {
+}

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
+import com.xjrsoft.module.textbook.mapper.TextbookClassWarehouseMapper;
+import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 教材入库
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class TextbookClassWarehouseServiceImpl extends MPJBaseServiceImpl<TextbookClassWarehouseMapper, TextbookClassWarehouse> implements ITextbookClassWarehouseService {
+}

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

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.TextbookClassRelationMapper;
@@ -43,6 +46,9 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
     private final  IWfTextbookSubscriptionService iWfTextbookSubscriptionService;
 
+    private final IBaseClassService baseClassService;
+    private final BaseClassMapper baseClassMapper;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -171,10 +177,18 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     textbook.setIsTextbookPlan(wfTextbookSubscriptionItem.getIsTextbookPlan());
                     textbook.setTextbookType(wfTextbookSubscriptionItem.getSubscriptionType());
                     textbook.setAppraisalPrice(wfTextbookSubscriptionItem.getAppraisalPrice());
-                    textbook.setGradeId(345678345679L);// TODO 这个字段的意思
                     textbookTextbookMapper.insert(textbook);
                     if(ObjectUtil.isNotNull(wfTextbookSubscriptionItem.getClassIds()) && !wfTextbookSubscriptionItem.getClassIds().equals("")){
                         String classIds = wfTextbookSubscriptionItem.getClassIds();
+                        //查询年级
+                        LambdaQueryWrapper<BaseClass> queryWrapper1 = new LambdaQueryWrapper<>();
+                        queryWrapper1
+                                .in(BaseClass::getId,classIds)
+                                .groupBy(BaseClass::getGradeId);
+                        List<BaseClass> baseClassList = baseClassService.list(queryWrapper1);
+                        if(ObjectUtil.isNotNull(baseClassList) && baseClassList.size() == 1){
+                            textbook.setGradeId(baseClassList.get(0).getGradeId());
+                        }
                         String[] classIdStrs = classIds.split(",");
                         for (String classIdStr : classIdStrs) {
                             Long classId = Long.parseLong(classIdStr);

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

@@ -0,0 +1,132 @@
+package com.xjrsoft.module.textbook.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 教材入库分页列表出参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class TextbookClassWarehousePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材管理编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教材管理编号")
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+    /**
+    * 入库数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("入库数量")
+    @ApiModelProperty("入库数量")
+    private Integer warehouseNumber;
+    /**
+    * 来源
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("来源")
+    @ApiModelProperty("来源")
+    private String source;
+    /**
+    * 定价(元)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("定价(元)")
+    @ApiModelProperty("定价(元)")
+    private BigDecimal price;
+    /**
+    * 折扣
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("折扣")
+    @ApiModelProperty("折扣")
+    private Double discount;
+    /**
+    * 小计（元）
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("小计（元）")
+    @ApiModelProperty("小计（元）")
+    private BigDecimal subtotal;
+    /**
+    * 总价（元）
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("总价（元）")
+    @ApiModelProperty("总价（元）")
+    private BigDecimal totalPrice;
+
+}

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

@@ -1,16 +1,18 @@
 package com.xjrsoft.module.textbook.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
 import java.util.Date;
 
 /**
-* @title: 教材教辅征订记录表单出参
+* @title: 教材入库表单出参
 * @Author szs
-* @Date: 2023-12-25
+* @Date: 2023-12-26
 * @Version 1.0
 */
 @Data
@@ -19,27 +21,49 @@ public class TextbookClassWarehouseVo {
     /**
     * 主键编号
     */
-    @ApiModelProperty("入库时间")
-    private Date warehouseDate;
+    @ApiModelProperty("主键编号")
+    private Long id;
     /**
     * 序号
     */
-    @ApiModelProperty("入库人")
-    private String warehouseUser;
-
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材管理编号
+    */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
     /**
-     * 国际标准刊号
-     */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("入库数量")
+    * 入库数量
+    */
     @ApiModelProperty("入库数量")
     private Integer warehouseNumber;
     /**
-     * 书名
-     */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("来源")
+    * 来源
+    */
     @ApiModelProperty("来源")
     private String source;
+    /**
+    * 定价(元)
+    */
+    @ApiModelProperty("定价(元)")
+    private BigDecimal price;
+    /**
+    * 折扣
+    */
+    @ApiModelProperty("折扣")
+    private Double discount;
+    /**
+    * 小计（元）
+    */
+    @ApiModelProperty("小计（元）")
+    private BigDecimal subtotal;
+    /**
+    * 总价（元）
+    */
+    @ApiModelProperty("总价（元）")
+    private BigDecimal totalPrice;
+
+
 
 }

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1307,4 +1307,34 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    /**
+     * 学科组课程管理
+     *
+     */
+    @Test
+    public void gcTextbookClassWarehouse() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("textbook_class_warehouse");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("textbook");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(true);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }