项目库问题修复：导出问题

lst
1 parent f6f5ed35
Showing 4 changed files with 29 additions and 7 deletions Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java
backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/EventTypeEnum.java
@@ -117,6 +117,12 @@ public class WProjectLibraryInventoryController extends BaseController&lt;WProjectL
         if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getUpdateTime())) {
             queryWrapper.like("F_update_time", wProjectLibraryInventory.getUpdateTime());
         }
+        if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getIdList())) {
+            queryWrapper.in("ID_",wProjectLibraryInventory.getIdList());
+        }
+        queryWrapper.orderByDesc("F_create_time","F_update_time");
+
+
         ArrayList<String> orgIds = script.getDataPermission("loginUserAllSubOrgs");
         if (ObjectUtils.isNotEmpty(orgIds)) {
             queryWrapper.in("F_org_id", orgIds);
@@ -163,7 +169,12 @@ public class WProjectLibraryInventoryController extends BaseController&lt;WProjectL
         TemplateExportParams params = new TemplateExportParams("doc/project_down.xlsx");
         params.setColForEach(true);
         Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-        String filedisplay = "项目库填写" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
+        String filedisplay = "";
+        if ("1".equals(wProjectLibraryInventory.getExportType())) {
+            filedisplay = "项目库填报" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
+        } else {
+            filedisplay = "项目库" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
+        }
         response.setContentType("APPLICATION/OCTET-STREAM");
         response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filedisplay, "utf-8"));
@@ -66,8 +66,8 @@ public class WProjectOperationRecordManagerImpl extends BaseManagerImpl&lt;WProject
         wProjectOperationRecord.setFCreateBy(currentUser.getFullname());
         wProjectOperationRecord.setFCreateById(currentUser.getUserId());
         wProjectOperationRecord.setFCreateTime(LocalDateTime.now());
-
         wProjectOperationRecord.setFEventType(eventTypeEnum.getInfo());
+
         if (EventTypeEnum.tibao.getCode().equals(eventTypeEnum.getCode())) {
             wProjectOperationRecord.setFProgressStatus(null);
         } else if (EventTypeEnum.zuofei.getCode().equals(eventTypeEnum.getCode())) {
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 /**
  * 项目库清单
@@ -244,11 +245,21 @@ public class WProjectLibraryInventory extends BaseModel&lt;WProjectLibraryInventory
     }
     @TableField(exist = false)
-    private String createTime;
+    private String createTime;//查询条件：创建时间
     @TableField(exist = false)
-    private String updateTime;
+    private String updateTime;//查询条件：操作时间
     @TableField(exist = false)
-    private String exportType;// 1=项目填报，2=项目库
+    private String exportType;// 导出类型：1=项目填报导出，2=项目库导出
+    @TableField(exist = false)
+    private ArrayList<String> idList;//导出的数据id集合
+
+    public ArrayList<String> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(ArrayList<String> idList) {
+        this.idList = idList;
+    }
     public String getExportType() {
         return exportType;
@@ -11,9 +11,9 @@ import lombok.Getter;
 public enum EventTypeEnum {
     /**
-     * 提报
+     * 填报
      */
-    tibao("tibao", "提报"),
+    tibao("tibao", "填报"),
     /**
      * 作废
	@@ -11,9 +11,9 @@ import lombok.Getter;		@@ -11,9 +11,9 @@ import lombok.Getter;
11	public enum EventTypeEnum {	11	public enum EventTypeEnum {
12		12
13	/**	13	/**
14	- * 提报	14	+ * 填报
15	*/	15	*/
16	- tibao("tibao", "提报"),	16	+ tibao("tibao", "填报"),
17		17
18	/**	18	/**
19	* 作废	19	* 作废