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

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

src/main/java/com/xjrsoft/module/student/controller/StudentHonorsController.java

@@ -2,7 +2,9 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -50,6 +52,12 @@ public class StudentHonorsController {
     @ApiOperation(value="学生荣誉列表(分页)")
     @SaCheckPermission("studenthonors:detail")
     public RT<PageOutput<StudentHonorsPageVo>> page(@Valid StudentHonorsPageDto dto){
+        if(ObjectUtil.isNull(dto.getClassId()) && dto.getClassId() <= 0){
+            throw new MyException("请选择班级");
+        }
+        if(ObjectUtil.isNull(dto.getBaseSemesterId()) && dto.getBaseSemesterId() <= 0){
+            throw new MyException("请选择学期");
+        }
         Page<StudentHonorsPageVo> page = studentHonorsService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, StudentHonorsPageVo.class);
         return RT.ok(pageOutput);

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
 import com.xjrsoft.module.textbook.dto.AddTextbookDto;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.dto.UpdateTextbookDto;
@@ -22,14 +23,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
@@ -153,4 +147,12 @@ public class TextbookController {
 
         return RT.fileStream(bot.toByteArray(), "Textbook" + ExcelTypeEnum.XLSX.getValue());
     }
+
+    @PostMapping("deliver-warehouse")
+    @ApiOperation(value = "教材管理入库")
+    @SaCheckPermission("textbook:add")
+    public RT<Boolean> deliverWarehouse(@Valid @RequestBody AddTextbookClassWarehouseDto dto){
+        Boolean isSuccess = textbookService.deliverWarehouse(dto);
+        return RT.ok(isSuccess);
+    }
 }

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

@@ -0,0 +1,102 @@
+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.AddWfStudentTextbookClaimDto;
+import com.xjrsoft.module.textbook.dto.UpdateWfStudentTextbookClaimDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.textbook.dto.WfStudentTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.entity.WfStudentTextbookClaim;
+import com.xjrsoft.module.textbook.service.IWfStudentTextbookClaimService;
+import com.xjrsoft.module.textbook.vo.WfStudentTextbookClaimPageVo;
+
+import com.xjrsoft.module.textbook.vo.WfStudentTextbookClaimVo;
+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" + "/wfStudentTextbookClaim")
+@Api(value = "/textbook"  + "/wfStudentTextbookClaim",tags = "教材申领代码")
+@AllArgsConstructor
+public class WfStudentTextbookClaimController {
+
+
+    private final IWfStudentTextbookClaimService wfStudentTextbookClaimService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="教材申领列表(分页)")
+    @SaCheckPermission("wfstudenttextbookclaim:detail")
+    public RT<PageOutput<WfStudentTextbookClaimPageVo>> page(@Valid WfStudentTextbookClaimPageDto dto){
+
+        LambdaQueryWrapper<WfStudentTextbookClaim> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(WfStudentTextbookClaim::getId)
+                .select(WfStudentTextbookClaim.class,x -> VoToColumnUtil.fieldsToColumns(WfStudentTextbookClaimPageVo.class).contains(x.getProperty()));
+        IPage<WfStudentTextbookClaim> page = wfStudentTextbookClaimService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<WfStudentTextbookClaimPageVo> pageOutput = ConventPage.getPageOutput(page, WfStudentTextbookClaimPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询教材申领信息")
+    @SaCheckPermission("wfstudenttextbookclaim:detail")
+    public RT<WfStudentTextbookClaimVo> info(@RequestParam Long id){
+        WfStudentTextbookClaim wfStudentTextbookClaim = wfStudentTextbookClaimService.getByIdDeep(id);
+        if (wfStudentTextbookClaim == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(wfStudentTextbookClaim, WfStudentTextbookClaimVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增教材申领")
+    @SaCheckPermission("wfstudenttextbookclaim:add")
+    public RT<Boolean> add(@Valid @RequestBody AddWfStudentTextbookClaimDto dto){
+        WfStudentTextbookClaim wfStudentTextbookClaim = BeanUtil.toBean(dto, WfStudentTextbookClaim.class);
+        boolean isSuccess = wfStudentTextbookClaimService.add(wfStudentTextbookClaim);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改教材申领")
+    @SaCheckPermission("wfstudenttextbookclaim:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateWfStudentTextbookClaimDto dto){
+
+        WfStudentTextbookClaim wfStudentTextbookClaim = BeanUtil.toBean(dto, WfStudentTextbookClaim.class);
+        return RT.ok(wfStudentTextbookClaimService.update(wfStudentTextbookClaim));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除教材申领")
+    @SaCheckPermission("wfstudenttextbookclaim:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(wfStudentTextbookClaimService.delete(ids));
+
+    }
+
+}

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

@@ -0,0 +1,79 @@
+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;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
+
+
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class AddWfStudentTextbookClaimDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学生编号
+    */
+    @ApiModelProperty("学生编号")
+    private Long studentUserId;
+    /**
+    * 领取地点
+    */
+    @ApiModelProperty("领取地点")
+    private String claimAddress;
+    /**
+    * 申领类型(xjr_dictionary_item[claim_type])
+    */
+    @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
+    private String claimType;
+    /**
+    * 代领取人
+    */
+    @ApiModelProperty("代领取人")
+    private String receiveUserId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+    /**
+    * wfTextbookClaimItem
+    */
+    @ApiModelProperty("wfTextbookClaimItem子表")
+    private List<AddWfTextbookClaimItemDto> wfTextbookClaimItemList;
+}

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

@@ -0,0 +1,53 @@
+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 AddWfTextbookClaimItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材申领编号
+    */
+    @ApiModelProperty("教材申领编号")
+    private Long wfTextbookClaimId;
+    /**
+    * 教材管理编号
+    */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+    /**
+    * 申请数量
+    */
+    @ApiModelProperty("申请数量")
+    private Integer applicantNumber;
+    /**
+    * 已发放数量
+    */
+    @ApiModelProperty("已发放数量")
+    private Integer issueNumber;
+
+}

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

@@ -0,0 +1,33 @@
+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;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
+
+
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class UpdateWfStudentTextbookClaimDto extends AddWfStudentTextbookClaimDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/textbook/dto/WfStudentTextbookClaimPageDto.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 WfStudentTextbookClaimPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,130 @@
+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 szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+@TableName("wf_student_textbook_claim")
+@ApiModel(value = "wf_student_textbook_claim", description = "教材申领")
+public class WfStudentTextbookClaim 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 applicantUserId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学生编号
+    */
+    @ApiModelProperty("学生编号")
+    private Long studentUserId;
+    /**
+    * 领取地点
+    */
+    @ApiModelProperty("领取地点")
+    private String claimAddress;
+    /**
+    * 申领类型(xjr_dictionary_item[claim_type])
+    */
+    @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
+    private String claimType;
+    /**
+    * 代领取人
+    */
+    @ApiModelProperty("代领取人")
+    private String receiveUserId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+    /**
+    * wfTextbookClaimItem
+    */
+    @ApiModelProperty("wfTextbookClaimItem子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "wfTextbookClaimId")
+    private List<WfTextbookClaimItem> wfTextbookClaimItemList;
+
+}

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

@@ -0,0 +1,103 @@
+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 szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+@TableName("wf_textbook_claim_item")
+@ApiModel(value = "wf_textbook_claim_item", description = "教材申领项")
+public class WfTextbookClaimItem 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 wfTextbookClaimId;
+    /**
+    * 教材管理编号
+    */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+    /**
+    * 申请数量
+    */
+    @ApiModelProperty("申请数量")
+    private Integer applicantNumber;
+    /**
+    * 已发放数量
+    */
+    @ApiModelProperty("已发放数量")
+    private Integer issueNumber;
+
+
+}

src/main/java/com/xjrsoft/module/textbook/mapper/WfStudentTextbookClaimMapper.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.WfStudentTextbookClaim;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Mapper
+public interface WfStudentTextbookClaimMapper extends MPJBaseMapper<WfStudentTextbookClaim> {
+
+}

src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookClaimItemMapper.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.WfTextbookClaimItem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材申领项
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Mapper
+public interface WfTextbookClaimItemMapper extends MPJBaseMapper<WfTextbookClaimItem> {
+
+}

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

@@ -2,6 +2,7 @@ package com.xjrsoft.module.textbook.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
 import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
@@ -71,6 +72,13 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      */
     TextbookVo getInfoByissn(String issn);
 
+    /**
+     * 教材管理入库
+     * @param dto
+     * @return
+     */
+    Boolean deliverWarehouse(AddTextbookClassWarehouseDto dto);
+
     /**
      * 入库记录
      * @param id

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

@@ -0,0 +1,40 @@
+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.WfStudentTextbookClaim;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+
+public interface IWfStudentTextbookClaimService extends MPJBaseService<WfStudentTextbookClaim> {
+    /**
+    * 新增
+    *
+    * @param wfStudentTextbookClaim
+    * @return
+    */
+    Boolean add(WfStudentTextbookClaim wfStudentTextbookClaim);
+
+    /**
+    * 更新
+    *
+    * @param wfStudentTextbookClaim
+    * @return
+    */
+    Boolean update(WfStudentTextbookClaim wfStudentTextbookClaim);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

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

@@ -1,31 +1,25 @@
 package com.xjrsoft.module.textbook.service.impl;
 
+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.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.exception.MyException;
 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.AddTextbookClassWarehouseDto;
 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.entity.TextbookSubscriptionRecord;
-import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
-import com.xjrsoft.module.textbook.entity.WfTextbookSubscriptionItem;
+import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.TextbookClassRelationMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionRecordMapper;
+import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
 import com.xjrsoft.module.textbook.service.ITextbookService;
 import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
-import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
-import com.xjrsoft.module.textbook.vo.TextbookPageVo;
-import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
-import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
-import com.xjrsoft.module.textbook.vo.TextbookVo;
+import com.xjrsoft.module.textbook.vo.*;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,11 +30,11 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
-* @title: 教材管理
-* @Author szs
-* @Date: 2023-12-25
-* @Version 1.0
-*/
+ * @title: 教材管理
+ * @Author szs
+ * @Date: 2023-12-25
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Textbook> implements ITextbookService {
@@ -49,10 +43,11 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     private final TextbookClassRelationMapper textbookTextbookClassRelationMapper;
     private final TextbookSubscriptionRecordMapper textbookTextbookSubscriptionRecordMapper;
 
-    private final  IWfTextbookSubscriptionService iWfTextbookSubscriptionService;
+    private final IWfTextbookSubscriptionService iWfTextbookSubscriptionService;
 
     private final IBaseClassService baseClassService;
-    private final BaseClassMapper baseClassMapper;
+
+    private final ITextbookClassWarehouseService textbookClassWarehouseService;
 
 
     @Override
@@ -63,7 +58,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             textbookClassRelation.setTextbookId(textbook.getId());
             textbookTextbookClassRelationMapper.insert(textbookClassRelation);
         }
-        if(textbook.getTextbookSubscriptionRecordList() != null){
+        if (textbook.getTextbookSubscriptionRecordList() != null) {
             for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
                 textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
                 textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
@@ -101,7 +96,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                 }
             }
             //已经不存在的id 删除
-            if(textbookClassRelationRemoveIds.size() > 0){
+            if (textbookClassRelationRemoveIds.size() > 0) {
                 textbookTextbookClassRelationMapper.deleteBatchIds(textbookClassRelationRemoveIds);
             }
         }
@@ -113,7 +108,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             List<TextbookSubscriptionRecord> textbookSubscriptionRecordList = textbookTextbookSubscriptionRecordMapper.selectList(Wrappers.lambdaQuery(TextbookSubscriptionRecord.class).eq(TextbookSubscriptionRecord::getWfTextbookSubscriptionId, textbook.getId()).select(TextbookSubscriptionRecord::getId));
             List<Long> textbookSubscriptionRecordIds = textbookSubscriptionRecordList.stream().map(TextbookSubscriptionRecord::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
-            if(!textbookSubscriptionRecordIds.isEmpty()){
+            if (!textbookSubscriptionRecordIds.isEmpty()) {
                 List<Long> textbookSubscriptionRecordOldIds = textbook.getTextbookSubscriptionRecordList().stream().map(TextbookSubscriptionRecord::getId).filter(Objects::nonNull).collect(Collectors.toList());
                 //找到需要删除的id
                 List<Long> textbookSubscriptionRecordRemoveIds = textbookSubscriptionRecordIds.stream().filter(item -> !textbookSubscriptionRecordOldIds.contains(item)).collect(Collectors.toList());
@@ -131,19 +126,32 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     }
                 }
                 //已经不存在的id 删除
-                if(textbookSubscriptionRecordRemoveIds.size() > 0){
+                if (textbookSubscriptionRecordRemoveIds.size() > 0) {
+                    textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
+                }
+                for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
+                    //如果不等于空则修改
+                    if (textbookSubscriptionRecord.getId() != null) {
+                        textbookTextbookSubscriptionRecordMapper.updateById(textbookSubscriptionRecord);
+                    }
+                    //如果等于空 则新增
+                    else {
+                        //已经不存在的id 删除
+                        textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
+                        textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+                    }
+                }
+                //已经不存在的id 删除
+                if (textbookSubscriptionRecordRemoveIds.size() > 0) {
                     textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
                 }
-            }
-
-
 
 
+            }
+            //********************************* TextbookSubscriptionRecord  增删改  结束 *******************************************/
 
+            return true;
         }
-        //********************************* TextbookSubscriptionRecord  增删改  结束 *******************************************/
-
-        return true;
     }
 
     @Override
@@ -164,18 +172,18 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     @Override
     public Boolean dataHandle(Long dataId) {
         WfTextbookSubscription wfTextbookSubscription = iWfTextbookSubscriptionService.selectById(dataId);
-        if(ObjectUtil.isNotNull(wfTextbookSubscription) && ObjectUtil.isNotNull(wfTextbookSubscription.getWfTextbookSubscriptionItemList()) && wfTextbookSubscription.getWfTextbookSubscriptionItemList().size() > 0){
+        if (ObjectUtil.isNotNull(wfTextbookSubscription) && ObjectUtil.isNotNull(wfTextbookSubscription.getWfTextbookSubscriptionItemList()) && wfTextbookSubscription.getWfTextbookSubscriptionItemList().size() > 0) {
             for (WfTextbookSubscriptionItem wfTextbookSubscriptionItem : wfTextbookSubscription.getWfTextbookSubscriptionItemList()) {
                 String issn = wfTextbookSubscriptionItem.getIssn();
                 Long semesterId = wfTextbookSubscription.getBaseSemesterId();
                 Long subjectGroupId = wfTextbookSubscription.getSubjectGroupId();
                 LambdaQueryWrapper<Textbook> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper
-                        .eq(Textbook::getIssn,issn)
-                        .eq(Textbook::getBaseSemesterId,semesterId)
-                        .eq(Textbook::getSubjectGroupId,subjectGroupId);
+                        .eq(Textbook::getIssn, issn)
+                        .eq(Textbook::getBaseSemesterId, semesterId)
+                        .eq(Textbook::getSubjectGroupId, subjectGroupId);
                 Long count = this.count(queryWrapper);
-                if(count <= 0){//该书不存在教材管理
+                if (count <= 0) {//该书不存在教材管理
                     Textbook textbook = new Textbook();
                     textbook.setIssn(wfTextbookSubscriptionItem.getIssn());
                     textbook.setIsbn(wfTextbookSubscriptionItem.getIsbn());
@@ -190,15 +198,15 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     textbook.setTextbookType(wfTextbookSubscriptionItem.getSubscriptionType());
                     textbook.setAppraisalPrice(wfTextbookSubscriptionItem.getAppraisalPrice());
                     textbookTextbookMapper.insert(textbook);
-                    if(ObjectUtil.isNotNull(wfTextbookSubscriptionItem.getClassIds()) && !wfTextbookSubscriptionItem.getClassIds().equals("")){
+                    if (ObjectUtil.isNotNull(wfTextbookSubscriptionItem.getClassIds()) && !wfTextbookSubscriptionItem.getClassIds().equals("")) {
                         String classIds = wfTextbookSubscriptionItem.getClassIds();
                         //查询年级
                         LambdaQueryWrapper<BaseClass> queryWrapper1 = new LambdaQueryWrapper<>();
                         queryWrapper1
-                                .in(BaseClass::getId,classIds)
+                                .in(BaseClass::getId, classIds)
                                 .groupBy(BaseClass::getGradeId);
                         List<BaseClass> baseClassList = baseClassService.list(queryWrapper1);
-                        if(ObjectUtil.isNotNull(baseClassList) && baseClassList.size() == 1){
+                        if (ObjectUtil.isNotNull(baseClassList) && baseClassList.size() == 1) {
                             textbook.setGradeId(baseClassList.get(0).getGradeId());
                         }
                         String[] classIdStrs = classIds.split(",");
@@ -278,5 +286,27 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         return new ArrayList<>();
     }
 
+    @Override
+    @Transactional
+    public Boolean deliverWarehouse(AddTextbookClassWarehouseDto dto) {
+        //根据id获取教材管理记录
+        Textbook textbook = this.getById(dto.getTextbookId());
+        if (ObjectUtil.isNull(textbook)) {
+            throw new MyException("入库失败，该教材不存在");
+        }
+
+        //更新总的库存数量
+        Textbook updateTextbook = new Textbook();
+        updateTextbook.setId(dto.getTextbookId());
+        Integer oldStock = ObjectUtil.isNull(textbook.getStock()) ? 0 : textbook.getStock();
+        updateTextbook.setStock(oldStock + dto.getWarehouseNumber());
+        boolean isSuccess = this.updateById(updateTextbook);
+
+        TextbookClassWarehouse textbookClassWarehouse = BeanUtil.toBean(dto, TextbookClassWarehouse.class);
+        isSuccess = textbookClassWarehouseService.save(textbookClassWarehouse);
+
+        return isSuccess;
+    }
+
 
 }

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

@@ -0,0 +1,88 @@
+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.WfTextbookClaimItem;
+import com.xjrsoft.module.textbook.mapper.WfTextbookClaimItemMapper;
+import com.xjrsoft.module.textbook.entity.WfStudentTextbookClaim;
+import com.xjrsoft.module.textbook.mapper.WfStudentTextbookClaimMapper;
+import com.xjrsoft.module.textbook.service.IWfStudentTextbookClaimService;
+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 WfStudentTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfStudentTextbookClaimMapper, WfStudentTextbookClaim> implements IWfStudentTextbookClaimService {
+    private final WfStudentTextbookClaimMapper wfStudentTextbookClaimWfStudentTextbookClaimMapper;
+
+    private final WfTextbookClaimItemMapper wfStudentTextbookClaimWfTextbookClaimItemMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(WfStudentTextbookClaim wfStudentTextbookClaim) {
+        wfStudentTextbookClaimWfStudentTextbookClaimMapper.insert(wfStudentTextbookClaim);
+        for (WfTextbookClaimItem wfTextbookClaimItem : wfStudentTextbookClaim.getWfTextbookClaimItemList()) {
+            wfTextbookClaimItem.setWfTextbookClaimId(wfStudentTextbookClaim.getId());
+            wfStudentTextbookClaimWfTextbookClaimItemMapper.insert(wfTextbookClaimItem);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(WfStudentTextbookClaim wfStudentTextbookClaim) {
+        wfStudentTextbookClaimWfStudentTextbookClaimMapper.updateById(wfStudentTextbookClaim);
+        //********************************* WfTextbookClaimItem  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<WfTextbookClaimItem> wfTextbookClaimItemList = wfStudentTextbookClaimWfTextbookClaimItemMapper.selectList(Wrappers.lambdaQuery(WfTextbookClaimItem.class).eq(WfTextbookClaimItem::getWfTextbookClaimId, wfStudentTextbookClaim.getId()).select(WfTextbookClaimItem::getId));
+            List<Long> wfTextbookClaimItemIds = wfTextbookClaimItemList.stream().map(WfTextbookClaimItem::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> wfTextbookClaimItemOldIds = wfStudentTextbookClaim.getWfTextbookClaimItemList().stream().map(WfTextbookClaimItem::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> wfTextbookClaimItemRemoveIds = wfTextbookClaimItemIds.stream().filter(item -> !wfTextbookClaimItemOldIds.contains(item)).collect(Collectors.toList());
+
+            for (WfTextbookClaimItem wfTextbookClaimItem : wfStudentTextbookClaim.getWfTextbookClaimItemList()) {
+                //如果不等于空则修改
+                if (wfTextbookClaimItem.getId() != null) {
+                    wfStudentTextbookClaimWfTextbookClaimItemMapper.updateById(wfTextbookClaimItem);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    wfTextbookClaimItem.setWfTextbookClaimId(wfStudentTextbookClaim.getId());
+                    wfStudentTextbookClaimWfTextbookClaimItemMapper.insert(wfTextbookClaimItem);
+                }
+            }
+            //已经不存在的id 删除
+            if(wfTextbookClaimItemRemoveIds.size() > 0){
+                wfStudentTextbookClaimWfTextbookClaimItemMapper.deleteBatchIds(wfTextbookClaimItemRemoveIds);
+            }
+        }
+        //********************************* WfTextbookClaimItem  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        wfStudentTextbookClaimWfStudentTextbookClaimMapper.deleteBatchIds(ids);
+        wfStudentTextbookClaimWfTextbookClaimItemMapper.delete(Wrappers.lambdaQuery(WfTextbookClaimItem.class).in(WfTextbookClaimItem::getWfTextbookClaimId, ids));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.xjrsoft.module.textbook.vo;
+
+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 WfStudentTextbookClaimPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学生编号
+    */
+    @ApiModelProperty("学生编号")
+    private Long studentUserId;
+    /**
+    * 领取地点
+    */
+    @ApiModelProperty("领取地点")
+    private String claimAddress;
+    /**
+    * 申领类型(xjr_dictionary_item[claim_type])
+    */
+    @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
+    private String claimType;
+    /**
+    * 代领取人
+    */
+    @ApiModelProperty("代领取人")
+    private String receiveUserId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+}

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

@@ -0,0 +1,80 @@
+package com.xjrsoft.module.textbook.vo;
+
+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;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
+
+/**
+* @title: 教材申领表单出参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class WfStudentTextbookClaimVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学生编号
+    */
+    @ApiModelProperty("学生编号")
+    private Long studentUserId;
+    /**
+    * 领取地点
+    */
+    @ApiModelProperty("领取地点")
+    private String claimAddress;
+    /**
+    * 申领类型(xjr_dictionary_item[claim_type])
+    */
+    @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
+    private String claimType;
+    /**
+    * 代领取人
+    */
+    @ApiModelProperty("代领取人")
+    private String receiveUserId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+    /**
+    * wfTextbookClaimItem
+    */
+    @ApiModelProperty("wfTextbookClaimItem子表")
+    private List<WfTextbookClaimItemVo> wfTextbookClaimItemList;
+
+}

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

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.textbook.vo;
+
+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: 教材申领项表单出参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class WfTextbookClaimItemVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材申领编号
+    */
+    @ApiModelProperty("教材申领编号")
+    private Long wfTextbookClaimId;
+    /**
+    * 教材管理编号
+    */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+    /**
+    * 申请数量
+    */
+    @ApiModelProperty("申请数量")
+    private Integer applicantNumber;
+    /**
+    * 已发放数量
+    */
+    @ApiModelProperty("已发放数量")
+    private Integer issueNumber;
+
+
+
+}

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

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