whycrzg
2021-03-31 5e127bec7fdd0272fa90c97ea79d26b0d8d42581
src/main/java/com/whyc/service/ProjectArchiveManageService.java
@@ -33,8 +33,8 @@
            for (int i = 0; i < list.size(); i++) {
                HashMap<String, String> map = new HashMap<>();
                ProjectArchiveManage projectArchiveManage = list.get(i);
                map.put("文件名",projectArchiveManage.getProDocumentName());
                map.put("文件路径",projectArchiveManage.getProFilePath());
                map.put("fileName",projectArchiveManage.getProDocumentName());
                map.put("url",projectArchiveManage.getProFilePath());
                list1.add(map);
            }
            response.setMsg(1,"查询成功");
@@ -56,8 +56,8 @@
                String name = absoluteFile.getName();
                file.delete();
                HashMap<Object, Object> map = new HashMap<>();
                map.put("删除的文件名", name);
                map.put("删除的文件路径", pam.getProFilePath());
                map.put("delFileName", name);
                map.put("delUrl", pam.getProFilePath());
                response.setData(map);
            }
        } catch (Exception e) {
@@ -116,15 +116,15 @@
                for (int i = 0; i < lists.size(); i++) {
                    ProjectArchiveManage pam = lists.get(i);
                    HashMap<Object, Object> map = new HashMap<>();
                    map.put("文档名称",pam.getProDocumentName());
                    map.put("文档格式",pam.getProDocumentFormat());
                    map.put("fileName",pam.getProDocumentName());
                    map.put("documentFormat",pam.getProDocumentFormat());
                    Date proArchiveDate = pam.getProArchiveDate();
                    String format = "";
                    if (null != proArchiveDate) {
                        format = new SimpleDateFormat("yyyy-MM-dd").format(proArchiveDate);
                    }
                    map.put("归档日期", format);
                    map.put("下载地址",pam.getProFilePath());
                    map.put("archiveDate", format);
                    map.put("url",pam.getProFilePath());
                    last.add(map);
                }
            }
@@ -172,19 +172,19 @@
                for (int i = 0; i < lists.size(); i++) {
                    ProjectArchiveExperiment pae = lists.get(i);
                    HashMap<Object, Object> map = new HashMap<>();
                    map.put("试验名称", pae.getProName2());
                    map.put("testName", pae.getProName2());
                    Date proUploadDate = pae.getProUploadDate();
                    String format1 = null;
                    if (null != proUploadDate) {
                        format1 = new SimpleDateFormat("yyyy-MM-dd").format(proUploadDate);
                    }
                    map.put("上传日期", format1);
                    map.put("uploadDate", format1);
                    Date proArchiveDate = pae.getProArchiveDate();
                    String format = null;
                    if (null != proArchiveDate) {
                        format = new SimpleDateFormat("yyyy-MM-dd").format(proArchiveDate);
                    }
                    map.put("归档日期", format);
                    map.put("archiveDate", format);
//                map.put("下载地址",pam.getProFilePath());
                    last.add(map);
                }
@@ -213,21 +213,21 @@
                for (int i = 0; i < lists.size(); i++) {
                    ProjectArchiveManage pam = lists.get(i);
                    HashMap<Object, Object> map = new HashMap<>();
                    map.put("成果名称", pam.getAchievementName());
                    map.put("成果类型",pam.getAchievementType());
                    map.put("achievementName", pam.getAchievementName());
                    map.put("achievementType",pam.getAchievementType());
                    Date gainDate = pam.getGainDate();
                    String str1 = null;
                    if(null!=gainDate){
                        str1 = new SimpleDateFormat("yyyy-MM-dd").format(gainDate);
                    }
                    map.put("取得/发表日期",str1);
                    map.put("publishedDate",str1);
                    Date proArchiveDate = pam.getProArchiveDate();
                    String str2 = null;
                    if(null!=proArchiveDate){
                        str2 = new SimpleDateFormat("yyyy-MM-dd").format(proArchiveDate);
                    }
                    map.put("归档日期",str2);
                    map.put("archiveDate",str2);
                    last.add(map);
                }
            }