可以退书的列表

src/main/java/com/xjrsoft/common/enums/RecedeTypeEnum.java

@@ -10,12 +10,12 @@ public enum RecedeTypeEnum {
     /**
      *
      * */
-    PersonalRecede("personal_recede", "个人退书"),
+    PersonalRecede("recede_deans_office", "退到教务处"),
 
     /**
      *
      * */
-    ClassRecede("class_recede", "班级退书");
+    ClassRecede("recede_bookstore", "退到书店");
 
     final String code;
     final String value;

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

@@ -8,11 +8,11 @@ public class CanReturnTextbookListDto {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty("申请人用户主键编号")
-    private Long applicantUserId;
+    private String applicantUserId;
 
-    @ApiModelProperty("退还类型")
-    private String recordType;
+    @ApiModelProperty("退还类型(0：个人，1：班级)")
+    private Integer recordType;
 
     @ApiModelProperty("学期主键编号")
-    private Long baseSemesterId;
+    private String baseSemesterId;
 }

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

@@ -23,6 +23,7 @@ import com.xjrsoft.module.textbook.vo.*;
 import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -101,11 +102,11 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                 .selectAs(Textbook::getBookName, CanReturnTextbookListVo::getTextbookIdCn)
                 .selectAs(TextbookIssueRecord::getActualIssueNumber, CanReturnTextbookListVo::getActualIssueNumber)
                 .leftJoin(Textbook.class, Textbook::getId, TextbookIssueRecord::getTextbookId)
-                .eq(ObjectUtils.isNotEmpty(dto.getBaseSemesterId()), TextbookIssueRecord::getBaseSemesterId, dto.getBaseSemesterId())
+                .eq(StringUtils.isNotEmpty(dto.getBaseSemesterId()), TextbookIssueRecord::getBaseSemesterId, dto.getBaseSemesterId())
                 ;
 
         // 个人退书
-        if(RecedeTypeEnum.PersonalRecede.getCode().equals(dto.getRecordType())){
+        if(dto.getRecordType() == 0){
             textbookIssueRecordMPJLambdaWrapper
                     .leftJoin(WfTextbookClaim.class, WfTextbookClaim::getId, TextbookIssueRecord::getDataId)
                     .ne(WfTextbookClaim::getClaimType, ClaimTypeEnum.ClaimClass.getCode())
@@ -113,8 +114,8 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                     ;
         }
 
-        // 个人退书
-        if(RecedeTypeEnum.ClassRecede.getCode().equals(dto.getRecordType())){
+        // 班级退书
+        if(dto.getRecordType() == 1){
             textbookIssueRecordMPJLambdaWrapper
                     .leftJoin(WfTextbookClaim.class, WfTextbookClaim::getId, TextbookIssueRecord::getDataId)
                     .leftJoin(BaseClass.class, BaseClass::getId, WfTextbookClaim::getClassId)

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

@@ -141,6 +141,9 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                 .selectAs(TextbookSubscriptionItem::getTeacherNum, TextbookInstockroomListVo::getTeacherSubscriptionNumber)
 //                .selectAs(TextbookSubscriptionItem::getPrice, TextbookInstockroomListVo::getActualPrice)
 //                .selectAs(TextbookSubscriptionItem::getDiscount, TextbookInstockroomListVo::getDiscount)
+                .selectAs(Textbook::getPrice, TextbookInstockroomListVo::getPrice)
+                .select("ifnull(t2.discount, t.discount) as discount,")
+                .select("ifnull(t2.price, t.price) as actual_price,")
                 .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItem::getTextbookId)
 
                 .leftJoin(TextbookWarehouseRecord.class, TextbookWarehouseRecord::getDataItemId, TextbookSubscriptionItem::getId)

src/main/resources/sqlScript/20250120_sql.sql

@@ -185,4 +185,14 @@ alter table textbook_issue_record
 alter table wf_textbook_recede_item
     add textbook_issue_record_id bigint null comment '出库主键id（textbook_issue_record）' after wf_textbook_recede_id;
 
+alter table wf_textbook_recede
+    add is_stu_flag int null comment '是否是学生' after applicant_user_id;
 
+alter table wf_textbook_recede
+    add is_head_tea_flag int null comment '是否是班主任' after is_stu_flag;
+
+alter table wf_textbook_recede
+    add is_class_recede_flag int null comment '是否是班主任为班级退书' after is_head_tea_flag;
+
+alter table wf_textbook_recede_item
+    add textbook_name varchar(256) null comment '教材名字' after textbook_id;

src/test/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImplTest.java

@@ -18,7 +18,7 @@ class WfTextbookClaimServiceImplTest {
     private IWfTextbookClaimService wfTextbookClaimService;
     @Test
     void dataHandleAddClaimUserNode() {
-        wfTextbookClaimService.dataHandleAddClaimUserNode(1889234925486391296L);
+        wfTextbookClaimService.dataHandleAddClaimUserNode(1889935007730941952L);
     }
 
 }