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

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

@@ -13,14 +13,12 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseGrade;
-import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.student.entity.BaseClassMajorSet;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.TextbookSubscription;
 import com.xjrsoft.module.textbook.entity.TextbookSubscriptionClass;
-import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
 import com.xjrsoft.module.textbook.service.ITextbookSubscriptionService;
 import com.xjrsoft.module.textbook.vo.*;
 import io.swagger.annotations.Api;
@@ -34,7 +32,6 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -146,6 +143,14 @@ public class TextbookSubscriptionController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/item-list-confirm-distribute")
+    @ApiOperation(value="确认教材页面使用教材征订明细(不分页)")
+    @SaCheckPermission("textbooksubscription:detail")
+    public RT<List<SubscriptionItemListDistributeVo>> itemListConfirmDistribute(@Valid SubscriptionItemListDistributeDto dto){
+        List<SubscriptionItemListDistributeVo> list = textbookSubscriptionService.itemListConfirmDistribute(dto);
+        return RT.ok(list);
+    }
+
     @PostMapping
     @ApiOperation(value = "新增教材教辅征订记录表")
     @SaCheckPermission("textbooksubscription:add")

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

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.textbook.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -52,6 +54,14 @@ public class ConfirmDistributeDto{
         @ApiModelProperty("教材申领项主键编号")
         private Long textbookClaimItemId;
 
+        /**
+         * 教材征订项主键编号
+         */
+        @ContentStyle(dataFormat = 49)
+        @ExcelProperty("教材征订项主键编号")
+        @ApiModelProperty("教材征订项主键编号")
+        private String textbookSubscriptionItemId;
+
         /**
          * 发放数量
          */

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

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 教材征订记录详情表分页查询入参
+* @Author dzx
+* @Date: 2024-12-17
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SubscriptionItemListDistributeDto {
+
+    /**
+     * 教材管理编号
+     */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+}

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

@@ -3,6 +3,8 @@ package com.xjrsoft.module.textbook.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 
 /**
 * @title: 教材管理分页查询入参
@@ -27,6 +29,16 @@ public class TextbookInstockroomDto {
      */
     @ApiModelProperty(value = "国际标准刊号",hidden = true)
     private String issn;
+    /**
+     * 实际折扣
+     */
+    @ApiModelProperty("实际折扣")
+    private Double discount;
+    /**
+     * 实际价格(元)
+     */
+    @ApiModelProperty("实际价格(元)")
+    private BigDecimal price;
     /**
      * 本次入库数量
      */

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

@@ -0,0 +1,98 @@
+package com.xjrsoft.module.textbook.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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: 教材申领项与教材征订项关联表
+* @Author dzx
+* @Date: 2024-12-19
+* @Version 1.0
+*/
+@Data
+@TableName("claim_item_subscription_item")
+@ApiModel(value = "claim_item_subscription_item", description = "教材申领项与教材征订项关联表")
+public class ClaimItemSubscriptionItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材申领编号
+    */
+    @ApiModelProperty("教材申领编号")
+    private Long wfTextbookClaimItemId;
+    /**
+    * 教材申领编号
+    */
+    @ApiModelProperty("教材申领编号")
+    private Long textbookSubscriptionItemId;
+    /**
+    * 已发放数量
+    */
+    @ApiModelProperty("已发放数量")
+    private Integer issueNumber;
+
+
+}

src/main/java/com/xjrsoft/module/textbook/mapper/ClaimItemSubscriptionItemMapper.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.ClaimItemSubscriptionItem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材申领项与教材征订项关联表
+* @Author dzx
+* @Date: 2024-12-19
+* @Version 1.0
+*/
+@Mapper
+public interface ClaimItemSubscriptionItemMapper extends MPJBaseMapper<ClaimItemSubscriptionItem> {
+
+}

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

@@ -40,6 +40,8 @@ public interface ITextbookSubscriptionService extends MPJBaseService<TextbookSub
 
     IPage<TextbookSubscriptionItemPageVo> itemPage(TextbookSubscriptionItemPageDto dto);
 
+    List<SubscriptionItemListDistributeVo> itemListConfirmDistribute(SubscriptionItemListDistributeDto dto);
+
     /**
     * 新增
     *

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.textbook.service.impl;
 
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,7 +15,6 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseCourseSubject;
 import com.xjrsoft.module.base.entity.BaseSemester;
-import com.xjrsoft.module.base.entity.CourseSubjectDetail;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.*;
@@ -25,7 +23,6 @@ import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionItemMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookWarehouseRecordMapper;
 import com.xjrsoft.module.textbook.service.ITextbookSubscriptionService;
-import com.xjrsoft.module.textbook.service.ITextbookWarehouseRecordService;
 import com.xjrsoft.module.textbook.vo.*;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
@@ -228,6 +225,21 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         return page;
     }
 
+    @Override
+    public List<SubscriptionItemListDistributeVo> itemListConfirmDistribute(SubscriptionItemListDistributeDto dto) {
+        MPJLambdaWrapper<TextbookSubscriptionItem> textbookSubscriptionItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        textbookSubscriptionItemMPJLambdaWrapper
+                .select(TextbookSubscriptionItem::getId)
+                .selectAs(TextbookSubscriptionItem::getPrice, SubscriptionItemListDistributeVo::getActulPrice)
+                .select(TextbookSubscriptionItem.class,x -> VoToColumnUtil.fieldsToColumns(SubscriptionItemListDistributeVo.class).contains(x.getProperty()))
+                .innerJoin(TextbookSubscription.class, TextbookSubscription::getId, TextbookSubscriptionItem::getTextbookSubscriptionId)
+                .eq(TextbookSubscriptionItem::getTextbookId, dto.getTextbookId())
+                .gt(TextbookSubscriptionItem::getInStockNum, TextbookSubscriptionItem::getOutStockNum)
+                .orderByAsc(TextbookSubscriptionItem::getCreateDate)
+        ;
+        return textbookSubscriptionTextbookSubscriptionItemMapper.selectJoinList(SubscriptionItemListDistributeVo.class, textbookSubscriptionItemMPJLambdaWrapper);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(TextbookSubscription textbookSubscription) {
@@ -309,6 +321,8 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
 
             TextbookSubscriptionItem updateItem = new TextbookSubscriptionItem();
             updateItem.setId(old.getId());
+            updateItem.setDiscount(dto.getDiscount());
+            updateItem.setPrice(dto.getPrice());
             updateItem.setInStockNum(old.getInStockNum() + dto.getInNum());
             textbookSubscriptionTextbookSubscriptionItemMapper.updateById(updateItem);
 

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

@@ -320,7 +320,9 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 setUserType(2);
             }});
             //申领类型是学生申领,学生代表可领取
-            if (wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimStudent.getCode()) && !Objects.equals(wfTextbookClaim.getApplicantUserId(), wfTextbookClaim.getStudentUserId())) {
+            if (wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimStudent.getCode())
+                    && !Objects.equals(wfTextbookClaim.getApplicantUserId(), wfTextbookClaim.getStudentUserId())
+            ) {
                 textbookClaimUserList.add(new TextbookClaimUser() {{
                     setCreateDate(new Date());
                     setWfTextbookClaimId(wfTextbookClaim.getId());

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

@@ -0,0 +1,54 @@
+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.math.BigDecimal;
+
+/**
+* @title: 教材征订记录详情表分页列表出参
+* @Author dzx
+* @Date: 2024-12-17
+* @Version 1.0
+*/
+@Data
+public class SubscriptionItemListDistributeVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 实际折扣
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("实际折扣")
+    @ApiModelProperty("实际折扣")
+    private Double discount;
+    /**
+    * 实际价格(元)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("实际价格(元)")
+    @ApiModelProperty("实际价格(元)")
+    private BigDecimal actulPrice;
+    /**
+    * 当前征订任务征订项入库数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("当前征订任务征订项入库数量")
+    @ApiModelProperty("当前征订任务征订项入库数量")
+    private Integer inStockNum;
+    /**
+    * 当前征订任务征订项出库数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("当前征订任务征订项出库数量")
+    @ApiModelProperty("当前征订任务征订项出库数量")
+    private Integer outStockNum;
+}

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

@@ -37,6 +37,16 @@ public class TextbookSubscriptionItemPageVo {
     @ExcelProperty("教材教辅增订记录表主键(textbook_subscription)")
     @ApiModelProperty("教材教辅增订记录表主键(textbook_subscription)")
     private Long textbookSubscriptionId;
+    /**
+     * 学期id(base_semester)
+     */
+    @ApiModelProperty("学期id(base_semester)")
+    private Long baseSemesterId;
+    /**
+     * 学期id(base_semester)
+     */
+    @ApiModelProperty("学期id(base_semester)")
+    private String baseSemesterIdCn;
     /**
     * 教材表主键(textbook)
     */
@@ -84,6 +94,11 @@ public class TextbookSubscriptionItemPageVo {
      */
     @ApiModelProperty("教材分类(xjr_dictionary_item[textbook_type])")
     private String textbookTypeCn;
+    /**
+     * 定价
+     */
+    @ApiModelProperty("定价")
+    private BigDecimal price;
     /**
     * 学生用书征订数量
     */
@@ -111,7 +126,7 @@ public class TextbookSubscriptionItemPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("实际价格(元)")
     @ApiModelProperty("实际价格(元)")
-    private BigDecimal price;
+    private BigDecimal actulPrice;
     /**
     * 当前征订任务征订项入库数量
     */

src/main/resources/sqlScript/textbook_sql.sql

@@ -191,6 +191,90 @@ create table `textbook_warehouse_record`
  default charset = utf8mb4
  collate = utf8mb4_0900_ai_ci comment ='教材入库记录';
 
+-- ----------------------------
+-- 2024-12-13 14:36
+-- 教材申领
+-- ----------------------------
+drop table if exists wf_textbook_claim;
+create table `wf_textbook_claim`
+(
+    id                bigint        not null comment '主键编号'
+        primary key,
+    create_user_id    bigint        null comment '创建人',
+    create_date       datetime      null comment '创建时间',
+    modify_user_id    bigint        null comment '修改人',
+    modify_date       datetime      null comment '修改时间',
+    delete_mark       int           not null comment '删除标记',
+    enabled_mark      int           not null comment '有效标志',
+    sort_code         int           null comment '序号',
+
+    applicant_user_id bigint        null comment '申请人',
+    base_semester_id  bigint        null comment '学期id(base_semester)',
+    claim_type        varchar(20)   null comment '申领类型(xjr_dictionary_item[claim_type])',
+
+    -- 班主任帮学生申请领取或者学生自己申请领取
+    class_id          bigint        null comment '班级编号',
+    student_user_id   bigint        null comment '负责领取学生编号',
+    claim_address     varchar(1000) null comment '领取地点',
+
+    receive_user_id   varchar(1000) null comment '代领取人',
+    claim_user_id     bigint        null comment '实际领取用户编号（申请人帮领取人申请去领取）',
+
+
+    status            int default 0 not null comment '状态（1:结束 0:未结束）'
+)engine = innodb
+    default charset = utf8mb4
+    collate = utf8mb4_0900_ai_ci comment ='教材申领';
+
+-- ----------------------------
+-- 2024-12-13 14:36
+-- 教材申领项
+-- ----------------------------
+drop table if exists wf_textbook_claim_item;
+create table `wf_textbook_claim_item`
+(
+    id                   bigint        not null comment '主键编号'
+        primary key,
+    create_user_id       bigint        null comment '创建人',
+    create_date          datetime      null comment '创建时间',
+    modify_user_id       bigint        null comment '修改人',
+    modify_date          datetime      null comment '修改时间',
+    delete_mark          int           not null comment '删除标记',
+    enabled_mark         int           not null comment '有效标志',
+    sort_code            int           null comment '序号',
+
+    wf_textbook_claim_id bigint        null comment '教材申领编号',
+    textbook_id          bigint        null comment '教材管理编号',
+    applicant_number     int default 0 null comment '申请数量',
+    issue_number         int default 0 null comment '已发放数量'
+)engine = innodb
+ default charset = utf8mb4
+ collate = utf8mb4_0900_ai_ci comment ='教材申领项';
+
+-- ----------------------------
+-- 2024-12-13 14:36
+-- 教材申领项与教材征订项关联表
+-- ----------------------------
+drop table if exists claim_item_subscription_item;
+create table `claim_item_subscription_item`
+(
+    id                   bigint        not null comment '主键编号'
+        primary key,
+    create_user_id       bigint        null comment '创建人',
+    create_date          datetime      null comment '创建时间',
+    modify_user_id       bigint        null comment '修改人',
+    modify_date          datetime      null comment '修改时间',
+    delete_mark          int           not null comment '删除标记',
+    enabled_mark         int           not null comment '有效标志',
+    sort_code            int           null comment '序号',
+
+    wf_textbook_claim_item_id bigint        null comment '教材申领编号',
+    textbook_subscription_item_id bigint        null comment '教材申领编号',
+    issue_number         int default 0 null comment '已发放数量'
+)engine = innodb
+ default charset = utf8mb4
+ collate = utf8mb4_0900_ai_ci comment ='教材申领项与教材征订项关联表';
+
 # drop table if exists textbook_subscription_record;
 # create table `textbook_subscription_record`
 # (
@@ -227,41 +311,6 @@ create table if not exists tl.textbook_claim_user
 )
     comment '教材领取人员';
 
-create table if not exists tl.textbook_class_relation
-(
-    id             bigint   not null comment '主键编号'
-        primary key,
-    create_user_id bigint   null comment '创建人',
-    create_date    datetime null comment '创建时间',
-    modify_user_id bigint   null comment '修改人',
-    modify_date    datetime null comment '修改时间',
-    delete_mark    int      not null comment '删除标记',
-    enabled_mark   int      not null comment '有效标志',
-    sort_code      int      null comment '序号',
-    textbook_id    bigint   null comment '教材管理编号',
-    class_id       bigint   null comment '班级编号'
-)
-    comment '教材班级引用';
-
-create table if not exists tl.textbook_core_attribute
-(
-    id               bigint       not null comment '主键编号'
-        primary key,
-    create_user_id   bigint       null comment '创建人',
-    create_date      datetime     null comment '创建时间',
-    modify_user_id   bigint       null comment '修改人',
-    modify_date      datetime     null comment '修改时间',
-    delete_mark      int          not null comment '删除标记',
-    enabled_mark     int          not null comment '有效标志',
-    sort_code        int          null comment '序号',
-    issn             varchar(200) null comment '国际标准刊号',
-    isbn             varchar(200) null comment '国际标准书号',
-    book_name        varchar(200) null comment '书名',
-    publishing_house varchar(200) null comment '出版社',
-    editor_in_chief  varchar(200) null comment '主编'
-)
-    comment '教材核心信息管理';
-
 create table if not exists tl.textbook_issue_record
 (
     id               bigint        not null comment '主键编号'
@@ -305,50 +354,6 @@ create table if not exists tl.textbook_student_claim
 )
     comment '学生教材认领记录';
 
-
-
-create table if not exists tl.wf_textbook_claim
-(
-    id                bigint        not null comment '主键编号'
-        primary key,
-    create_user_id    bigint        null comment '创建人',
-    create_date       datetime      null comment '创建时间',
-    modify_user_id    bigint        null comment '修改人',
-    modify_date       datetime      null comment '修改时间',
-    delete_mark       int           not null comment '删除标记',
-    enabled_mark      int           not null comment '有效标志',
-    sort_code         int           null comment '序号',
-    applicant_user_id bigint        null comment '申请人',
-    class_id          bigint        null comment '班级编号',
-    base_semester_id  bigint        null comment '学期id(base_semester)',
-    student_user_id   bigint        null comment '学生编号',
-    claim_address     varchar(1000) null comment '领取地点',
-    claim_type        varchar(20)   null comment '申领类型(xjr_dictionary_item[claim_type])',
-    receive_user_id   varchar(1000) null comment '代领取人',
-    claim_user_id     bigint        null comment '领取用户编号（申请人帮领取人申请去领取）',
-    status            int default 0 not null comment '状态（1:结束 0:未结束）',
-    textbook_type     varchar(20)   null comment '教材分类(xjr_dictionary_item[textbook_type])'
-)
-    comment '教材申领';
-
-create table if not exists tl.wf_textbook_claim_item
-(
-    id                   bigint        not null comment '主键编号'
-        primary key,
-    create_user_id       bigint        null comment '创建人',
-    create_date          datetime      null comment '创建时间',
-    modify_user_id       bigint        null comment '修改人',
-    modify_date          datetime      null comment '修改时间',
-    delete_mark          int           not null comment '删除标记',
-    enabled_mark         int           not null comment '有效标志',
-    sort_code            int           null comment '序号',
-    wf_textbook_claim_id bigint        null comment '教材申领编号',
-    textbook_id          bigint        null comment '教材管理编号',
-    applicant_number     int default 0 null comment '申请数量',
-    issue_number         int default 0 null comment '已发放数量'
-)
-    comment '教材申领项';
-
 create table if not exists tl.wf_textbook_recede
 (
     id                bigint        not null comment '主键编号'
@@ -386,38 +391,6 @@ create table if not exists tl.wf_textbook_recede_item
 )
     comment '退书申请项';
 
-create table if not exists tl.wf_textbook_subscription_item
-(
-    id                          bigint         not null comment '主键编号'
-        primary key,
-    create_user_id              bigint         null comment '创建人',
-    create_date                 datetime       null comment '创建时间',
-    modify_user_id              bigint         null comment '修改人',
-    modify_date                 datetime       null comment '修改时间',
-    delete_mark                 int            not null comment '删除标记',
-    enabled_mark                int            not null comment '有效标志',
-    sort_code                   int            null comment '序号',
-    wf_textbook_subscription_id bigint         null comment '教材教辅征订编号',
-    subscription_type           varchar(20)    null comment '征订类型(xjr_dictionary_item[subscription_type])',
-    issn                        varchar(200)   null comment '国际标准刊号',
-    isbn                        varchar(200)   null comment '国际标准书号',
-    book_name                   varchar(200)   null comment '书名',
-    publishing_house            varchar(200)   null comment '出版社',
-    editor_in_chief             varchar(200)   null comment '主编',
-    appraisal_price             decimal(10, 2) null comment '估价(元)',
-    is_textbook_plan            varchar(20)    null comment '是否为规划教材(xjr_dictionary_item[judgment_method_1])',
-    course_subject_id           bigint         null comment '课程编号(base_course_subject)',
-    class_ids                   varchar(1000)  null comment '班级编号(多个)',
-    student_subscription_number int            null comment '学生用书征订数量',
-    teacher_subscription_number int            null comment '教师教材征订数量',
-    teacher_reference_number    int            null comment '教师教参用书征订数量',
-    is_support_resources        varchar(20)    null comment '是否有配套教学资源(xjr_dictionary_item[judgment_method_1])',
-    version                     varchar(100)   null comment '版本',
-    textbook_id                 bigint         null comment '教材id',
-    in_stockroom_num            int default 0  null comment '当前征订任务征订项已经入库数量',
-    alteration_type             int default 0  null comment '变更类型（0：未变更，1：变更征订数量，2：变更课程）'
-)
-    comment '教材教辅征订项';
 
 
 

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

@@ -4171,4 +4171,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcClaimItemSubscriptionItem() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("claim_item_subscription_item");//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("dzx");//作者名称
+        params.setPackageName("textbook");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(true);//是否生成导入接口
+        params.setExport(true);//是否生成导出接口
+        params.setOutMainDir(false);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }