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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, bug #51962

See merge request LiuChao/foton-slrs-system-rest!421
This commit is contained in:
super_liu
2022-03-23 14:53:54 +08:00
parent cee8fb564f 98a47392b6
commit fcc739de48
2 changed files with 27 additions and 14 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
+26 -13
View File
@@ -61,6 +61,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.sql.Clob;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -550,18 +551,30 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
map.put("standEnName",verifyObj(sarStandardsInfoEO.getStandEnName()));
map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature()));
map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus()));
// if (sarStandardsInfoEO.getIssueTime() != null) {
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
// map.put("issueTime",issueStr);
// }
map.put("issueTime", verifyObj(sarStandardsInfoEO.getIssueTime()));
map.put("putTime", verifyObj(sarStandardsInfoEO.getPutTime()));
// if (sarStandardsInfoEO.getPutTime() != null) {
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// String issueStr = format.format(sarStandardsInfoEO.getPutTime());
// map.put("putTime",issueStr);
// }
if (sarStandardsInfoEO.getIssueTime() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = "";
try {
issueStr = format2.format(format.parse(sarStandardsInfoEO.getIssueTime()));
}catch (Exception e){
}
map.put("issueTime",issueStr);
}else{
map.put("issueTime", "");
}
if (sarStandardsInfoEO.getPutTime() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = "";
try {
issueStr = format2.format(format.parse(sarStandardsInfoEO.getPutTime()));
}catch (Exception e){
}
map.put("putTime",issueStr);
}else {
map.put("putTime", "");
}
map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum());
map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum());
return map;
@@ -822,7 +835,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
convert.setFileSuffix(fileInfo.getFileSuffix());
convert.setStandFileClassify(field);
convert.setConvertType(SarTypeEnum.BUSINESS.getValue());
convertMq.sendMQ(convert);
// convertMq.sendMQ(convert);
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+1 -1
View File
@@ -239,7 +239,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
// case "country": return "适用区域";
// case "isRelateAccess": return "重要度";
case "issueTime": return "发布日期";
case "putTime": return "标准实施日期";
case "putTime": return "企标实施日期";
// case "standYear": return "标准年份";
// case "standNature": return "标准性质";
case "standEnName": return "英文名称";