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 f1ffc6d0..382a62b8 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar and b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar differ 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(); }