From 8c21bd0d5fb03d3df69a1f00d2eb137575a1dc92 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 23 Oct 2023 10:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 465 +++++++++++++++++- 1 file changed, 446 insertions(+), 19 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 81643d87e..8316f757f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -2062,16 +2062,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl prcdQueryWrap = new QueryWrapper<>(); @@ -2185,18 +2180,6 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataList, String paramsManifestId) { +// List newConfigDataEOList = new ArrayList<>(); +// List updateDetailEOList = new ArrayList<>(); +// List insertLogEOList = new ArrayList<>(); +// List paramsReportConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 +// List paramsReportConfigIdList = paramsReportConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); +// List paramsReportConfigDataEOList = paramsReportConfigDataEOService.queryListByConfigIdList(paramsReportConfigIdList); // 查询所有配置数据 +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// +// // 处理数据 +// for (Map map : configDataList) { +// String paramsCollectManifestId = (String) map.get("id"); +// // 操作记录 +// StringBuilder logCnContent = new StringBuilder(); +// StringBuilder logEnContent = new StringBuilder(); +// logCnContent.append(loginUser.getUsername()); +// logEnContent.append(loginUser.getUsername()); +// +// // 删除操作记录 +// StringBuilder deleteLogCnContent = new StringBuilder(); +// StringBuilder deleteLogEnContent = new StringBuilder(); +// deleteLogCnContent.append(loginUser.getUsername()); +// deleteLogEnContent.append(loginUser.getUsername()); +// +// +// // 添加操作记录 +// StringBuilder addLogCnContent = new StringBuilder(); +// StringBuilder addLogEnContent = new StringBuilder(); +// addLogCnContent.append(loginUser.getUsername()); +// addLogEnContent.append(loginUser.getUsername()); +// +// // 变更标识 +// boolean changeFlag = false; +// // 删除标识 +// boolean deleteFlag = false; +// // 新增标识 +// boolean addFlag = false; +// +// String configNameCn = ""; +// String configNameEn = ""; +// +// // 添加配置数据*****循环同一个配置里的内容 +// for (Map.Entry entry : map.entrySet()) { +// String key = entry.getKey(); +// if ("id".equals(key)) { +// continue; +// } +// +// if ("remarks".equals(entry.getKey()) && StringUtils.isNotEmpty((String) entry.getValue())) { +// ParamsReportDetailEO updateDEtailEO = new ParamsReportDetailEO(); +// updateDEtailEO.setId(paramsCollectManifestId); +// updateDEtailEO.setRemarks((String) entry.getValue()); +// updateDetailEOList.add(updateDEtailEO); +// continue; +// } +// +// // 取值 +// String paramsReportConfigEOId = entry.getKey(); +// ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(paramsReportConfigEOId); +// Map paramsReportConfigDataMap = (Map) entry.getValue(); +// // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） +// // List> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); +// +// logCnContent.append("将"); +// logEnContent.append(" set "); +// +// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); +// logEnContent.append(paramsReportConfigEO.getConfigName()); +// +// Map paramsConfigDataVOMap = (Map) paramsReportConfigDataMap.get("paramsConfigData"); +// +// for (Map.Entry paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) { +// //顺序号不存在ID中，查询的时候会拼接 +// String configDataId = paramsConfigDataMap.getKey(); +// +// List> configDataVOList = (List>) paramsConfigDataMap.getValue(); +// +// if (CollectionUtil.isNotEmpty(configDataVOList)) { +// int orderNum = (Integer) configDataVOList.get(0).get("orderNum"); +// int plusIndex = configDataId.indexOf("+"); +// if (plusIndex != -1) { +// orderNum = Integer.parseInt(configDataId.substring(0, plusIndex)); +// configDataId = configDataId.substring(plusIndex + 1); +// } +// ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO(); +// paramsReportConfigDataEO.setOrderNum(orderNum); +// for (Map paramsConfigDataVO : configDataVOList) { +// String type = (String) paramsConfigDataVO.get("type"); +// String dataValue = ""; +// if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){ +// dataValue = String.valueOf(paramsConfigDataVO.get("dataValue")); +// } +// +// // 判断是新增还是修改 +// ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList,configDataId); +// if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { +// paramsReportConfigDataEO.setId(oldConfigDataEO.getId()); +// +// if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { +// // paramsReportConfigDataEO.setTextData(dataValue); +// if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) { +// logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } +// +// } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) +// || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { +// // paramsReportConfigDataEO.setPullData(dataValue); +// +// if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) { +// logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } +// +// } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { +// String newFileNames = ""; +// if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 +// // 处理文件connectId +// String[] fileIdList = dataValue.split(","); +// List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); +// if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// List updateFileList = new ArrayList<>(); +// for (int i = 0; i < fileIdList.length; i++) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileIdList[i]); +// ossFile.setConnectId(connectId); +// updateFileList.add(ossFile); +// } +// ossFileService.updateBatchById(updateFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { +// List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); +// if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// //修改文件表关联信息connect_id +// List oSSFileList = new ArrayList<>(); +// for (String fileId : dataValue.split(",")) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileId); +// ossFile.setConnectId(connectId); +// oSSFileList.add(ossFile); +// } +// ossFileService.updateFileInfo(oSSFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } +// // paramsReportConfigDataEO.setFileConnectId(dataValue); +// if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { +// logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) { +// String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { +// String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) { +// logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); +// +// changeFlag = true; +// } +// +// } +// +// } +// } +// +// +// +// if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { +// +// paramsReportConfigDataEO.setTextData(dataValue); +// } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) +// || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { +// +// paramsReportConfigDataEO.setPullData(dataValue); +// } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { +// String newFileNames = ""; +// if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 +// // 处理文件connectId +// String[] fileIdList = dataValue.split(","); +// List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); +// if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// List updateFileList = new ArrayList<>(); +// for (int i = 0; i < fileIdList.length; i++) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileIdList[i]); +// ossFile.setConnectId(connectId); +// updateFileList.add(ossFile); +// } +// ossFileService.updateBatchById(updateFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { +// List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); +// if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// //修改文件表关联信息connect_id +// List oSSFileList = new ArrayList<>(); +// for (String fileId : dataValue.split(",")) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileId); +// ossFile.setConnectId(connectId); +// oSSFileList.add(ossFile); +// } +// ossFileService.updateFileInfo(oSSFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } +// paramsReportConfigDataEO.setFileConnectId(dataValue); +// } +// } +// +// +// paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); +// paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); +// paramsReportConfigDataEO.setId(configDataId); +// newConfigDataEOList.add(paramsReportConfigDataEO); +// } +//// +//// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); +//// logEnContent.append(paramsReportConfigEO.getConfigName()); +// +// } +// +// QueryWrapper prcdQueryWrap = new QueryWrapper<>(); +// prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); +// prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); +// List prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap); +// if(CollectionUtils.isNotEmpty(prcdEoList)){ +// List paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey().split("\\+")[0]).distinct().collect(Collectors.toList()); +// +// List newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> { +// boolean flag = false; +// // 如果key的长度是16位，则是新添加的 +// if (e.length() == 16) { +// flag = true; +// } +// return flag; +// }).distinct().collect(Collectors.toList()); +// +// if(CollectionUtils.isNotEmpty(newAddPcdDataIdList)){ +// StringBuilder dataValueSb = new StringBuilder(); +// for (String newAddPcdDataId : newAddPcdDataIdList) { +// List> configDataVOList = (List>) paramsConfigDataVOMap.get(newAddPcdDataId); +// for (Map paramsConfigDataVO : configDataVOList) { +// String type = (String) paramsConfigDataVO.get("type"); +// +// String dataValue = ""; +// if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){ +// dataValue = String.valueOf(paramsConfigDataVO.get("dataValue")); +// } +// // 如果是附件 单独处理 +// if(StringUtils.equals(type,ConfigDataTypeEnum.FILE.getValue())){ +// +// } +// dataValueSb.append("\"").append(dataValue).append("\","); +// } +// } +// +// String dataValue = ""; +// if(StringUtils.isNotBlank(dataValueSb.toString())){ +// dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); +// } +// +// addLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append("，"); +// addLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(","); +// +// addFlag = true; +// } +// +// // 判断有没有被减掉的（删除的） +// List deletePrcdEoList = prcdEoList.stream().filter(prcdEo -> { +// boolean flag = true; +// for (String paramsConfigDataId : paramsConfigDataIdList) { +// if(StringUtils.equals(prcdEo.getId(),paramsConfigDataId)){ +// flag = false; +// break; +// } +// } +// return flag; +// }).collect(Collectors.toList()); +// +// // 如果有被删的数据 增加log记录 +// if(CollectionUtils.isNotEmpty(deletePrcdEoList)){ +// StringBuilder dataValueSb = new StringBuilder(); +// for (ParamsReportConfigDataEO paramsReportConfigDataEO : deletePrcdEoList) { +// if(StringUtils.isNotBlank(paramsReportConfigDataEO.getTextData())){ +// dataValueSb.append("\"").append(paramsReportConfigDataEO.getTextData()).append("\","); +// } +// if(StringUtils.isNotBlank(paramsReportConfigDataEO.getPullData())){ +// dataValueSb.append("\"").append(paramsReportConfigDataEO.getPullData()).append("\","); +// } +// if(StringUtils.isNotBlank(paramsReportConfigDataEO.getFileConnectId())){ +// dataValueSb.append("\"").append(paramsReportConfigDataEO.getFileConnectId()).append("\","); +// } +// } +// String dataValue = ""; +// if(StringUtils.isNotBlank(dataValueSb.toString())){ +// dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); +// } +// deleteLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append("，"); +// deleteLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(","); +// +// deleteFlag = true; +// } +// } +// +// +// QueryWrapper removeConfigDataWrap = new QueryWrapper<>(); +// removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); +// removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); +// this.paramsReportConfigDataEOService.remove(removeConfigDataWrap); +// +// //******************这里是当前配置的循环结束了****************** +// //判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字 +// //configNameCn = paramsReportConfigEO.getConfigName()+"的"; +// //configNameEn = paramsReportConfigEO.getConfigName(); +// String cnContent = logCnContent.toString(); +// String enContent = logEnContent.toString(); +// if(!configNameCn.isEmpty() && !configNameEn.isEmpty() +// && cnContent.contains(configNameCn) && enContent.contains(configNameEn)){ +// int cnStar = cnContent.length() - configNameCn.length(); +// int enStar = enContent.length()-configNameEn.length(); +// String logCnContentLast = logCnContent.substring(cnStar, logCnContent.length()); +// String logEnContentLast = logEnContent.substring(enStar, logEnContent.length()); +// +// //logCnContent的最后是configName时 +// if(logCnContentLast.equals(configNameCn) && logEnContentLast.equals(configNameEn)) { +// logCnContent.delete(cnStar, cnContent.length() + 1); +// logEnContent.delete(enStar,enContent.length()+1); +// } +// } +// } +// +// +// /*if (logCnContent.toString().endsWith("，")) { +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(","))); +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// }*/ +// if(changeFlag){ +// ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// int i = logCnContent.lastIndexOf("，"); +// insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(","))); +//// insertLogEO.setLogCnContent(cnContent.substring(0, logCnContent.lastIndexOf("，"))); +//// insertLogEO.setLogEnContent(enContent.substring(0, logEnContent.lastIndexOf(","))); +// +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// } +// +// if(deleteFlag){ +// ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// insertLogEO.setLogCnContent(deleteLogCnContent.toString().substring(0, deleteLogCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(deleteLogEnContent.toString().substring(0, deleteLogEnContent.lastIndexOf(","))); +// +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// } +// +// if(addFlag){ +// +// ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// insertLogEO.setLogCnContent(addLogCnContent.toString().substring(0, addLogCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(addLogEnContent.toString().substring(0, addLogEnContent.lastIndexOf(","))); +// +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// } +// +// +// } +// +// // 批量更新 +// if (CollectionUtil.isNotEmpty(updateDetailEOList)) { +// paramsReportDetailEOService.updateBatchById(updateDetailEOList); +// } +// if (CollectionUtil.isNotEmpty(insertLogEOList)) { +// paramsReportDetailLogEOService.saveBatch(insertLogEOList); +// } +// return paramsReportConfigDataEOService.saveBatch(newConfigDataEOList); +// } private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List paramsReportConfigDataEOList,String configDataId) {