Browse Source

添加新出现的教材数据到教材管理 规则

phoenix 1 year ago
parent
commit
0c4a755a58
21 changed files with 1245 additions and 12 deletions
  1. 30 0
      src/main/java/com/xjrsoft/module/liteflow/node/AddTextbookNode.java
  2. 1 1
      src/main/java/com/xjrsoft/module/textbook/controller/SubjectGroupController.java
  3. 102 0
      src/main/java/com/xjrsoft/module/textbook/controller/WfTextbookSubscriptionController.java
  4. 69 0
      src/main/java/com/xjrsoft/module/textbook/dto/AddWfTextbookSubscriptionDto.java
  5. 113 0
      src/main/java/com/xjrsoft/module/textbook/dto/AddWfTextbookSubscriptionItemDto.java
  6. 33 0
      src/main/java/com/xjrsoft/module/textbook/dto/UpdateWfTextbookSubscriptionDto.java
  7. 26 0
      src/main/java/com/xjrsoft/module/textbook/dto/WfTextbookSubscriptionPageDto.java
  8. 8 8
      src/main/java/com/xjrsoft/module/textbook/entity/Textbook.java
  9. 120 0
      src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookSubscription.java
  10. 163 0
      src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookSubscriptionItem.java
  11. 17 0
      src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookSubscriptionItemMapper.java
  12. 17 0
      src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookSubscriptionMapper.java
  13. 2 0
      src/main/java/com/xjrsoft/module/textbook/service/ITextbookService.java
  14. 48 0
      src/main/java/com/xjrsoft/module/textbook/service/IWfTextbookSubscriptionService.java
  15. 57 3
      src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java
  16. 100 0
      src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java
  17. 114 0
      src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookSubscriptionItemVo.java
  18. 94 0
      src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookSubscriptionPageVo.java
  19. 70 0
      src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookSubscriptionVo.java
  20. 23 0
      src/test/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImplTest.java
  21. 38 0
      src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

+ 30 - 0
src/main/java/com/xjrsoft/module/liteflow/node/AddTextbookNode.java

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.textbook.service.ITextbookService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 添加新出现的教材数据到教材管理
+ */
+@Component("add_textbook_node")
+public class AddTextbookNode extends NodeComponent {
+    @Autowired
+    private ITextbookService textbookService;
+
+    @Override
+    public void process() throws Exception {
+        // 获取表单中数据编号
+        Map<String, Object> params = this.getFirstContextBean();
+        Object value = util.getFormDatKey(params,"id");
+        Long formId = Convert.toLong(value);
+        if (formId != null) {
+            // 数据处理
+            textbookService.dataHandle(formId);
+        }
+    }
+}

+ 1 - 1
src/main/java/com/xjrsoft/module/textbook/controller/SubjectGroupController.java

@@ -58,7 +58,7 @@ public class SubjectGroupController {
                 .selectAs(XjrUser::getName,SubjectGroupPageVo::getLeaderUserIdCN)
                 .select(SubjectGroup.class,x -> VoToColumnUtil.fieldsToColumns(SubjectGroupPageVo.class).contains(x.getProperty()))
                 .leftJoin(XjrUser.class,XjrUser::getId,SubjectGroup::getLeaderUserId)
-                .like(ObjectUtil.isNotNull(dto.getGroupName()) && dto.getGroupName().equals(""),SubjectGroup::getGroupName,dto.getGroupName())
+                .like(ObjectUtil.isNotNull(dto.getGroupName()) && !dto.getGroupName().equals(""),SubjectGroup::getGroupName,dto.getGroupName())
                 .eq(ObjectUtil.isNotNull(dto.getLeaderUserId()) && dto.getLeaderUserId() > 0, SubjectGroup::getLeaderUserId, dto.getLeaderUserId())
                 .orderByDesc(SubjectGroup::getId);
         IPage<SubjectGroupPageVo> page = subjectGroupService.selectJoinListPage(ConventPage.getPage(dto),SubjectGroupPageVo.class, queryWrapper);

+ 102 - 0
src/main/java/com/xjrsoft/module/textbook/controller/WfTextbookSubscriptionController.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.AddWfTextbookSubscriptionDto;
+import com.xjrsoft.module.textbook.dto.UpdateWfTextbookSubscriptionDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.textbook.dto.WfTextbookSubscriptionPageDto;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
+import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
+import com.xjrsoft.module.textbook.vo.WfTextbookSubscriptionPageVo;
+
+import com.xjrsoft.module.textbook.vo.WfTextbookSubscriptionVo;
+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-25
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/wfTextbookSubscription")
+@Api(value = "/textbook"  + "/wfTextbookSubscription",tags = "教材教辅征订代码")
+@AllArgsConstructor
+public class WfTextbookSubscriptionController {
+
+
+    private final IWfTextbookSubscriptionService wfTextbookSubscriptionService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="教材教辅征订列表(分页)")
+    @SaCheckPermission("wftextbooksubscription:detail")
+    public RT<PageOutput<WfTextbookSubscriptionPageVo>> page(@Valid WfTextbookSubscriptionPageDto dto){
+
+        LambdaQueryWrapper<WfTextbookSubscription> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(WfTextbookSubscription::getId)
+                .select(WfTextbookSubscription.class,x -> VoToColumnUtil.fieldsToColumns(WfTextbookSubscriptionPageVo.class).contains(x.getProperty()));
+        IPage<WfTextbookSubscription> page = wfTextbookSubscriptionService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<WfTextbookSubscriptionPageVo> pageOutput = ConventPage.getPageOutput(page, WfTextbookSubscriptionPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询教材教辅征订信息")
+    @SaCheckPermission("wftextbooksubscription:detail")
+    public RT<WfTextbookSubscriptionVo> info(@RequestParam Long id){
+        WfTextbookSubscription wfTextbookSubscription = wfTextbookSubscriptionService.getByIdDeep(id);
+        if (wfTextbookSubscription == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(wfTextbookSubscription, WfTextbookSubscriptionVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增教材教辅征订")
+    @SaCheckPermission("wftextbooksubscription:add")
+    public RT<Boolean> add(@Valid @RequestBody AddWfTextbookSubscriptionDto dto){
+        WfTextbookSubscription wfTextbookSubscription = BeanUtil.toBean(dto, WfTextbookSubscription.class);
+        boolean isSuccess = wfTextbookSubscriptionService.add(wfTextbookSubscription);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改教材教辅征订")
+    @SaCheckPermission("wftextbooksubscription:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateWfTextbookSubscriptionDto dto){
+
+        WfTextbookSubscription wfTextbookSubscription = BeanUtil.toBean(dto, WfTextbookSubscription.class);
+        return RT.ok(wfTextbookSubscriptionService.update(wfTextbookSubscription));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除教材教辅征订")
+    @SaCheckPermission("wftextbooksubscription:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(wfTextbookSubscriptionService.delete(ids));
+
+    }
+
+}

+ 69 - 0
src/main/java/com/xjrsoft/module/textbook/dto/AddWfTextbookSubscriptionDto.java

@@ -0,0 +1,69 @@
+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.WfTextbookSubscriptionItem;
+
+
+
+/**
+* @title: 教材教辅征订
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class AddWfTextbookSubscriptionDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 所在部门编号
+    */
+    @ApiModelProperty("所在部门编号")
+    private Long deptId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+    /**
+    * wfTextbookSubscriptionItem
+    */
+    @ApiModelProperty("wfTextbookSubscriptionItem子表")
+    private List<AddWfTextbookSubscriptionItemDto> wfTextbookSubscriptionItemList;
+}

+ 113 - 0
src/main/java/com/xjrsoft/module/textbook/dto/AddWfTextbookSubscriptionItemDto.java

@@ -0,0 +1,113 @@
+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-25
+* @Version 1.0
+*/
+@Data
+public class AddWfTextbookSubscriptionItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材教辅征订编号
+    */
+    @ApiModelProperty("教材教辅征订编号")
+    private Long wfTextbookSubscriptionId;
+    /**
+    * 征订类型(xjr_dictionary_item[subscription_type])
+    */
+    @ApiModelProperty("征订类型(xjr_dictionary_item[subscription_type])")
+    private String subscriptionType;
+    /**
+    * 国际标准刊号
+    */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ApiModelProperty("主编")
+    private String editorInChief;
+    /**
+    * 估价(元)
+    */
+    @ApiModelProperty("估价(元)")
+    private BigDecimal appraisalPrice;
+    /**
+    * 是否为规划教材(xjr_dictionary_item[judgment_method_1])
+    */
+    @ApiModelProperty("是否为规划教材(xjr_dictionary_item[judgment_method_1])")
+    private String isTextbookPlan;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+    /**
+    * 班级编号(多个)
+    */
+    @ApiModelProperty("班级编号(多个)")
+    private String classIds;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentSubscriptionNumber;
+    /**
+    * 教师教材征订数量
+    */
+    @ApiModelProperty("教师教材征订数量")
+    private Integer teacherSubscriptionNumber;
+    /**
+    * 教师教参用书征订数量
+    */
+    @ApiModelProperty("教师教参用书征订数量")
+    private Integer teacherReferenceNumber;
+    /**
+    * 是否有配套教学资源(xjr_dictionary_item[judgment_method_1])
+    */
+    @ApiModelProperty("是否有配套教学资源(xjr_dictionary_item[judgment_method_1])")
+    private String isSupportResources;
+    /**
+    * 版本
+    */
+    @ApiModelProperty("版本")
+    private String version;
+
+}

+ 33 - 0
src/main/java/com/xjrsoft/module/textbook/dto/UpdateWfTextbookSubscriptionDto.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.WfTextbookSubscriptionItem;
+
+
+
+/**
+* @title: 教材教辅征订
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class UpdateWfTextbookSubscriptionDto extends AddWfTextbookSubscriptionDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 26 - 0
src/main/java/com/xjrsoft/module/textbook/dto/WfTextbookSubscriptionPageDto.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-25
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WfTextbookSubscriptionPageDto extends PageInput {
+
+
+}

+ 8 - 8
src/main/java/com/xjrsoft/module/textbook/entity/Textbook.java

@@ -1,20 +1,15 @@
 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.baomidou.mybatisplus.annotation.*;
 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;
+import java.util.List;
 
 
 /**
@@ -118,6 +113,11 @@ public class Textbook implements Serializable {
     */
     @ApiModelProperty("课程编号(base_course_subject)")
     private Long courseSubjectId;
+    /**
+     * 使用年级(base_grade)
+     */
+    @ApiModelProperty("使用年级(base_grade)")
+    private Long gradeId;
     /**
     * 版本
     */

+ 120 - 0
src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookSubscription.java

@@ -0,0 +1,120 @@
+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-25
+* @Version 1.0
+*/
+@Data
+@TableName("wf_textbook_subscription")
+@ApiModel(value = "wf_textbook_subscription", description = "教材教辅征订")
+public class WfTextbookSubscription 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 deptId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+    /**
+    * wfTextbookSubscriptionItem
+    */
+    @ApiModelProperty("wfTextbookSubscriptionItem子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "wfTextbookSubscriptionId")
+    private List<WfTextbookSubscriptionItem> wfTextbookSubscriptionItemList;
+
+}

+ 163 - 0
src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookSubscriptionItem.java

@@ -0,0 +1,163 @@
+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-25
+* @Version 1.0
+*/
+@Data
+@TableName("wf_textbook_subscription_item")
+@ApiModel(value = "wf_textbook_subscription_item", description = "教材教辅征订项")
+public class WfTextbookSubscriptionItem 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 wfTextbookSubscriptionId;
+    /**
+    * 征订类型(xjr_dictionary_item[subscription_type])
+    */
+    @ApiModelProperty("征订类型(xjr_dictionary_item[subscription_type])")
+    private String subscriptionType;
+    /**
+    * 国际标准刊号
+    */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ApiModelProperty("主编")
+    private String editorInChief;
+    /**
+    * 估价(元)
+    */
+    @ApiModelProperty("估价(元)")
+    private BigDecimal appraisalPrice;
+    /**
+    * 是否为规划教材(xjr_dictionary_item[judgment_method_1])
+    */
+    @ApiModelProperty("是否为规划教材(xjr_dictionary_item[judgment_method_1])")
+    private String isTextbookPlan;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+    /**
+    * 班级编号(多个)
+    */
+    @ApiModelProperty("班级编号(多个)")
+    private String classIds;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentSubscriptionNumber;
+    /**
+    * 教师教材征订数量
+    */
+    @ApiModelProperty("教师教材征订数量")
+    private Integer teacherSubscriptionNumber;
+    /**
+    * 教师教参用书征订数量
+    */
+    @ApiModelProperty("教师教参用书征订数量")
+    private Integer teacherReferenceNumber;
+    /**
+    * 是否有配套教学资源(xjr_dictionary_item[judgment_method_1])
+    */
+    @ApiModelProperty("是否有配套教学资源(xjr_dictionary_item[judgment_method_1])")
+    private String isSupportResources;
+    /**
+    * 版本
+    */
+    @ApiModelProperty("版本")
+    private String version;
+
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookSubscriptionItemMapper.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.WfTextbookSubscriptionItem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材教辅征订项
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Mapper
+public interface WfTextbookSubscriptionItemMapper extends MPJBaseMapper<WfTextbookSubscriptionItem> {
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookSubscriptionMapper.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.WfTextbookSubscription;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材教辅征订
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Mapper
+public interface WfTextbookSubscriptionMapper extends MPJBaseMapper<WfTextbookSubscription> {
+
+}

+ 2 - 0
src/main/java/com/xjrsoft/module/textbook/service/ITextbookService.java

@@ -47,4 +47,6 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      * @return
      */
     Page<TextbookPageVo> getPage(Page<TextbookPageDto> page, TextbookPageDto dto);
+
+    Boolean dataHandle(Long dataId);
 }

+ 48 - 0
src/main/java/com/xjrsoft/module/textbook/service/IWfTextbookSubscriptionService.java

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
+
+import java.util.List;
+
+/**
+* @title: 教材教辅征订
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+
+public interface IWfTextbookSubscriptionService extends MPJBaseService<WfTextbookSubscription> {
+    /**
+    * 新增
+    *
+    * @param wfTextbookSubscription
+    * @return
+    */
+    Boolean add(WfTextbookSubscription wfTextbookSubscription);
+
+    /**
+    * 更新
+    *
+    * @param wfTextbookSubscription
+    * @return
+    */
+    Boolean update(WfTextbookSubscription wfTextbookSubscription);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+
+    /**
+     * 根据Id
+     *
+     * @param id
+     * @return
+     */
+    WfTextbookSubscription selectById(Long id);
+
+}

+ 57 - 3
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -1,16 +1,17 @@
 package com.xjrsoft.module.textbook.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+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.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.*;
 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.ITextbookService;
+import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     private final TextbookClassRelationMapper textbookTextbookClassRelationMapper;
     private final TextbookSubscriptionRecordMapper textbookTextbookSubscriptionRecordMapper;
 
+    private final  IWfTextbookSubscriptionService iWfTextbookSubscriptionService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -130,4 +133,55 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     public Page<TextbookPageVo> getPage(Page<TextbookPageDto> page, TextbookPageDto dto) {
         return textbookTextbookMapper.getPage(page, dto);
     }
+
+    @Override
+    public Boolean dataHandle(Long dataId) {
+        WfTextbookSubscription wfTextbookSubscription = iWfTextbookSubscriptionService.selectById(dataId);
+        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);
+                Long count = this.count(queryWrapper);
+                if(count <= 0){//该书不存在教材管理
+                    Textbook textbook = new Textbook();
+                    textbook.setIssn(wfTextbookSubscriptionItem.getIssn());
+                    textbook.setIsbn(wfTextbookSubscriptionItem.getIsbn());
+                    textbook.setBookName(wfTextbookSubscriptionItem.getBookName());
+                    textbook.setPublishingHouse(wfTextbookSubscriptionItem.getPublishingHouse());
+                    textbook.setEditorInChief(wfTextbookSubscriptionItem.getEditorInChief());
+                    textbook.setSubjectGroupId(wfTextbookSubscription.getSubjectGroupId());
+                    textbook.setBaseSemesterId(wfTextbookSubscription.getBaseSemesterId());
+                    textbook.setCourseSubjectId(wfTextbookSubscriptionItem.getCourseSubjectId());
+                    textbook.setVersion(wfTextbookSubscriptionItem.getVersion());
+                    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();
+                        String[] classIdStrs = classIds.split(",");
+                        for (String classIdStr : classIdStrs) {
+                            Long classId = Long.parseLong(classIdStr);
+                            TextbookClassRelation textbookClassRelation = new TextbookClassRelation();
+                            textbookClassRelation.setTextbookId(textbook.getId());
+                            textbookClassRelation.setClassId(classId);
+                            textbookTextbookClassRelationMapper.insert(textbookClassRelation);
+                        }
+                    }
+                    TextbookSubscriptionRecord textbookSubscriptionRecord = new TextbookSubscriptionRecord();
+                    textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
+                    textbookSubscriptionRecord.setWfTextbookSubscriptionId(wfTextbookSubscription.getId());
+                    textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+                }
+            }
+        }
+        return true;
+    }
 }

+ 100 - 0
src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java

@@ -0,0 +1,100 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscriptionItem;
+import com.xjrsoft.module.textbook.mapper.WfTextbookSubscriptionItemMapper;
+import com.xjrsoft.module.textbook.mapper.WfTextbookSubscriptionMapper;
+import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
+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;
+
+/**
+* @title: 教材教辅征订
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfTextbookSubscriptionMapper, WfTextbookSubscription> implements IWfTextbookSubscriptionService {
+    private final WfTextbookSubscriptionMapper wfTextbookSubscriptionWfTextbookSubscriptionMapper;
+
+    private final WfTextbookSubscriptionItemMapper wfTextbookSubscriptionWfTextbookSubscriptionItemMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(WfTextbookSubscription wfTextbookSubscription) {
+        wfTextbookSubscriptionWfTextbookSubscriptionMapper.insert(wfTextbookSubscription);
+        for (WfTextbookSubscriptionItem wfTextbookSubscriptionItem : wfTextbookSubscription.getWfTextbookSubscriptionItemList()) {
+            wfTextbookSubscriptionItem.setWfTextbookSubscriptionId(wfTextbookSubscription.getId());
+            wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.insert(wfTextbookSubscriptionItem);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(WfTextbookSubscription wfTextbookSubscription) {
+        wfTextbookSubscriptionWfTextbookSubscriptionMapper.updateById(wfTextbookSubscription);
+        //********************************* WfTextbookSubscriptionItem  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<WfTextbookSubscriptionItem> wfTextbookSubscriptionItemList = wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.selectList(Wrappers.lambdaQuery(WfTextbookSubscriptionItem.class).eq(WfTextbookSubscriptionItem::getWfTextbookSubscriptionId, wfTextbookSubscription.getId()).select(WfTextbookSubscriptionItem::getId));
+            List<Long> wfTextbookSubscriptionItemIds = wfTextbookSubscriptionItemList.stream().map(WfTextbookSubscriptionItem::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> wfTextbookSubscriptionItemOldIds = wfTextbookSubscription.getWfTextbookSubscriptionItemList().stream().map(WfTextbookSubscriptionItem::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> wfTextbookSubscriptionItemRemoveIds = wfTextbookSubscriptionItemIds.stream().filter(item -> !wfTextbookSubscriptionItemOldIds.contains(item)).collect(Collectors.toList());
+
+            for (WfTextbookSubscriptionItem wfTextbookSubscriptionItem : wfTextbookSubscription.getWfTextbookSubscriptionItemList()) {
+                //如果不等于空则修改
+                if (wfTextbookSubscriptionItem.getId() != null) {
+                    wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.updateById(wfTextbookSubscriptionItem);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    wfTextbookSubscriptionItem.setWfTextbookSubscriptionId(wfTextbookSubscription.getId());
+                    wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.insert(wfTextbookSubscriptionItem);
+                }
+            }
+            //已经不存在的id 删除
+            if(wfTextbookSubscriptionItemRemoveIds.size() > 0){
+                wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.deleteBatchIds(wfTextbookSubscriptionItemRemoveIds);
+            }
+        }
+        //********************************* WfTextbookSubscriptionItem  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        wfTextbookSubscriptionWfTextbookSubscriptionMapper.deleteBatchIds(ids);
+        wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.delete(Wrappers.lambdaQuery(WfTextbookSubscriptionItem.class).in(WfTextbookSubscriptionItem::getWfTextbookSubscriptionId, ids));
+
+        return true;
+    }
+
+    @Override
+    public WfTextbookSubscription selectById(Long id) {
+        WfTextbookSubscription wfTextbookSubscription = this.getById(id);
+        LambdaQueryWrapper<WfTextbookSubscriptionItem> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .eq(WfTextbookSubscriptionItem::getWfTextbookSubscriptionId,id);
+        List<WfTextbookSubscriptionItem> wfTextbookSubscriptionItemList = wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.selectList(queryWrapper);
+        wfTextbookSubscription.setWfTextbookSubscriptionItemList(wfTextbookSubscriptionItemList);
+        return wfTextbookSubscription;
+    }
+}

+ 114 - 0
src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookSubscriptionItemVo.java

@@ -0,0 +1,114 @@
+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-25
+* @Version 1.0
+*/
+@Data
+public class WfTextbookSubscriptionItemVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材教辅征订编号
+    */
+    @ApiModelProperty("教材教辅征订编号")
+    private Long wfTextbookSubscriptionId;
+    /**
+    * 征订类型(xjr_dictionary_item[subscription_type])
+    */
+    @ApiModelProperty("征订类型(xjr_dictionary_item[subscription_type])")
+    private String subscriptionType;
+    /**
+    * 国际标准刊号
+    */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ApiModelProperty("主编")
+    private String editorInChief;
+    /**
+    * 估价(元)
+    */
+    @ApiModelProperty("估价(元)")
+    private BigDecimal appraisalPrice;
+    /**
+    * 是否为规划教材(xjr_dictionary_item[judgment_method_1])
+    */
+    @ApiModelProperty("是否为规划教材(xjr_dictionary_item[judgment_method_1])")
+    private String isTextbookPlan;
+    /**
+    * 课程编号(base_course_subject)
+    */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private Long courseSubjectId;
+    /**
+    * 班级编号(多个)
+    */
+    @ApiModelProperty("班级编号(多个)")
+    private String classIds;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentSubscriptionNumber;
+    /**
+    * 教师教材征订数量
+    */
+    @ApiModelProperty("教师教材征订数量")
+    private Integer teacherSubscriptionNumber;
+    /**
+    * 教师教参用书征订数量
+    */
+    @ApiModelProperty("教师教参用书征订数量")
+    private Integer teacherReferenceNumber;
+    /**
+    * 是否有配套教学资源(xjr_dictionary_item[judgment_method_1])
+    */
+    @ApiModelProperty("是否有配套教学资源(xjr_dictionary_item[judgment_method_1])")
+    private String isSupportResources;
+    /**
+    * 版本
+    */
+    @ApiModelProperty("版本")
+    private String version;
+
+
+
+}

+ 94 - 0
src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookSubscriptionPageVo.java

@@ -0,0 +1,94 @@
+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-25
+* @Version 1.0
+*/
+@Data
+public class WfTextbookSubscriptionPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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 deptId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+}

+ 70 - 0
src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookSubscriptionVo.java

@@ -0,0 +1,70 @@
+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.WfTextbookSubscriptionItem;
+
+/**
+* @title: 教材教辅征订表单出参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class WfTextbookSubscriptionVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 所在部门编号
+    */
+    @ApiModelProperty("所在部门编号")
+    private Long deptId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 学科组管理编号(subject_group)
+    */
+    @ApiModelProperty("学科组管理编号(subject_group)")
+    private Long subjectGroupId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 状态(1:结束 0:未结束)
+    */
+    @ApiModelProperty("状态(1:结束 0:未结束)")
+    private Integer status;
+
+
+    /**
+    * wfTextbookSubscriptionItem
+    */
+    @ApiModelProperty("wfTextbookSubscriptionItem子表")
+    private List<WfTextbookSubscriptionItemVo> wfTextbookSubscriptionItemList;
+
+}

+ 23 - 0
src/test/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImplTest.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import com.xjrsoft.module.textbook.service.ITextbookService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * @description:TODO
+ * @author: phoenix
+ * @create: 2023/12/25 20:51
+ * @Version 1.0
+ */
+@SpringBootTest
+class TextbookServiceImplTest {
+    @Autowired
+    private ITextbookService textbookService;
+
+    @Test
+    void dataHandle() {
+        textbookService.dataHandle(1739238143509458944L);
+    }
+}

+ 38 - 0
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1191,6 +1191,7 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
     /**
      * 学科组课程管理
      *
@@ -1269,4 +1270,41 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 教材教辅征订
+     *
+     */
+    @Test
+    public void gcWfTextbookSubscription() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("wf_textbook_subscription");//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_subscription_item");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表,一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("wf_textbook_subscription_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);
+    }
 }