From a98158e9b4eba1a2ff86e597df5676fb2eea0465 Mon Sep 17 00:00:00 2001 From: lihongyu <504404568@qq.com> Date: Wed, 23 Nov 2022 20:43:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=86=8C=E5=8E=BB=E6=8E=89=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=BA=8F=E5=8F=B7=EF=BC=8C=E5=B9=B6=E6=8C=89?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/coe/pal/output/pr/report1/Report1Gener.java | 6 +++--- .../apps/coe/pal/output/bd/report1/Report1Gener.java | 6 +++--- .../apps/coe/pal/output/zd/report1/Report1Gener.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 5bcccdcf..76e0c97d 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -293,7 +293,7 @@ public class Report1Gener { // 流程附件列表 UpFileDao upFileDao = new UpFileDao(); StringBuffer sqlWhere = new StringBuffer(); - sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'"); + sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'").append(" ORDER BY CREATETIME ASC"); List search = upFileDao.search(sqlWhere.toString()); File file = null; //三员管理下，用户密级与文件密级过滤显示 @@ -333,7 +333,7 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("file_name", fileIndex + "." + upfileModel.getFileName()); + object.put("file_name", upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); object.put("link", link); fileTable.add(object); @@ -392,7 +392,7 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("file_name", fileIndex+"."+upfileModel.getFileName()); + object.put("file_name", upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); object.put("link", link); fileTable.add(object); diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index 100123b0..d5bf8313 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -224,7 +224,7 @@ public class Report1Gener { // 流程附件列表 UpFileDao upFileDao = new UpFileDao(); StringBuffer sqlWhere = new StringBuffer(); - sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'"); + sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'").append(" ORDER BY CREATETIME ASC"); List search = upFileDao.search(sqlWhere.toString()); File file = null; //三员管理下，用户密级与文件密级过滤显示 @@ -264,7 +264,7 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("file_name", fileIndex + "." + upfileModel.getFileName()); + object.put("file_name", upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); object.put("link", link); fileTable.add(object); @@ -320,7 +320,7 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("file_name", fileIndex+"."+upfileModel.getFileName()); + object.put("file_name", upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); object.put("link", link); fileTable.add(object); diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 9060b01d..0efddfe0 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -455,7 +455,7 @@ public class Report1Gener { String shpId = ""; UpFileDao upFileDao = new UpFileDao(); StringBuffer sqlWhere = new StringBuffer(); - sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'"); + sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'").append(" ORDER BY CREATETIME ASC"); List search = upFileDao.search(sqlWhere.toString()); File file = null; //三员管理下，用户密级与文件密级过滤显示 @@ -495,7 +495,7 @@ public class Report1Gener { e.printStackTrace(); } JSONObject object = new JSONObject(); - object.put("file_name", fileIndex + "." + upfileModel.getFileName()); + object.put("file_name", upfileModel.getFileName()); String link = fileName + File.separator + upfileModel.getFileName(); object.put("link", link); fileTable.add(object);