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

修改参数多值顺序问题

Browse Source
This commit is contained in:
高嵩
2023-07-12 14:36:21 +08:00
parent 0a90b461d1
commit 6fa6c0e678
8 changed files with 619 additions and 543 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/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+7 -5
View File
@@ -831,7 +831,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
String key = UUID.randomUUID().toString().replaceAll("-", "");
paramsConfigDataVO.put(key, paramsConfigDataVOList);
paramsConfigDataVO.put("0+" + key, paramsConfigDataVOList);
}
configMap.put("controlType",controlType);
configMap.put("paramsConfigData",paramsConfigDataVO);
@@ -1637,6 +1637,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId());
}
}
paramsConfigDataEO.setId(configDataMap.getKey());
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
@@ -1737,9 +1738,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
pcdRemoveWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdList);
this.paramsConfigDataEOService.remove(pcdRemoveWrap);
newConfigDataEOList.forEach(newConfigDataEO -> {
newConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
});
// newConfigDataEOList.forEach(newConfigDataEO -> {
// newConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
// });
this.paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
}
@@ -1780,6 +1781,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
Integer orderNum = (Integer) paramsConfigDataVOList.get(0).get("orderNum");
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
paramsConfigDataEO.setId(configDataMap.getKey());
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
@@ -3374,7 +3376,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
for (ParamsConfigDataEO configDataEO : configDataEOList) {
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
// addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+1
View File
@@ -2042,6 +2042,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
paramsReportConfigDataEO.setId(configDataId);
newConfigDataEOList.add(paramsReportConfigDataEO);
}