导出入参

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

@@ -24,5 +24,5 @@ public class TextbookIssueRecordExportDto{
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("主键编号")
     @ApiModelProperty("主键编号")
-    private List<Long> ids;
+    private List<String> ids;
 }

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

@@ -24,5 +24,5 @@ public class TextbookWarehouseRecordExportDto{
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("主键编号")
     @ApiModelProperty("主键编号")
-    private List<Long> ids;
+    private List<String> ids;
 }

src/main/java/com/xjrsoft/module/textbook/mapper/TextbookStudentClaimMapper.java

@@ -34,4 +34,5 @@ public interface TextbookStudentClaimMapper extends MPJBaseMapper<TextbookStuden
     IPage<TeacherCheckByStuVo> getTeacherCheckByStuList(IPage<TeacherCheckByStuDto> page, @Param("dto")TeacherCheckByStuDto dto);
 
     List<TextbookClaimVO> getTextbookClaimVOList(Long studentUserId);
+    //List<TextbookClaimVO> getTextbookClaimVOList(@Param("studentUserId")List<Long> studentUserId);
 }

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.exception.MyException;
@@ -167,6 +168,16 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
         IPage<TeacherCheckByStuVo> teacherCheckByStuVoList = textbookStudentClaimMapper.getTeacherCheckByStuList(ConventPage.getPage(dto), dto);
 
         //为每个学生添加教材领取记录集合
+        //学生id集合
+//        List<Long> stuIdList = new ArrayList<>();
+//        for (TeacherCheckByStuVo teacherCheckByStuVo : teacherCheckByStuVoList.getRecords()) {
+//            stuIdList.add(teacherCheckByStuVo.getStudentUserId());
+//        }
+//        //一次查出所有学生的所有书籍
+//        if(stuIdList.size() > 0){
+//            List<TextbookClaimVO> textbookClaimVOList = textbookStudentClaimMapper.getTextbookClaimVOList(stuIdList);
+//        }
+
         for (TeacherCheckByStuVo t : teacherCheckByStuVoList.getRecords()) {
             List<TextbookClaimVO> textbookClaimVOList = textbookStudentClaimMapper.getTextbookClaimVOList(t.getStudentUserId());
             t.setTextbookClaimVOList(textbookClaimVOList);
@@ -178,14 +189,20 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
     @Override
     @Transactional
     public Boolean updateByIds(List<Long> textbookStudentClaimIds) {
-        for (Long textbookStudentClaimId : textbookStudentClaimIds) {
-            this.updateById(new TextbookStudentClaim() {{
-                setModifyUserId(StpUtil.getLoginIdAsLong());
-                setModifyDate(new Date());
-                setId(textbookStudentClaimId);
-                setIsClaim(1);
-            }});
-        }
+        this.update(new TextbookStudentClaim() {{
+            setModifyUserId(StpUtil.getLoginIdAsLong());
+            setModifyDate(new Date());
+            setIsClaim(1);
+        }},Wrappers.<TextbookStudentClaim>query().lambda()
+                .in(TextbookStudentClaim::getId, textbookStudentClaimIds));
+//        for (Long textbookStudentClaimId : textbookStudentClaimIds) {
+//            this.updateById(new TextbookStudentClaim() {{
+//                setModifyUserId(StpUtil.getLoginIdAsLong());
+//                setModifyDate(new Date());
+//                setId(textbookStudentClaimId);
+//                setIsClaim(1);
+//            }});
+//        }
         return true;
     }
 

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

@@ -3,6 +3,7 @@ package com.xjrsoft.module.textbook.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -247,6 +248,11 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                     setIssueMode(IssueModeEnum.ImTeacher.getCode());
                 }
                 setRemark(dto.getRemark());
+                QueryWrapper<TextbookIssueRecord> queryWrapperSortcode = new QueryWrapper<>();
+                queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+                TextbookIssueRecord t = textbookIssueRecordService.getOne(queryWrapperSortcode);
+                setSortCode(t.getSortCode()+1);
+
             }});
 
             //更新教材管理中的库存数量

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

@@ -3,6 +3,7 @@ package com.xjrsoft.module.textbook.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.enums.IssueModeEnum;
@@ -128,6 +129,10 @@ public class WfTextbookRecedeServiceImpl extends MPJBaseServiceImpl<WfTextbookRe
                             setDataItemId(wfTextbookRecedeItem.getId());
                             setWarehouseMode(WarehouseModeEnum.WmRecede.getCode());
                             setWarehouseNumber(ObjectUtil.isNull(wfTextbookRecedeItem.getNumber())?0:wfTextbookRecedeItem.getNumber());
+                            QueryWrapper<TextbookWarehouseRecord> queryWrapperSortcode = new QueryWrapper<>();
+                            queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+                            TextbookWarehouseRecord t = textbookWarehouseRecordMapper.selectOne(queryWrapperSortcode);
+                            setSortCode(t.getSortCode()+1);
                         }});
                     }
 
@@ -149,6 +154,10 @@ public class WfTextbookRecedeServiceImpl extends MPJBaseServiceImpl<WfTextbookRe
                             setDataItemId(wfTextbookRecedeItem.getId());
                             setIssueMode(IssueModeEnum.ImRecede.getCode());
                             setIssueNumber(ObjectUtil.isNull(wfTextbookRecedeItem.getNumber())?0:wfTextbookRecedeItem.getNumber());
+                            QueryWrapper<TextbookIssueRecord> queryWrapperSortcode = new QueryWrapper<>();
+                            queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+                            TextbookIssueRecord t = textbookIssueRecordMapper.selectOne(queryWrapperSortcode);
+                            setSortCode(t.getSortCode()+1);
                         }});
                     }
                 }

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

@@ -14,6 +14,11 @@ import java.math.BigDecimal;
 @Data
 public class TextbookClaimVO {
 
+    /**
+     * 学生id
+     */
+    @ApiModelProperty("学生id")
+    private Long studentUserId;
     /**
      * 学生教材认领主键编号
      */