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

Merge branch 'fix_20230609'

Browse Source 
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
高嵩
2023-06-15 18:16:35 +08:00
parent 87fc95c4e5 8cc068f823
commit d3a7f07e3e
9 changed files with 402 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+12 -13
View File
@@ -1398,11 +1398,12 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
}
String configData = configDataBuilderTemp.toString();
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
if(StringUtils.isNotEmpty(configData)){
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
}
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
}
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
}
}
@@ -1423,7 +1424,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
} else {
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
List<String> configDataList = new ArrayList<>(); // 重新组合配置数据
for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
@@ -1458,17 +1459,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
}
configData = configDataBuilderTemp.toString();
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
if(StringUtils.isNotEmpty(configData)){
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
}
configDataList.add(configData);
}
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
}
String configDataStr = configDataBuilder.toString();
if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
}
String configDataStr = configDataList.stream().distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
record1.put("params_value", configDataStr);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+12 -4
View File
@@ -98,9 +98,13 @@ public class LawsWarnService {
//处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
String flag = String.valueOf(parameter.get("flag"));
if(StringUtils.equals(flag,"0")){
parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
if(ObjectUtils.isEmpty(parameter.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
}
} else if(StringUtils.equals(flag,"1")){
parameter.put("implement_time",parameter.get("WarnTime"));
if(ObjectUtils.isEmpty(parameter.get("implement_time"))){
parameter.put("implement_time",parameter.get("WarnTime"));
}
}
// parameter.remove("WarnTime");
@@ -249,7 +253,9 @@ public class LawsWarnService {
Date newCarModelDate = null;
try {
newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
if(ObjectUtils.isNotEmpty(data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
}
} catch (ParseException e) {
e.printStackTrace();
}
@@ -269,7 +275,9 @@ public class LawsWarnService {
}).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList());
Date implementTime = null;
try {
implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
if(ObjectUtils.isNotEmpty(data.get("implement_time"))){
implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
}
} catch (ParseException e) {
e.printStackTrace();
}