diff --git a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionExcelOut.java b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionExcelOut.java
deleted file mode 100644
index dedf6dbca9b890e782c43b81f782a46dada09426..0000000000000000000000000000000000000000
--- a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionExcelOut.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.seasky.educationinstitutionallibrary.web.dto.result.institution;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.HeadFontStyle;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author kejinlong
- * @since 2022/8/9
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class InstitutionExcelOut implements Serializable {
-
- @HeadFontStyle(fontHeightInPoints = 11)
- @ApiModelProperty(value = "鏂囨。缂栧彿")
- @ExcelProperty("鏂囨。缂栧彿")
- @ColumnWidth(15)
- private String documentCode;
-
- @ApiModelProperty(value = "鏍囬")
- @ExcelProperty("鍒跺害鍚嶇О")
- @ColumnWidth(90)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String title;
-
- @ApiModelProperty(value = "鍒嗙被id")
- @ExcelIgnore
- private Long classifyId;
-
- @ApiModelProperty(value = "鍒嗙被鍚嶇О")
- @ExcelProperty("鍒跺害鍒嗙被")
- @ColumnWidth(20)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String classifyName;
-
- @ApiModelProperty(value = "鏂囧彿")
- @ExcelProperty("鏂囧彿")
- @ColumnWidth(20)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String documentNo;
-
- @DateTimeFormat("yyyy骞碝M鏈坉d鏃�")
- @ApiModelProperty(value = "棰佸竷鏃ユ湡")
- @ExcelProperty("棰佸竷鏃ユ湡")
- @ColumnWidth(20)
- @HeadFontStyle(fontHeightInPoints = 11)
- private Date publishDate;
-
- @DateTimeFormat("yyyy骞碝M鏈坉d鏃�")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- @ExcelProperty("涓婁紶鏃ユ湡")
- @ColumnWidth(20)
- @HeadFontStyle(fontHeightInPoints = 11)
- private Date createDate;
-
- @ApiModelProperty(value = "鍙戞枃鍗曚綅")
- @ExcelProperty("鍙戞枃鍗曚綅")
- @ColumnWidth(20)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String unit;
-
- @ApiModelProperty(value = "鍙戝竷鐘舵€�")
- @ExcelIgnore
- private Integer publishStatus;
-
- @ApiModelProperty(value = "鍙戝竷鐘舵€�")
- @ExcelProperty("鏂囦欢鐘舵€�")
- @ColumnWidth(15)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String publishStatusText;
-
- @ApiModelProperty(value = "瀹℃牳鐘舵€�")
- @ExcelIgnore
- private Integer auditStatus;
-
- @ApiModelProperty(value = "瀹℃牳鐘舵€�")
- @ExcelProperty("瀹℃牳鐘舵€�")
- @ColumnWidth(15)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String auditStatusText;
-
- @ApiModelProperty(value = "鐗堟湰鍙�")
- @ExcelIgnore
- private Integer version;
-
- @ApiModelProperty(value = "鐗堟湰鍙�")
- @ExcelProperty("鐗堟湰鍙�")
- @ColumnWidth(10)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String versionText;
-
- @ApiModelProperty(value = "澶囨敞")
- @ExcelProperty("澶囨敞")
- @ColumnWidth(50)
- @HeadFontStyle(fontHeightInPoints = 11)
- private String remark;
-
-}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionOut.java b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionOut.java
index 8bcdf206ee44a7d48c23d6d8c9b768c0221042fc..3c789d4eb7fed5e8a18b95d77648c0ce17c3f00c 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/educationinstitutionallibrary/web/dto/result/institution/InstitutionOut.java
@@ -1,5 +1,10 @@
package com.seasky.educationinstitutionallibrary.web.dto.result.institution;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.seasky.educationinstitutionallibrary.enums.AuditStatusEnum;
@@ -27,93 +32,147 @@ import java.util.Date;
public class InstitutionOut implements Serializable {
@ApiModelProperty(value = "鍒跺害id")
+ @ExcelIgnore
private Long id;
+ @HeadFontStyle(fontHeightInPoints = 11)
@ApiModelProperty(value = "鏂囨。缂栧彿")
+ @ExcelProperty(value = "鏂囨。缂栧彿",index = 0)
+ @ColumnWidth(15)
private String documentCode;
@ApiModelProperty(value = "鏂囧彿")
+ @ExcelProperty(value = "鏂囧彿",index = 3)
+ @ColumnWidth(20)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String documentNo;
@ApiModelProperty(value = "鏍囬")
+ @ExcelProperty(value = "鍒跺害鍚嶇О",index = 1)
+ @ColumnWidth(90)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String title;
@ApiModelProperty(value = "姝ｆ枃")
+ @ExcelIgnore
private String content;
@ApiModelProperty(value = "鍙戞枃鍗曚綅")
+ @ExcelProperty(value = "鍙戞枃鍗曚綅",index = 6)
+ @ColumnWidth(20)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String unit;
@ApiModelProperty(value = "鍒嗙被id")
+ @ExcelIgnore
private Long classifyId;
@ApiModelProperty(value = "鍒嗙被鍚嶇О")
+ @ExcelProperty(value = "鍒跺害鍒嗙被",index = 2)
+ @ColumnWidth(20)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String classifyName;
+ @DateTimeFormat("yyyy骞碝M鏈坉d鏃�")
@ApiModelProperty(value = "棰佸竷鏃ユ湡")
+ @ExcelProperty(value = "棰佸竷鏃ユ湡",index = 4)
+ @ColumnWidth(20)
+ @HeadFontStyle(fontHeightInPoints = 11)
private Date publishDate;
+ @DateTimeFormat("yyyy骞碝M鏈坉d鏃�")
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ @ExcelProperty(value = "涓婁紶鏃ユ湡",index = 5)
+ @ColumnWidth(20)
+ @HeadFontStyle(fontHeightInPoints = 11)
private Date createDate;
@ApiModelProperty(value = "鎵€灞炲簱")
+ @ExcelIgnore
private Integer belongLibrary;
@ApiModelProperty(value = "鎵€灞炲簱")
+ @ExcelIgnore
private String belongLibraryText;
@ApiModelProperty(value = "涓婁紶浜哄鍚�")
+ @ExcelIgnore
private String creatorName;
@ApiModelProperty(value = "鏄惁瀹℃牳")
+ @ExcelIgnore
private Boolean isAudit;
@ApiModelProperty(value = "瀹℃牳鐘舵€�")
+ @ExcelIgnore
private Integer auditStatus;
@ApiModelProperty(value = "瀹℃牳鐘舵€�")
+ @ExcelProperty(value = "瀹℃牳鐘舵€�",index = 8)
+ @ColumnWidth(15)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String auditStatusText;
@ApiModelProperty(value = "鍙戝竷鐘舵€�")
+ @ExcelIgnore
private Integer publishStatus;
@ApiModelProperty(value = "鍙戝竷鐘舵€�")
+ @ExcelProperty(value = "鏂囦欢鐘舵€�",index = 7)
+ @ColumnWidth(15)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String publishStatusText;
@ApiModelProperty(value = "鐗堟湰鍙�")
+ @ExcelIgnore
private Integer version;
@ApiModelProperty(value = "澶囨敞")
+ @ExcelProperty(value = "澶囨敞",index = 10)
+ @ColumnWidth(50)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String remark;
@ApiModelProperty(value = "鐗堟湰鍙�")
+ @ExcelProperty(value = "鐗堟湰鍙�",index = 9)
+ @ColumnWidth(10)
+ @HeadFontStyle(fontHeightInPoints = 11)
private String versionText;
@ApiModelProperty(value = "鏉ユ簮")
+ @ExcelIgnore
private Integer libraryType;
@ApiModelProperty(value = "鏉ユ簮")
+ @ExcelIgnore
private String libraryTypeText;
@ApiModelProperty(value = "缂栬緫鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowEditBtn = false;
@ApiModelProperty(value = "鎻愪氦瀹℃壒鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowSubmitBtn = false;
@ApiModelProperty(value = "鍙戝竷鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowPublishBtn = false;
@ApiModelProperty(value = "浣滃簾鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowCancelBtn = false;
@ApiModelProperty(value = "鎭㈠鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowRecoverBtn = false;
@ApiModelProperty(value = "鍒犻櫎鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowDeleteBtn = false;
@ApiModelProperty(value = "鍙栨秷鍙戝竷鎸夐挳鏄鹃殣 true:鏄剧ず false:闅愯棌")
+ @ExcelIgnore
private Boolean isShowCancelPublishBtn = false;
public String getPublishStatusText() {
diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java
index 2468c56d5e9af9854492fd963943eed51be55477..30a07613a8570df4db6887e176a4453df4829603 100644
--- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/InstitutionServiceImpl.java
@@ -793,36 +793,14 @@ public class InstitutionServiceImpl extends AbstractService<InstitutionPo, Insti
@Override
public void exportInstitutionExcel(HttpServletRequest request, HttpServletResponse response, InstitutionQuery institutionQuery) {
- QueryWrapper<InstitutionPo> queryWrapper = new QueryWrapper<>();
- queryWrapper.like(ObjectUtils.isNotEmpty(institutionQuery.getTitle()), "title", institutionQuery.getTitle())
- .like(ObjectUtils.isNotEmpty(institutionQuery.getDocumentNo()), "document_no", institutionQuery.getDocumentNo())
- .eq(ObjectUtils.isNotEmpty(institutionQuery.getClassifyId()), "classify_id", institutionQuery.getClassifyId())
- .like(ObjectUtils.isNotEmpty(institutionQuery.getUnit()), "unit", institutionQuery.getUnit())
- .ge(ObjectUtils.isNotEmpty(institutionQuery.getBeginPublishDate()), "publish_date", institutionQuery.getBeginPublishDate())
- .le(ObjectUtils.isNotEmpty(institutionQuery.getEndPublishDate()), "publish_date", institutionQuery.getEndPublishDate())
- .eq(ObjectUtils.isNotEmpty(institutionQuery.getAuditStatus()), "audit_status", institutionQuery.getAuditStatus())
- .eq(ObjectUtils.isNotEmpty(institutionQuery.getPublishStatus()), "publish_status", institutionQuery.getPublishStatus())
- .eq(ObjectUtils.isNotEmpty(institutionQuery.getCreator()), "creator", institutionQuery.getCreator())
- .select(InstitutionPo.class, i -> !i.getProperty().equals("content"))
- .orderByDesc("create_date");
- List<InstitutionPo> institutionList = institutionMapper.selectList(queryWrapper);
- if(institutionList==null || institutionList.size()==0) {
+ institutionQuery.setPageSize(10000);
+ institutionQuery.setPageIndex(0);
+ Pagination<InstitutionOut> institutionPage = getInstitutionPage(institutionQuery);
+ List<InstitutionOut> institutionList = institutionPage.getRecords();
+
+ if(ObjectUtils.isEmpty(institutionList)) {
ExceptionUtil.getException(null,"鏃犳暟鎹彲瀵煎嚭!");
}
- List<InstitutionExcelOut> institutionExcelOutList = InstitutionConvert.listPoToExcelOut(institutionList);
- for (InstitutionExcelOut institutionExcelOut : institutionExcelOutList) {
- //璁剧疆鍒嗙被鍚嶇О
- ClassifyPo classifyPo = classifyMapper.selectById(institutionExcelOut.getClassifyId());
- if (ObjectUtils.isNotEmpty(classifyPo)) {
- institutionExcelOut.setClassifyName(classifyPo.getName());
- }
- //璁剧疆鐗堟湰鍙�
- institutionExcelOut.setVersionText("v".concat(institutionExcelOut.getVersion().toString()).concat(".0"));
- //璁剧疆鏂囦欢鐘舵€�
- institutionExcelOut.setPublishStatusText(PublishStatusEnum.getValueByIndex(institutionExcelOut.getPublishStatus()).getName());
- //璁剧疆瀹℃牳鐘舵€�
- institutionExcelOut.setAuditStatusText(AuditStatusEnum.getValueByIndex(institutionExcelOut.getAuditStatus()).getName());
- }
response.reset();
response.setCharacterEncoding("utf-8");
@@ -830,9 +808,9 @@ public class InstitutionServiceImpl extends AbstractService<InstitutionPo, Insti
try {
String fileName = URLEncoder.encode("鍒跺害娓呭崟", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), InstitutionExcelOut.class)
+ EasyExcel.write(response.getOutputStream(), InstitutionOut.class)
.registerWriteHandler(getHorizontalCellStyleStrategy())
- .sheet("鍒跺害娓呭崟").doWrite(institutionExcelOutList);
+ .sheet("鍒跺害娓呭崟").doWrite(institutionList);
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java
index 85ce951810b8af606476a4f26025f48c14c807ef..655726d70347834f8a2079294c68fd86f571c335 100644
--- a/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/educationinstitutionallibrary/business/service/convert/InstitutionConvert.java
@@ -67,14 +67,6 @@ public class InstitutionConvert {
return institutionOutList;
}
- public static List<InstitutionExcelOut> listPoToExcelOut(List<InstitutionPo> institutionPoList) {
- //杞崲瀵瑰簲閿€糾ap
- Map<String, String> map = new HashMap<>(3);
- List<InstitutionExcelOut> institutionExcelOutList = MapperUtils.INSTANCE.mapAsList(InstitutionExcelOut.class, institutionPoList);
- return institutionExcelOutList;
- }
-
-
public static List<InstitutionSimpleOut> listPoToSimpleOut1(List<InstitutionPo> institutionPoList) {
ArrayList<InstitutionSimpleOut> institutionSimpleOutList = new ArrayList<>();
for (InstitutionPo institutionPo : institutionPoList) {