diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java index 5064cad..76753a2 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java @@ -117,6 +117,12 @@ public class WProjectLibraryInventoryController extends BaseController orgIds = script.getDataPermission("loginUserAllSubOrgs"); if (ObjectUtils.isNotEmpty(orgIds)) { queryWrapper.in("F_org_id", orgIds); @@ -163,7 +169,12 @@ public class WProjectLibraryInventoryController extends BaseController idList;//导出的数据id集合 + + public ArrayList getIdList() { + return idList; + } + + public void setIdList(ArrayList idList) { + this.idList = idList; + } public String getExportType() { return exportType; diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/EventTypeEnum.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/EventTypeEnum.java index 4abb57a..adf01f5 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/EventTypeEnum.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/EventTypeEnum.java @@ -11,9 +11,9 @@ import lombok.Getter; public enum EventTypeEnum { /** - * 提报 + * 填报 */ - tibao("tibao", "提报"), + tibao("tibao", "填报"), /** * 作废 -- libgit2 0.21.2