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

56874

Browse Source
This commit is contained in:
zhangjun
2022-08-23 16:37:14 +08:00
parent 1687202ef5
commit ca4ef75fda
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+10 -2
View File
@@ -738,12 +738,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature())); map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature()));
map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus())); map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus()));
if (sarStandardsInfoEO.getIssueTime() != null) { if (sarStandardsInfoEO.getIssueTime() != null) {
map.put("issueTime",sarStandardsInfoEO.getPutTime()); String issueTime = sarStandardsInfoEO.getIssueTime();
if (null != issueTime && issueTime.length() > 10){
issueTime = issueTime.substring(0,10);
}
map.put("issueTime",issueTime);
}else{ }else{
map.put("issueTime", ""); map.put("issueTime", "");
} }
if (sarStandardsInfoEO.getPutTime() != null) { if (sarStandardsInfoEO.getPutTime() != null) {
map.put("putTime",sarStandardsInfoEO.getPutTime()); String putTime = sarStandardsInfoEO.getPutTime();
if (null != putTime && putTime.length() > 10){
putTime = putTime.substring(0,10);
}
map.put("putTime",putTime);
}else { }else {
map.put("putTime", ""); map.put("putTime", "");
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+4 -1
View File
@@ -193,7 +193,10 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
} }
return value; return value;
default: default:
value = sysInfoEOService.getDicNamesByCodes(value,""); String name = sysInfoEOService.getDicNamesByCodes(value,"");
if (StringUtils.isNotEmpty(name)){
value = name;
}
return value; return value;
} }
} }