WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA待办中心

Browse Source
This commit is contained in:
高嵩
2023-09-18 11:28:38 +08:00
parent f49ce9c217
commit ddfff05de2
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+4
View File
@@ -2273,6 +2273,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
dummyInventoryInfoEO.setDutyTerritory(value); dummyInventoryInfoEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
dummyInventoryInfoEO.setDutyDepart(StringUtils.join(valueList,","));
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+7 -5
View File
@@ -216,12 +216,14 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
for (OtaManageReceiveNsdp omrn : valList) { for (OtaManageReceiveNsdp omrn : valList) {
//找到最快来临的发布时间 //找到最快来临的发布时间
try { try {
Date syncDate = sdf.parse(omrn.getReleaseDate()); if(StringUtils.isNotEmpty(omrn.getReleaseDate())){
if (null == releaseDate) { Date syncDate = sdf.parse(omrn.getReleaseDate());
releaseDate = syncDate; if (null == releaseDate) {
} else {
if (syncDate.after(today) && syncDate.before(releaseDate)) {
releaseDate = syncDate; releaseDate = syncDate;
} else {
if (syncDate.after(today) && syncDate.before(releaseDate)) {
releaseDate = syncDate;
}
} }
} }
} catch (ParseException e) { } catch (ParseException e) {