From e33fa5e05e72ef4c819ac5a6552cf6bba1a4736b Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 3 Sep 2024 17:27:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=BA=A6=E6=89=8B=E5=86=8C=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=97=A5=E6=9C=9F=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...om.awspaas.user.apps.coe.pal.output.zd.jar | Bin 78377 -> 78351 bytes .../pal/output/zd/report1/Report1Gener.java | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index f1ffc6d0ceea7fb7e856c4cfad74fca790163c49..382a62b8ad2e1e1836ee3bdecbe21f5bc257a11a 100644 GIT binary patch delta 10510 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ⅆtm{f8m2eWHA@((-8soI+?ENY^L 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 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 9a800ef0..349288cb 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 @@ -41,6 +41,7 @@ public class Report1Gener { public static boolean isRunning = false; public static final Object _lock = new Object(); private UserContext userContext = null; + private DCContext sourceContext = null; GenerLogExd log = new GenerLogExd(); //word换行符 private final String WRAPSTRING = ""; @@ -64,6 +65,7 @@ public class Report1Gener { // isRunning = true; // userContext = UserContext.fromUID(model.getUserId()); userContext = DispatcherRequest.getUserContext(); + sourceContext = dcContext; String teamId = model.getTeamId(); String wsId = model.getWsId(); log.info("execute ready..."); @@ -275,7 +277,7 @@ public class Report1Gener { if (UtilString.isNotEmpty(val)) { try { Timestamp timestamp = UtilDate.parseTsFromDateTime(val); - val = UtilDate.yearFormat(timestamp) + "年" + Integer.parseInt(UtilDate.monthFormat(timestamp)) + "月" + UtilDate.dayFormat(timestamp) + "日"; + val = UtilDate.yearFormat(timestamp) + "年" + UtilDate.monthFormat(timestamp) + "月" + UtilDate.dayFormat(timestamp) + "日"; } catch (Exception e) { //e.printStackTrace(); }