Merge remote-tracking branch 'origin/dev' into dev

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

@@ -10,7 +10,6 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseCourseSubject;
-import com.xjrsoft.module.textbook.vo.SubjectGroupVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.textbook.dto.AddCourseToSubjectGroupDto;
 import com.xjrsoft.module.textbook.dto.AddSubjectGroupDto;
@@ -22,6 +21,7 @@ import com.xjrsoft.module.textbook.service.ISubjectGroupCourseService;
 import com.xjrsoft.module.textbook.service.ISubjectGroupService;
 import com.xjrsoft.module.textbook.vo.SubjectGroupCoursePageVo;
 import com.xjrsoft.module.textbook.vo.SubjectGroupPageVo;
+import com.xjrsoft.module.textbook.vo.SubjectGroupVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

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

@@ -10,7 +10,6 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseCourseSubject;
-import com.xjrsoft.module.textbook.vo.SubjectGroupCourseVo;
 import com.xjrsoft.module.textbook.dto.AddSubjectGroupCourseDto;
 import com.xjrsoft.module.textbook.dto.SubjectGroupCoursePageDto;
 import com.xjrsoft.module.textbook.dto.UpdateSubjectGroupCourseDto;
@@ -18,6 +17,7 @@ import com.xjrsoft.module.textbook.entity.SubjectGroup;
 import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
 import com.xjrsoft.module.textbook.service.ISubjectGroupCourseService;
 import com.xjrsoft.module.textbook.vo.SubjectGroupCoursePageVo;
+import com.xjrsoft.module.textbook.vo.SubjectGroupCourseVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

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

@@ -14,24 +14,12 @@ import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.dto.UpdateTextbookDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
 import com.xjrsoft.module.textbook.service.ITextbookService;
-import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
-import com.xjrsoft.module.textbook.vo.TextbookPageVo;
-import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
-import com.xjrsoft.module.textbook.vo.TextbookVo;
-import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordListVo;
-import com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo;
+import com.xjrsoft.module.textbook.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;

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

@@ -9,6 +9,7 @@ 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.entity.TextbookIssueRecord;
@@ -94,8 +95,8 @@ public class TextbookIssueRecordController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookIssueRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
-        List<TextbookIssueRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookIssueRecordPageVo>) page(dto).getData()).getList();
+    public ResponseEntity<byte[]> exportData(@Valid TextbookIssueRecordExportDto dto) {
+        List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getPage(new Page<>(dto.getLimit(), dto.getSize()),dto).getRecords();
         List<TextbookIssueRecordExcelVo> dataList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         for (TextbookIssueRecordPageVo textbookIssueRecordPageVo : customerList) {

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

@@ -8,31 +8,23 @@ 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.entity.TextbookWarehouseRecord;
-import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordExcelVo;
-import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
 import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
+import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordExportDto;
 import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
 import com.xjrsoft.module.textbook.dto.UpdateTextbookWarehouseRecordDto;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import com.xjrsoft.module.textbook.service.ITextbookWarehouseRecordService;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordExcelVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -100,8 +92,8 @@ public class TextbookWarehouseRecordController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
-        List<TextbookWarehouseRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookWarehouseRecordPageVo>) page(dto).getData()).getList();
+    public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordExportDto dto) {
+        List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto).getRecords();
         List<TextbookWarehouseRecordExcelVo> dataList = BeanUtil.copyToList(customerList, TextbookWarehouseRecordExcelVo.class);
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
         EasyExcel.write(bot, TextbookWarehouseRecordExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);

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

@@ -9,13 +9,13 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.QrCodeUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
-import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
 import com.xjrsoft.module.textbook.dto.AddWfTextbookClaimDto;
 import com.xjrsoft.module.textbook.dto.ConfirmDistributeDto;
 import com.xjrsoft.module.textbook.dto.UpdateWfTextbookClaimDto;
 import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
 import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
 import com.xjrsoft.module.textbook.service.IWfTextbookClaimService;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
 import com.xjrsoft.module.textbook.vo.WfTextbookClaimVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -10,11 +10,11 @@ import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.textbook.service.IWfTextbookRecedeService;
 import com.xjrsoft.module.textbook.dto.AddWfTextbookRecedeDto;
 import com.xjrsoft.module.textbook.dto.UpdateWfTextbookRecedeDto;
 import com.xjrsoft.module.textbook.dto.WfTextbookRecedePageDto;
 import com.xjrsoft.module.textbook.entity.WfTextbookRecede;
+import com.xjrsoft.module.textbook.service.IWfTextbookRecedeService;
 import com.xjrsoft.module.textbook.vo.WfTextbookRecedePageVo;
 import com.xjrsoft.module.textbook.vo.WfTextbookRecedeVo;
 import io.swagger.annotations.Api;

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

@@ -0,0 +1,28 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+/**
+* @title: 教材出库记录导出入参
+* @Author szs
+* @Date: 2023-12-27
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TextbookIssueRecordExportDto extends TextbookIssueRecordPageDto{
+    /**
+     * 主键编号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private List<Long> ids;
+}

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

@@ -0,0 +1,28 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+/**
+* @title: 教材入库导出入参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TextbookWarehouseRecordExportDto extends TextbookWarehouseRecordPageDto{
+    /**
+     * 主键编号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private List<Long> ids;
+}

src/main/resources/mapper/textbook/TextbookIssueRecordMapper.xml

@@ -48,6 +48,12 @@
         <if test="dto.isTextbookPlan != null and dto.isTextbookPlan != ''">
             and t3.is_textbook_plan = #{dto.isTextbookPlan}
         </if>
+        <if test="dto.ids != null and dto.ids.size() > 0">
+            and t1.id in <foreach item="id" index="index" collection="dto.ids" open="(" close=")"
+                     separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY t1.sort_code
     </select>
 

src/main/resources/mapper/textbook/TextbookWarehouseRecordMapper.xml

@@ -42,6 +42,12 @@
         <if test="dto.isTextbookPlan != null and dto.isTextbookPlan != ''">
             and t3.is_textbook_plan = #{dto.isTextbookPlan}
         </if>
+        <if test="dto.ids != null and dto.ids.size() > 0">
+            and t1.id in <foreach item="id" index="index" collection="dto.ids" open="(" close=")"
+                                  separator=",">
+            #{id}
+        </foreach>
+        </if>
         ORDER BY t1.create_date desc
     </select>