教材征订项更改历史记录

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

@@ -172,7 +172,7 @@ public class TextbookSubscriptionController {
     @PutMapping("/alteration")
     @ApiOperation(value = "变更")
     @SaCheckPermission("wftextbooksubscription:edit")
-    public RT<Boolean> alteration(@Valid @RequestBody UpdateWfTextbookSubscriptionItemDto dto){
+    public RT<Boolean> alteration(@Valid @RequestBody UpdateTextbookSubscriptionItemDto dto){
         return RT.ok(textbookSubscriptionService.alteration(dto));
     }
 

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

@@ -0,0 +1,147 @@
+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.github.yulichang.wrapper.MPJLambdaWrapper;
+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.base.entity.BaseCourseSubject;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.textbook.dto.AddTextbookSubscriptionItemHistoryDto;
+import com.xjrsoft.module.textbook.dto.UpdateTextbookSubscriptionItemHistoryDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.xjrsoft.module.textbook.entity.Textbook;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscriptionItemHistory;
+import com.xjrsoft.module.textbook.vo.WfTextbookSubscriptionItemHistoryPageVo;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.textbook.dto.TextbookSubscriptionItemHistoryPageDto;
+import com.xjrsoft.module.textbook.entity.TextbookSubscriptionItemHistory;
+import com.xjrsoft.module.textbook.service.ITextbookSubscriptionItemHistoryService;
+import com.xjrsoft.module.textbook.vo.TextbookSubscriptionItemHistoryPageVo;
+
+import com.xjrsoft.module.textbook.vo.TextbookSubscriptionItemHistoryVo;
+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 phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/textbookSubscriptionItemHistory")
+@Api(value = "/textbook"  + "/textbookSubscriptionItemHistory",tags = "教材教辅征订项变更历史代码")
+@AllArgsConstructor
+public class TextbookSubscriptionItemHistoryController {
+
+
+    private final ITextbookSubscriptionItemHistoryService textbookSubscriptionItemHistoryService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="教材教辅征订项变更历史列表(分页)")
+    @SaCheckPermission("textbooksubscriptionitemhistory:detail")
+    public RT<PageOutput<TextbookSubscriptionItemHistoryPageVo>> page(@Valid TextbookSubscriptionItemHistoryPageDto dto){
+
+        MPJLambdaWrapper<TextbookSubscriptionItemHistory> mpjLambdaWrapper = new MPJLambdaWrapper<>();
+        mpjLambdaWrapper
+                .select(TextbookSubscriptionItemHistory::getId)
+                .selectAs(BaseCourseSubject::getName, TextbookSubscriptionItemHistoryPageVo::getCourseName)
+                .selectAs(XjrUser::getName, TextbookSubscriptionItemHistoryPageVo::getCreateUserIdCn)
+                .select(Textbook.class, x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionItemHistoryPageVo.class).contains(x.getProperty()))
+                .select(TextbookSubscriptionItemHistory.class, x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionItemHistoryPageVo.class).contains(x.getProperty()))
+                .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItemHistory::getTextbookId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
+                        ext -> ext.selectAs(DictionaryDetail::getName, TextbookSubscriptionItemHistoryPageVo::getTextbookTypeCn))
+                .leftJoin(BaseCourseSubject.class, BaseCourseSubject::getId, Textbook::getCourseSubjectId)
+                .leftJoin(XjrUser.class, XjrUser::getId, TextbookSubscriptionItemHistory::getCreateUserId)
+                .eq(dto.getTextbookSubscriptionItemId() != null && dto.getTextbookSubscriptionItemId() > 0, TextbookSubscriptionItemHistory::getTextbookSubscriptionItemId, dto.getTextbookSubscriptionItemId())
+                .eq(dto.getTextbookSubscriptionId() != null && dto.getTextbookSubscriptionId() > 0, TextbookSubscriptionItemHistory::getTextbookSubscriptionId, dto.getTextbookSubscriptionId())
+                .eq(dto.getTextbookType() != null && !dto.getTextbookType().isEmpty(), Textbook::getTextbookType, dto.getTextbookType())
+                .like(dto.getBookName() != null && !dto.getBookName().isEmpty(), Textbook::getBookName, dto.getBookName())
+                .like(dto.getCourseSubjectIdCn() != null && !dto.getCourseSubjectIdCn().isEmpty(), BaseCourseSubject::getName, dto.getCourseSubjectIdCn())
+                .orderByAsc("t.textbook_subscription_item_id, t.history_version")
+        ;
+        IPage<TextbookSubscriptionItemHistoryPageVo> page = textbookSubscriptionItemHistoryService.selectJoinListPage(ConventPage.getPage(dto), TextbookSubscriptionItemHistoryPageVo.class, mpjLambdaWrapper);
+        PageOutput<TextbookSubscriptionItemHistoryPageVo> pageOutput = ConventPage.getPageOutput(page, TextbookSubscriptionItemHistoryPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询教材教辅征订项变更历史信息")
+    @SaCheckPermission("textbooksubscriptionitemhistory:detail")
+    public RT<TextbookSubscriptionItemHistoryVo> info(@RequestParam Long id){
+        TextbookSubscriptionItemHistory textbookSubscriptionItemHistory = textbookSubscriptionItemHistoryService.getById(id);
+        if (textbookSubscriptionItemHistory == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(textbookSubscriptionItemHistory, TextbookSubscriptionItemHistoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增教材教辅征订项变更历史")
+    @SaCheckPermission("textbooksubscriptionitemhistory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddTextbookSubscriptionItemHistoryDto dto){
+        TextbookSubscriptionItemHistory textbookSubscriptionItemHistory = BeanUtil.toBean(dto, TextbookSubscriptionItemHistory.class);
+        boolean isSuccess = textbookSubscriptionItemHistoryService.save(textbookSubscriptionItemHistory);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改教材教辅征订项变更历史")
+    @SaCheckPermission("textbooksubscriptionitemhistory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateTextbookSubscriptionItemHistoryDto dto){
+
+        TextbookSubscriptionItemHistory textbookSubscriptionItemHistory = BeanUtil.toBean(dto, TextbookSubscriptionItemHistory.class);
+        return RT.ok(textbookSubscriptionItemHistoryService.updateById(textbookSubscriptionItemHistory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除教材教辅征订项变更历史")
+    @SaCheckPermission("textbooksubscriptionitemhistory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(textbookSubscriptionItemHistoryService.removeBatchByIds(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<TextbookSubscriptionItemHistoryPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(TextbookSubscriptionItemHistoryPageVo.class).sheet().doReadSync();
+        Boolean result = textbookSubscriptionItemHistoryService.saveBatch(BeanUtil.copyToList(savedDataList, TextbookSubscriptionItemHistory.class));
+        return RT.ok(result);
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid TextbookSubscriptionItemHistoryPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<TextbookSubscriptionItemHistoryPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookSubscriptionItemHistoryPageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookSubscriptionItemHistoryPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookSubscriptionItemHistory" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

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

@@ -0,0 +1,83 @@
+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 phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Data
+public class AddTextbookSubscriptionItemHistoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材教辅征订编号
+    */
+    @ApiModelProperty("教材教辅征订编号")
+    private Long textbookSubscriptionId;
+    /**
+    * 教材教辅征订项编号
+    */
+    @ApiModelProperty("教材教辅征订项编号")
+    private Long textbookSubscriptionItemId;
+    /**
+    * 教材表主键(textbook)
+    */
+    @ApiModelProperty("教材表主键(textbook)")
+    private Long textbookId;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentNum;
+    /**
+    * 教师用书征订数量
+    */
+    @ApiModelProperty("教师用书征订数量")
+    private Integer teacherNum;
+    /**
+    * 实际折扣
+    */
+    @ApiModelProperty("实际折扣")
+    private Double discount;
+    /**
+    * 实际价格(元)
+    */
+    @ApiModelProperty("实际价格(元)")
+    private BigDecimal price;
+    /**
+    * 当前征订任务征订项入库数量
+    */
+    @ApiModelProperty("当前征订任务征订项入库数量")
+    private Integer inStockNum;
+    /**
+    * 当前征订任务征订项出库数量
+    */
+    @ApiModelProperty("当前征订任务征订项出库数量")
+    private Integer outStockNum;
+    /**
+    * 变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）
+    */
+    @ApiModelProperty("变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）")
+    private Integer alterationType;
+
+}

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

@@ -0,0 +1,55 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+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 phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TextbookSubscriptionItemHistoryPageDto extends PageInput {
+    /**
+     * 教材教辅征订编号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教材教辅征订编号")
+    @ApiModelProperty("教材教辅征订编号")
+    private Long textbookSubscriptionId;
+    /**
+     * 教材教辅征订项编号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教材教辅征订项编号")
+    @ApiModelProperty("教材教辅征订项编号")
+    private Long textbookSubscriptionItemId;
+    /**
+     * 教材分类(xjr_dictionary_item[textbook_type])
+     */
+    @ApiModelProperty("教材分类(xjr_dictionary_item[textbook_type])")
+    private String textbookType;
+    /**
+     * 书名
+     */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+     * 课程编号(base_course_subject)
+     */
+    @ApiModelProperty("课程编号(base_course_subject)")
+    private String courseSubjectIdCn;
+}

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

@@ -0,0 +1,41 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 教材征订记录详情表
+* @Author dzx
+* @Date: 2024-12-16
+* @Version 1.0
+*/
+@Data
+public class UpdateTextbookSubscriptionItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 教材表主键(textbook)
+    */
+    @ApiModelProperty("教材表主键(textbook)")
+    private Long textbookId;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentNum;
+    /**
+    * 教师用书征订数量
+    */
+    @ApiModelProperty("教师用书征订数量")
+    private Integer teacherNum;
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 教材教辅征订项变更历史
+* @Author phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Data
+public class UpdateTextbookSubscriptionItemHistoryDto extends AddTextbookSubscriptionItemHistoryDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,137 @@
+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 phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Data
+@TableName("textbook_subscription_item_history")
+@ApiModel(value = "textbook_subscription_item_history", description = "教材教辅征订项变更历史")
+public class TextbookSubscriptionItemHistory 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 textbookSubscriptionId;
+    /**
+    * 教材教辅征订项编号
+    */
+    @ApiModelProperty("教材教辅征订项编号")
+    private Long textbookSubscriptionItemId;
+    /**
+    * 教材表主键(textbook)
+    */
+    @ApiModelProperty("教材表主键(textbook)")
+    private Long textbookId;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentNum;
+    /**
+    * 教师用书征订数量
+    */
+    @ApiModelProperty("教师用书征订数量")
+    private Integer teacherNum;
+    /**
+    * 实际折扣
+    */
+    @ApiModelProperty("实际折扣")
+    private Double discount;
+    /**
+    * 实际价格(元)
+    */
+    @ApiModelProperty("实际价格(元)")
+    private BigDecimal price;
+    /**
+    * 当前征订任务征订项入库数量
+    */
+    @ApiModelProperty("当前征订任务征订项入库数量")
+    private Integer inStockNum;
+    /**
+    * 当前征订任务征订项出库数量
+    */
+    @ApiModelProperty("当前征订任务征订项出库数量")
+    private Integer outStockNum;
+    /**
+     * 当前征订项变更历史记录
+     */
+    @ApiModelProperty("当前征订项变更历史记录")
+    private Integer historyVersion;
+
+    /**
+    * 变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）
+    */
+    @ApiModelProperty("变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）")
+    private Integer alterationType;
+}

src/main/java/com/xjrsoft/module/textbook/mapper/TextbookSubscriptionItemHistoryMapper.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.TextbookSubscriptionItemHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材教辅征订项变更历史
+* @Author phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Mapper
+public interface TextbookSubscriptionItemHistoryMapper extends MPJBaseMapper<TextbookSubscriptionItemHistory> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.entity.TextbookSubscriptionItemHistory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 教材教辅征订项变更历史
+* @Author phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+
+public interface ITextbookSubscriptionItemHistoryService extends MPJBaseService<TextbookSubscriptionItemHistory> {
+}

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

@@ -72,7 +72,7 @@ public interface ITextbookSubscriptionService extends MPJBaseService<TextbookSub
     /**
      * 变更
      */
-    Boolean alteration(UpdateWfTextbookSubscriptionItemDto dto);
+    Boolean alteration(UpdateTextbookSubscriptionItemDto dto);
 
 
     Boolean changeStatus(UpdateWfTextbookSubscriptionDto dto);

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.textbook.entity.TextbookSubscriptionItemHistory;
+import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionItemHistoryMapper;
+import com.xjrsoft.module.textbook.service.ITextbookSubscriptionItemHistoryService;
+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 phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class TextbookSubscriptionItemHistoryServiceImpl extends MPJBaseServiceImpl<TextbookSubscriptionItemHistoryMapper, TextbookSubscriptionItemHistory> implements ITextbookSubscriptionItemHistoryService {
+}

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

@@ -63,6 +63,8 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
 
     private final TextbookWarehouseRecordMapper textbookWarehouseRecordMapper;
 
+    private final TextbookSubscriptionItemHistoryMapper textbookSubscriptionItemHistoryMapper;
+
     @Override
     public IPage<TextbookSubscriptionPageVo> pageRubAndHand(TextbookSubscriptionPageDto dto) {
         MPJLambdaWrapper<TextbookSubscription> queryWrapper = new MPJLambdaWrapper<>();
@@ -577,40 +579,55 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean alteration(UpdateWfTextbookSubscriptionItemDto dto) {
+    public Boolean alteration(UpdateTextbookSubscriptionItemDto dto) {
         TextbookSubscriptionItem old = textbookSubscriptionTextbookSubscriptionItemMapper.selectById(dto.getId());
         if(old == null){
             throw new MyException("征订项已经被修改，刷新重试");
         }
 
-        //将历史记录保存到历史变更记录表
-        LambdaQueryWrapper<WfTextbookSubscriptionItemHistory> wfTextbookSubscriptionItemHistoryLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        wfTextbookSubscriptionItemHistoryLambdaQueryWrapper
-                .eq(WfTextbookSubscriptionItemHistory::getWfTextbookSubscriptionItemId, old.getId())
-                .orderByDesc(WfTextbookSubscriptionItemHistory::getHistoryVersion)
+        // 判断变更状态
+        int alterationType = 0;
+
+        if(!old.getStudentNum().equals(dto.getStudentNum())
+                && !old.getTeacherNum().equals(dto.getTeacherNum())
+        ){
+            alterationType = 1;
+        }
+
+        if(!old.getTextbookId().equals(dto.getTextbookId())){
+            alterationType = 2;
+        }
+
+        // 将历史记录保存到历史变更记录表
+        // 当前征订项的变更历史最后一次记录
+        LambdaQueryWrapper<TextbookSubscriptionItemHistory> textbookSubscriptionItemHistoryLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        textbookSubscriptionItemHistoryLambdaQueryWrapper
+                .eq(TextbookSubscriptionItemHistory::getTextbookSubscriptionItemId, old.getId())
+                .orderByDesc(TextbookSubscriptionItemHistory::getHistoryVersion)
                 .last("limit 1")
         ;
-//        WfTextbookSubscriptionItemHistory lastOne = textbookSubscriptionItemHistoryMapper.selectOne(wfTextbookSubscriptionItemHistoryLambdaQueryWrapper);
-
-        WfTextbookSubscriptionItemHistory wfTextbookSubscriptionItemHistory = new WfTextbookSubscriptionItemHistory();
-        BeanUtils.copyProperties(old, wfTextbookSubscriptionItemHistory);
-        wfTextbookSubscriptionItemHistory.setId(null);
-        wfTextbookSubscriptionItemHistory.setWfTextbookSubscriptionItemId(old.getId());
-        wfTextbookSubscriptionItemHistory.setCreateDate(new Date());
-        wfTextbookSubscriptionItemHistory.setCreateUserId(StpUtil.getLoginIdAsLong());
-//        if(lastOne != null){
-//            wfTextbookSubscriptionItemHistory.setHistoryVersion(lastOne.getHistoryVersion() + 1);
-//        } else {
-//            wfTextbookSubscriptionItemHistory.setHistoryVersion(1);
-//        }
-//
-//        wfTextbookSubscriptionItemHistoryMapper.insert(wfTextbookSubscriptionItemHistory);
+        TextbookSubscriptionItemHistory lastOne = textbookSubscriptionItemHistoryMapper.selectOne(textbookSubscriptionItemHistoryLambdaQueryWrapper);
+
+        // 将变更前的数据记录在历史表中
+        TextbookSubscriptionItemHistory textbookSubscriptionItemHistory = new TextbookSubscriptionItemHistory();
+        BeanUtils.copyProperties(old, textbookSubscriptionItemHistory);
+        textbookSubscriptionItemHistory.setId(null);
+        textbookSubscriptionItemHistory.setTextbookSubscriptionItemId(old.getId());
+        textbookSubscriptionItemHistory.setCreateDate(new Date());
+        textbookSubscriptionItemHistory.setCreateUserId(StpUtil.getLoginIdAsLong());
+        if(ObjectUtils.isNotEmpty(lastOne)){
+            textbookSubscriptionItemHistory.setHistoryVersion(lastOne.getHistoryVersion() + 1);
+        } else {
+            textbookSubscriptionItemHistory.setHistoryVersion(1);
+        }
+        textbookSubscriptionItemHistory.setAlterationType(alterationType);
+        textbookSubscriptionItemHistoryMapper.insert(textbookSubscriptionItemHistory);
 
         //变更当前记录
-        WfTextbookSubscriptionItem updateItem = new WfTextbookSubscriptionItem();
+        TextbookSubscriptionItem updateItem = new TextbookSubscriptionItem();
         BeanUtils.copyProperties(dto, updateItem);
-
-//        wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.updateById(updateItem);
+        updateItem.setAlterationType(alterationType);
+        textbookSubscriptionTextbookSubscriptionItemMapper.updateById(updateItem);
 
         return true;
     }

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

@@ -0,0 +1,129 @@
+package com.xjrsoft.module.textbook.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 教材教辅征订项变更历史分页列表出参
+* @Author phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Data
+public class TextbookSubscriptionItemHistoryPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+
+    @ApiModelProperty("创建人")
+    private String createUserIdCn;
+
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 教材教辅征订编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教材教辅征订编号")
+    @ApiModelProperty("教材教辅征订编号")
+    private Long textbookSubscriptionId;
+    /**
+    * 教材教辅征订项编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教材教辅征订项编号")
+    @ApiModelProperty("教材教辅征订项编号")
+    private Long textbookSubscriptionItemId;
+    /**
+    * 教材表主键(textbook)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教材表主键(textbook)")
+    @ApiModelProperty("教材表主键(textbook)")
+    private Long textbookId;
+
+    @ApiModelProperty("课程名称")
+    private String courseName;
+
+    @ApiModelProperty("教材类型")
+    private String textbookTypeCn;
+
+    /**
+    * 学生用书征订数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生用书征订数量")
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentNum;
+    /**
+    * 教师用书征订数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("教师用书征订数量")
+    @ApiModelProperty("教师用书征订数量")
+    private Integer teacherNum;
+    /**
+    * 实际折扣
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("实际折扣")
+    @ApiModelProperty("实际折扣")
+    private Double discount;
+    /**
+    * 实际价格(元)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("实际价格(元)")
+    @ApiModelProperty("实际价格(元)")
+    private BigDecimal price;
+    /**
+    * 当前征订任务征订项入库数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("当前征订任务征订项入库数量")
+    @ApiModelProperty("当前征订任务征订项入库数量")
+    private Integer inStockNum;
+    /**
+    * 当前征订任务征订项出库数量
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("当前征订任务征订项出库数量")
+    @ApiModelProperty("当前征订任务征订项出库数量")
+    private Integer outStockNum;
+    /**
+    * 变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）")
+    @ApiModelProperty("变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）")
+    private Integer alterationType;
+
+}

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

@@ -0,0 +1,84 @@
+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 phoenix
+* @Date: 2025-01-22
+* @Version 1.0
+*/
+@Data
+public class TextbookSubscriptionItemHistoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材教辅征订编号
+    */
+    @ApiModelProperty("教材教辅征订编号")
+    private Long textbookSubscriptionId;
+    /**
+    * 教材教辅征订项编号
+    */
+    @ApiModelProperty("教材教辅征订项编号")
+    private Long textbookSubscriptionItemId;
+    /**
+    * 教材表主键(textbook)
+    */
+    @ApiModelProperty("教材表主键(textbook)")
+    private Long textbookId;
+    /**
+    * 学生用书征订数量
+    */
+    @ApiModelProperty("学生用书征订数量")
+    private Integer studentNum;
+    /**
+    * 教师用书征订数量
+    */
+    @ApiModelProperty("教师用书征订数量")
+    private Integer teacherNum;
+    /**
+    * 实际折扣
+    */
+    @ApiModelProperty("实际折扣")
+    private Double discount;
+    /**
+    * 实际价格(元)
+    */
+    @ApiModelProperty("实际价格(元)")
+    private BigDecimal price;
+    /**
+    * 当前征订任务征订项入库数量
+    */
+    @ApiModelProperty("当前征订任务征订项入库数量")
+    private Integer inStockNum;
+    /**
+    * 当前征订任务征订项出库数量
+    */
+    @ApiModelProperty("当前征订任务征订项出库数量")
+    private Integer outStockNum;
+    /**
+    * 变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）
+    */
+    @ApiModelProperty("变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）")
+    private Integer alterationType;
+
+
+
+}

src/main/resources/sqlScript/textbook_sql.sql

@@ -175,7 +175,8 @@ create table `textbook_subscription_item_history`
     price                         decimal(10, 2) null default 0 comment '实际价格(元)',
     in_stock_num                  int            null default 0 comment '当前征订任务征订项入库数量',
     out_stock_num                 int            null default 0 comment '当前征订任务征订项出库数量',
-    alteration_type               int            null default 0 comment '变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，）'
+    history_version               int                 default 0 null comment '当前征订项变更历史记录',
+    alteration_type               int            null default 0 comment '变更类型（0：未变更，1：学生用书征订数量，2：教师用书征订数量，3：变更课程，4:学生用书征订数量和教师用书征订数量）'
 ) engine = innodb
   default charset = utf8mb4
   collate = utf8mb4_0900_ai_ci comment ='教材教辅征订项变更历史';

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

@@ -4335,4 +4335,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcTextbookSubscriptionItemHistory() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("textbook_subscription_item_history");//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("phoenix");//作者名称
+        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);
+    }
 }