FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-02-24 17:55:28 +08:00
parent af11a626df c0a967e125
commit 7262b6974b
10 changed files with 221 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+12 -8
View File
@@ -107,11 +107,13 @@ public class BussStandExportUtil {
break;
case "标准实施日期":
String putTime="";
if (Date.class.equals(sarStandardsInfoEO.getPutTime())) {
putTime = sdf.format(sarStandardsInfoEO.getPutTime());
if(sarStandardsInfoEO.getPutTime() != null){
if (Date.class.equals(sarStandardsInfoEO.getPutTime())) {
putTime = sdf.format(sarStandardsInfoEO.getPutTime());
}else {
putTime=sarStandardsInfoEO.getPutTime();
}else {
putTime=sarStandardsInfoEO.getPutTime();
}
}
value = putTime;
break;
@@ -123,10 +125,12 @@ public class BussStandExportUtil {
break;
case "发布日期":
String issueTime="";
if (Date.class.equals(sarStandardsInfoEO.getIssueTime().getClass())){
issueTime = sdf.format(sarStandardsInfoEO.getIssueTime());
}else {
issueTime=sarStandardsInfoEO.getIssueTime();
if(sarStandardsInfoEO.getIssueTime() != null){
if (Date.class.equals(sarStandardsInfoEO.getIssueTime().getClass())){
issueTime = sdf.format(sarStandardsInfoEO.getIssueTime());
}else {
issueTime=sarStandardsInfoEO.getIssueTime();
}
}
value = issueTime;
break;