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

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

@@ -95,8 +95,27 @@ public class TextbookIssueRecordController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookIssueRecordExportDto dto) {
-        List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getPage(new Page<>(dto.getLimit(), dto.getSize()),dto).getRecords();
+    public ResponseEntity<byte[]> exportData() {
+        List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getList();
+        List<TextbookIssueRecordExcelVo> dataList = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+        for (TextbookIssueRecordPageVo textbookIssueRecordPageVo : customerList) {
+            if(textbookIssueRecordPageVo.getCreateDate() == null){
+                continue;
+            }
+            textbookIssueRecordPageVo.setCreateDateStr(sdf.format(textbookIssueRecordPageVo.getCreateDate()));
+            dataList.add(BeanUtil.toBean(textbookIssueRecordPageVo, TextbookIssueRecordExcelVo.class));
+        }
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookIssueRecordExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookIssueRecord" + ExcelTypeEnum.XLSX.getValue());
+    }
+
+    @PostMapping("/export-query")
+    @ApiOperation(value = "指定导出")
+    public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody TextbookIssueRecordExportDto dto) {
+        List<TextbookIssueRecordPageVo> customerList = textbookIssueRecordService.getList(dto);
         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

@@ -92,8 +92,19 @@ public class TextbookWarehouseRecordController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordExportDto dto) {
-        List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto).getRecords();
+    public ResponseEntity<byte[]> exportData() {
+        List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getList();
+        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);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
+    }
+
+    @PostMapping("/export-query")
+    @ApiOperation(value = "指定导出")
+    public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody TextbookWarehouseRecordExportDto dto) {
+        List<TextbookWarehouseRecordPageVo> customerList = textbookClassWarehouseService.getList(dto);
         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/dto/TextbookIssueRecordExportDto.java

@@ -17,7 +17,7 @@ import java.util.List;
 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class TextbookIssueRecordExportDto extends TextbookIssueRecordPageDto{
+public class TextbookIssueRecordExportDto{
     /**
      * 主键编号
      */

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

@@ -17,7 +17,7 @@ import java.util.List;
 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class TextbookWarehouseRecordExportDto extends TextbookWarehouseRecordPageDto{
+public class TextbookWarehouseRecordExportDto{
     /**
      * 主键编号
      */

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

@@ -2,10 +2,14 @@ package com.xjrsoft.module.textbook.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+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.TextbookIssueRecordPageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @title: 教材出库记录
@@ -16,4 +20,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TextbookIssueRecordMapper extends MPJBaseMapper<TextbookIssueRecord> {
     Page<TextbookIssueRecordPageVo> getPage(Page<TextbookIssueRecordPageDto> page, TextbookIssueRecordPageDto dto);
+
+    List<TextbookIssueRecordPageVo> getList(@Param("dto") TextbookIssueRecordExportDto dto);
 }

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

@@ -2,10 +2,14 @@ package com.xjrsoft.module.textbook.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
+import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordExportDto;
 import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @title: 教材入库
@@ -16,4 +20,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TextbookWarehouseRecordMapper extends MPJBaseMapper<TextbookWarehouseRecord> {
     Page<TextbookWarehouseRecordPageVo> getPage(Page<TextbookWarehouseRecordPageDto> page, TextbookWarehouseRecordPageDto dto);
+
+    List<TextbookWarehouseRecordPageVo> getList(@Param("dto") TextbookWarehouseRecordExportDto dto);
 }

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

@@ -2,10 +2,13 @@ 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.TextbookIssueRecordExportDto;
 import com.xjrsoft.module.textbook.dto.TextbookIssueRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookIssueRecord;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo;
 
+import java.util.List;
+
 /**
 * @title: 教材出库记录
 * @Author szs
@@ -16,4 +19,8 @@ import com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo;
 public interface ITextbookIssueRecordService extends MPJBaseService<TextbookIssueRecord> {
 
     Page<TextbookIssueRecordPageVo> getPage(Page<TextbookIssueRecordPageDto> page, TextbookIssueRecordPageDto dto);
+
+    List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto);
+
+    List<TextbookIssueRecordPageVo> getList();
 }

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

@@ -2,9 +2,12 @@ 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.TextbookWarehouseRecordExportDto;
+import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
-import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
+
+import java.util.List;
 
 /**
 * @title: 教材入库
@@ -16,4 +19,8 @@ import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
 public interface ITextbookWarehouseRecordService extends MPJBaseService<TextbookWarehouseRecord> {
 
     Page<TextbookWarehouseRecordPageVo> getPage(Page<TextbookWarehouseRecordPageDto> page, TextbookWarehouseRecordPageDto dto);
+
+    List<TextbookWarehouseRecordPageVo> getList(TextbookWarehouseRecordExportDto dto);
+
+    List<TextbookWarehouseRecordPageVo> getList();
 }

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

@@ -2,6 +2,7 @@ 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.TextbookIssueRecordExportDto;
 import com.xjrsoft.module.textbook.dto.TextbookIssueRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookIssueRecord;
 import com.xjrsoft.module.textbook.mapper.TextbookIssueRecordMapper;
@@ -10,6 +11,8 @@ import com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @title: 教材出库记录
 * @Author szs
@@ -24,4 +27,14 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
     public Page<TextbookIssueRecordPageVo> getPage(Page<TextbookIssueRecordPageDto> page, TextbookIssueRecordPageDto dto) {
         return textbookIssueRecordMapper.getPage(page, dto);
     }
+
+    @Override
+    public List<TextbookIssueRecordPageVo> getList(TextbookIssueRecordExportDto dto) {
+        return textbookIssueRecordMapper.getList(dto);
+    }
+
+    @Override
+    public List<TextbookIssueRecordPageVo> getList() {
+        return getList(new TextbookIssueRecordExportDto());
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -550,12 +551,16 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                 setModifyDate(new Date());
             }
         });
-
+        //添加入库记录
         TextbookWarehouseRecord textbookWarehouseRecord = BeanUtil.toBean(dto, TextbookWarehouseRecord.class);
         textbookWarehouseRecord.setWarehouseMode(WarehouseModeEnum.WmManual.getCode());
         textbookWarehouseRecord.setDiscount(discount);
         textbookWarehouseRecord.setSubtotal(subtotal);
         textbookWarehouseRecord.setCreateDate(new Date());
+        QueryWrapper<TextbookWarehouseRecord> queryWrapperSortcode = new QueryWrapper<>();
+        queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+        TextbookWarehouseRecord t = textbookClassWarehouseService.getOne(queryWrapperSortcode);
+        textbookWarehouseRecord.setSortCode(t.getSortCode() + 1);
         textbookClassWarehouseService.save(textbookWarehouseRecord);
 
         return true;

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

@@ -2,14 +2,17 @@ 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.TextbookWarehouseRecordExportDto;
+import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
 import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import com.xjrsoft.module.textbook.mapper.TextbookWarehouseRecordMapper;
-import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
-import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
 import com.xjrsoft.module.textbook.service.ITextbookWarehouseRecordService;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @title: 教材入库
 * @Author szs
@@ -24,4 +27,14 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
     public Page<TextbookWarehouseRecordPageVo> getPage(Page<TextbookWarehouseRecordPageDto> page, TextbookWarehouseRecordPageDto dto) {
         return textbookWarehouseRecordMapper.getPage(page, dto);
     }
+
+    @Override
+    public List<TextbookWarehouseRecordPageVo> getList(TextbookWarehouseRecordExportDto dto) {
+        return textbookWarehouseRecordMapper.getList(dto);
+    }
+
+    @Override
+    public List<TextbookWarehouseRecordPageVo> getList() {
+        return getList(new TextbookWarehouseRecordExportDto());
+    }
 }

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

@@ -48,13 +48,31 @@
         <if test="dto.isTextbookPlan != null and dto.isTextbookPlan != ''">
             and t3.is_textbook_plan = #{dto.isTextbookPlan}
         </if>
+        order by t1.create_date desc
+    </select>
+
+    <select id="getList" parameterType="com.xjrsoft.module.textbook.dto.TextbookIssueRecordExportDto" resultType="com.xjrsoft.module.textbook.vo.TextbookIssueRecordPageVo">
+        SELECT t1.id,t1.sort_code,t3.issn,t3.book_name,t3.publishing_house,t3.editor_in_chief,t7.group_name,t5.name AS grade_name,
+        t6.name AS class_name,t8.name AS course_name,t10.name AS textbook_type_cn,t3.specifications_models,
+        t11.name AS issue_mode_cn,t1.create_date,t9.name AS claim_user,t1.issue_number FROM textbook_issue_record t1
+        LEFT JOIN wf_textbook_claim_item t2 ON t1.data_item_id = t2.id
+        LEFT JOIN textbook t3 ON t2.textbook_id = t3.id
+        LEFT JOIN wf_textbook_claim t4 ON t2.wf_textbook_claim_id = t4.id
+        LEFT JOIN base_grade t5 ON t3.grade_id = t5.id
+        LEFT JOIN base_class t6 ON t4.class_id = t6.id
+        LEFT JOIN subject_group t7 ON t3.subject_group_id = t7.id
+        LEFT JOIN base_course_subject t8 ON t3.course_subject_id = t8.id
+        LEFT JOIN xjr_user t9 ON t4.claim_user_id = t9.id
+        LEFT JOIN xjr_dictionary_detail t10 ON t3.textbook_type = t10.code AND t10.item_id = 1739209191193636865
+        LEFT JOIN xjr_dictionary_detail t11 ON t1.issue_mode = t11.code AND t11.item_id = 1739821685805215745
+        WHERE t1.delete_mark = 0
         <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>
+                                  separator=",">
+            #{id}
+        </foreach>
         </if>
-        ORDER BY t1.sort_code
+        order by t1.create_date desc
     </select>
 
 </mapper>

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

@@ -42,6 +42,17 @@
         <if test="dto.isTextbookPlan != null and dto.isTextbookPlan != ''">
             and t3.is_textbook_plan = #{dto.isTextbookPlan}
         </if>
+        ORDER BY t1.create_date desc
+    </select>
+    <select id="getList" parameterType="com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordExportDto" resultType="com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo">
+        SELECT t1.id, t1.sort_code, t3.issn,t3.book_name,t3.publishing_house,t3.editor_in_chief,t4.group_name,
+        t5.name AS course_name,t6.name AS textbook_type_cn,t3.specifications_models,t1.create_date,t2.name AS warehouse_user,t1.warehouse_number FROM textbook_warehouse_record t1
+        LEFT JOIN xjr_user t2 ON t1.create_user_id = t2.id
+        LEFT JOIN textbook t3 ON t1.textbook_id = t3.id
+        LEFT JOIN subject_group t4 ON t3.subject_group_id = t4.id
+        LEFT JOIN base_course_subject t5 ON t3.course_subject_id = t5.id
+        LEFT JOIN xjr_dictionary_detail t6 ON t3.textbook_type = t6.code AND t6.item_id = 1739209191193636865
+        WHERE t1.delete_mark = 0
         <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=",">
@@ -50,5 +61,4 @@
         </if>
         ORDER BY t1.create_date desc
     </select>
-
 </mapper>