Commit 5507448bbd2e2c11e026205cb7ed50a4b6639b50
1 parent
f6f5ed35
Exists in
master
项目库问题修复：导出问题
Showing
4 changed files
with
29 additions
and
7 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
| ... | ... | @@ -117,6 +117,12 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL |
| 117 | 117 | if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getUpdateTime())) { |
| 118 | 118 | queryWrapper.like("F_update_time", wProjectLibraryInventory.getUpdateTime()); |
| 119 | 119 | } |
| 120 | + if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getIdList())) { | |
| 121 | + queryWrapper.in("ID_",wProjectLibraryInventory.getIdList()); | |
| 122 | + } | |
| 123 | + queryWrapper.orderByDesc("F_create_time","F_update_time"); | |
| 124 | + | |
| 125 | + | |
| 120 | 126 | ArrayList<String> orgIds = script.getDataPermission("loginUserAllSubOrgs"); |
| 121 | 127 | if (ObjectUtils.isNotEmpty(orgIds)) { |
| 122 | 128 | queryWrapper.in("F_org_id", orgIds); |
| ... | ... | @@ -163,7 +169,12 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL |
| 163 | 169 | TemplateExportParams params = new TemplateExportParams("doc/project_down.xlsx"); |
| 164 | 170 | params.setColForEach(true); |
| 165 | 171 | Workbook workbook = ExcelExportUtil.exportExcel(params, map); |
| 166 | - String filedisplay = "项目库填写" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; | |
| 172 | + String filedisplay = ""; | |
| 173 | + if ("1".equals(wProjectLibraryInventory.getExportType())) { | |
| 174 | + filedisplay = "项目库填报" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; | |
| 175 | + } else { | |
| 176 | + filedisplay = "项目库" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; | |
| 177 | + } | |
| 167 | 178 | response.setContentType("APPLICATION/OCTET-STREAM"); |
| 168 | 179 | response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); |
| 169 | 180 | response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filedisplay, "utf-8")); | ... | ... |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java
| ... | ... | @@ -66,8 +66,8 @@ public class WProjectOperationRecordManagerImpl extends BaseManagerImpl<WProject |
| 66 | 66 | wProjectOperationRecord.setFCreateBy(currentUser.getFullname()); |
| 67 | 67 | wProjectOperationRecord.setFCreateById(currentUser.getUserId()); |
| 68 | 68 | wProjectOperationRecord.setFCreateTime(LocalDateTime.now()); |
| 69 | - | |
| 70 | 69 | wProjectOperationRecord.setFEventType(eventTypeEnum.getInfo()); |
| 70 | + | |
| 71 | 71 | if (EventTypeEnum.tibao.getCode().equals(eventTypeEnum.getCode())) { |
| 72 | 72 | wProjectOperationRecord.setFProgressStatus(null); |
| 73 | 73 | } else if (EventTypeEnum.zuofei.getCode().equals(eventTypeEnum.getCode())) { | ... | ... |
backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
| ... | ... | @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; |
| 10 | 10 | |
| 11 | 11 | import java.io.Serializable; |
| 12 | 12 | import java.time.LocalDateTime; |
| 13 | +import java.util.ArrayList; | |
| 13 | 14 | |
| 14 | 15 | /** |
| 15 | 16 | * 项目库清单 |
| ... | ... | @@ -244,11 +245,21 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory |
| 244 | 245 | } |
| 245 | 246 | |
| 246 | 247 | @TableField(exist = false) |
| 247 | - private String createTime; | |
| 248 | + private String createTime;//查询条件：创建时间 | |
| 248 | 249 | @TableField(exist = false) |
| 249 | - private String updateTime; | |
| 250 | + private String updateTime;//查询条件：操作时间 | |
| 250 | 251 | @TableField(exist = false) |
| 251 | - private String exportType;// 1=项目填报，2=项目库 | |
| 252 | + private String exportType;// 导出类型：1=项目填报导出，2=项目库导出 | |
| 253 | + @TableField(exist = false) | |
| 254 | + private ArrayList<String> idList;//导出的数据id集合 | |
| 255 | + | |
| 256 | + public ArrayList<String> getIdList() { | |
| 257 | + return idList; | |
| 258 | + } | |
| 259 | + | |
| 260 | + public void setIdList(ArrayList<String> idList) { | |
| 261 | + this.idList = idList; | |
| 262 | + } | |
| 252 | 263 | |
| 253 | 264 | public String getExportType() { |
| 254 | 265 | return exportType; | ... | ... |
backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/EventTypeEnum.java