确认发放

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

@@ -8,12 +8,10 @@ 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.AddTextbookIssueRecordDto;
-import com.xjrsoft.module.textbook.dto.TextbookIssueRecordExportDto;
-import com.xjrsoft.module.textbook.dto.TextbookIssueRecordPageDto;
-import com.xjrsoft.module.textbook.dto.UpdateTextbookIssueRecordDto;
+import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.TextbookIssueRecord;
 import com.xjrsoft.module.textbook.service.ITextbookIssueRecordService;
+import com.xjrsoft.module.textbook.vo.CanReturnTextbookListVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordExcelVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordVo;
@@ -60,6 +58,13 @@ public class TextbookIssueRecordController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/can-return-textbook-list")
+    @ApiOperation(value="根据教材出库记录查询可以退书的书籍列表(不分页)")
+    @SaCheckPermission("textbookissuerecord:detail")
+    public RT<List<CanReturnTextbookListVo>> canReturnTextbookList(@Valid CanReturnTextbookListDto dto){
+        return RT.ok(textbookIssueRecordService.canReturnTextbookList(dto));
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询教材出库记录信息")
     @SaCheckPermission("textbookissuerecord:detail")

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

@@ -0,0 +1,10 @@
+package com.xjrsoft.module.textbook.dto;
+
+import lombok.Data;
+
+@Data
+public class CanReturnTextbookListDto {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -2,9 +2,11 @@ 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.CanReturnTextbookListDto;
 import com.xjrsoft.module.textbook.dto.TextbookIssueRecordExportDto;
 import com.xjrsoft.module.textbook.dto.TextbookIssueRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookIssueRecord;
+import com.xjrsoft.module.textbook.vo.CanReturnTextbookListVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo;
 
 import java.util.List;
@@ -20,6 +22,8 @@ public interface ITextbookIssueRecordService extends MPJBaseService<TextbookIssu
 
     Page<TextbookIssueRecordPageVo> getPage(Page<TextbookIssueRecordPageDto> page, TextbookIssueRecordPageDto dto);
 
+    List<CanReturnTextbookListVo> canReturnTextbookList(CanReturnTextbookListDto dto);
+
     List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto);
 
     List<TextbookIssueRecordPageVo> getList();

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

@@ -2,11 +2,13 @@ package com.xjrsoft.module.textbook.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.textbook.dto.CanReturnTextbookListDto;
 import com.xjrsoft.module.textbook.dto.TextbookIssueRecordExportDto;
 import com.xjrsoft.module.textbook.dto.TextbookIssueRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookIssueRecord;
 import com.xjrsoft.module.textbook.mapper.TextbookIssueRecordMapper;
 import com.xjrsoft.module.textbook.service.ITextbookIssueRecordService;
+import com.xjrsoft.module.textbook.vo.CanReturnTextbookListVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -28,6 +30,11 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
         return textbookIssueRecordMapper.getPage(page, dto);
     }
 
+    @Override
+    public List<CanReturnTextbookListVo> canReturnTextbookList(CanReturnTextbookListDto dto) {
+        return List.of();
+    }
+
     @Override
     public List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto) {
         return textbookIssueRecordMapper.getList(dto);

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

@@ -317,6 +317,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
     public List<SubscriptionItemListDistributeVo> itemListConfirmDistribute(SubscriptionItemListDistributeDto dto) {
         MPJLambdaWrapper<TextbookWarehouseRecord> textbookWarehouseRecordMPJLambdaWrapper = new MPJLambdaWrapper<>();
         textbookWarehouseRecordMPJLambdaWrapper
+                .disableSubLogicDel()
                 .select(TextbookWarehouseRecord::getId)
                 .selectAs(TextbookWarehouseRecord::getSubtotal, SubscriptionItemListDistributeVo::getActulPrice)
                 .select(TextbookWarehouseRecord.class,x -> VoToColumnUtil.fieldsToColumns(SubscriptionItemListDistributeVo.class).contains(x.getProperty()))

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

@@ -251,10 +251,10 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 queryWrapper
                         .in(XjrUser::getId, receiveUserIdList);
                 List<XjrUser> xjrUserList = xjrUserMapper.selectList(queryWrapper);
-                if (ObjectUtils.isNotEmpty(xjrUserList) && xjrUserList.size() > 0) {
+                if (ObjectUtils.isNotEmpty(xjrUserList) && !xjrUserList.isEmpty()) {
                     StringBuilder sb = new StringBuilder();
                     for (XjrUser xjrUser : xjrUserList) {
-                        sb.append("," + xjrUser.getName());
+                        sb.append(",").append(xjrUser.getName());
                     }
                     wfTextbookClaimVo.setReceiveUserIdCN(sb.toString());
                 }

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

@@ -0,0 +1,8 @@
+package com.xjrsoft.module.textbook.vo;
+
+import lombok.Data;
+
+@Data
+public class CanReturnTextbookListVo {
+
+}