Browse Source

征订历史记录

大数据与最优化研究所 1 year ago
parent
commit
13e6b724d0

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

@@ -150,7 +150,7 @@ public class WfTextbookSubscriptionController {
                 .eq(WfTextbookSubscriptionItem::getTextbookId, dto.getTextbookId())
                 .eq(WfTextbookSubscriptionItem::getTextbookId, dto.getTextbookId())
                 .eq(WfTextbookSubscription::getBaseSemesterId, dto.getBaseSemesterId())
                 .eq(WfTextbookSubscription::getBaseSemesterId, dto.getBaseSemesterId())
                 .orderByDesc(WfTextbookSubscription::getCreateDate)
                 .orderByDesc(WfTextbookSubscription::getCreateDate)
-                .groupBy(WfTextbookSubscriptionItem::getTextbookId)
+                .groupBy("t.id,t`.textbook_id")
         ;
         ;
         List<TextbookSubscriptionHistoryListVo> list = wfTextbookSubscriptionService.selectJoinList(TextbookSubscriptionHistoryListVo.class, queryWrapper);
         List<TextbookSubscriptionHistoryListVo> list = wfTextbookSubscriptionService.selectJoinList(TextbookSubscriptionHistoryListVo.class, queryWrapper);
         return RT.ok(list);
         return RT.ok(list);

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

@@ -67,8 +67,6 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
 
     private final TextbookSubscriptionRecordMapper textbookTextbookSubscriptionRecordMapper;
     private final TextbookSubscriptionRecordMapper textbookTextbookSubscriptionRecordMapper;
 
 
-    private final IWfTextbookSubscriptionService iWfTextbookSubscriptionService;
-
     private final IWfExerciseBookService wfExerciseBookService;
     private final IWfExerciseBookService wfExerciseBookService;
 
 
     private final IBaseClassService baseClassService;
     private final IBaseClassService baseClassService;

+ 10 - 0
src/main/java/com/xjrsoft/module/textbook/vo/TextbookSubscriptionHistoryListVo.java

@@ -1,8 +1,12 @@
 package com.xjrsoft.module.textbook.vo;
 package com.xjrsoft.module.textbook.vo;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.Date;
+
 /**
 /**
 * @title: 教材管理表单出参
 * @title: 教材管理表单出参
 * @Author szs
 * @Author szs
@@ -27,4 +31,10 @@ public class TextbookSubscriptionHistoryListVo {
      */
      */
     @ApiModelProperty("教师教材征订数量")
     @ApiModelProperty("教师教材征订数量")
     private Integer teacherSubscriptionNumber;
     private Integer teacherSubscriptionNumber;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
 }
 }