diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 101213375..a8deb64c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4007,6 +4007,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = configDataList.stream().map(ParamsConfigDataEO::getParamsCollectManifestId).distinct().collect(Collectors.toList()); + for (String paramsCollectManifestId : paramsCollectManifestIdList) { + // 删除之前的参数项 + QueryWrapper targetConfigDataRemoveWrap = new QueryWrapper<>(); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); + } + // 批量新增参数项 Boolean isSuccess = paramsConfigDataEOService.saveOrUpdateBatch(configDataList); @@ -5416,7 +5424,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5511,11 +5549,39 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } + } } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5551,11 +5617,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5590,11 +5685,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5630,11 +5754,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5689,6 +5842,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + if (!value.endsWith("#")) { //3 + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[2]); + } + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else { @@ -5701,7 +5890,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map, HttpServletResponse response, HttpServletRequest request) { OutputStream os = null; HSSFWorkbook workbook = new HSSFWorkbook(); + String cut = (String) map.get("cut"); + String sheetName = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + sheetName = "文档库导入模板"; + }else { + sheetName = "Document LibraryImport Template"; + } String fileOriName = "文档库导入模板.xls"; String filePath = uploadpath + File.separator + fileOriName; try { @@ -5086,7 +5093,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = new LinkedList<>(); @@ -5960,14 +5967,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsList = Arrays.asList(value.split("#")); for (String phasedImplDetails : phasedImplDetailsList) { PhasedImplementationDetailsEO phasedImplementationDetailsEO = new PhasedImplementationDetailsEO(); - String[] phasedImplDetailsArr = phasedImplDetails.split("

"); + String[] phasedImplDetailsArr = phasedImplDetails.split(""); if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; - if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 100) { + if(StringUtils.isEmpty(standNumberOrClause)){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 100 + "个字符, "; + errorMsg += "分阶段实施详情-法规编号/条款不能为空, "; }else{ - errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 100 + " char, "; + errorMsg += "Phased Implementation Details - Regulation No./clause cannot be empty,"; + } + countError++; + } else if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; + }else{ + errorMsg += "Phased Implementation Details - Regulation No./clause Can not be more than " + 200 + " char, "; } countError++; }else { @@ -5976,6 +5990,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 2){ String implementationTypeName = phasedImplDetailsArr[1]; + if(StringUtils.isNotEmpty(implementationTypeName)){ String[] implementationTypeNameArr = implementationTypeName.split(","); ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values(); @@ -5993,30 +6008,47 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 3){ - Date implementationDate = null; - try { - implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); - } catch (ParseException e) { - e.printStackTrace(); - } - if(implementationDate == null){ + String implementationDateStr = phasedImplDetailsArr[2]; + if(StringUtils.isEmpty(implementationDateStr)){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-实施日期格式错误，正确格式为'yyyy-MM-dd', "; + errorMsg += "分阶段实施详情-实施日期不能为空, "; }else{ - errorMsg += "Details of the phased implementation implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + errorMsg += "Phased Implementation Details - Implementation Date cannot be empty,"; } countError++; }else { - phasedImplementationDetailsEO.setImplementationDate(implementationDate); + Date implementationDate = null; + try { + implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + if(implementationDate == null){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-实施日期格式错误，正确格式为'yyyy-MM-dd', "; + }else{ + errorMsg += "Phased Implementation Details - implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + } + countError++; + }else { + phasedImplementationDetailsEO.setImplementationDate(implementationDate); + } } } if(phasedImplDetailsArr.length >= 4){ @@ -6025,7 +6057,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl zmclList; + private List zmclList = new ArrayList<>(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java index 6cc9a8581..24984285d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -125,6 +126,6 @@ public class OtaBaCxZxsjyq implements Serializable { private java.lang.String zmcl; @TableField(exist = false) - private List zmclList; + private List zmclList = new ArrayList<>(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 8dd21374f..33d7f382a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -32,7 +32,6 @@ public enum OtaTitleEnum { SJSBAQ("sjsbaq", "升级失败安全状态", "2"), SJGG("sjgg", "升级公告", "2"), SJZT("sjzt", "升级结果状态", "2"), - ZMCL("zmcl", "证明材料", "0"), BHJZ("bhjz", "保护机制", "protection_mechanism"), FSXJZ("fsxjz", "防失效机制", "fail_safe_mechanism"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 452839e8e..85b38658b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -76,6 +76,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxAqcs.getZmclList()) { @@ -83,12 +84,41 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); + otaBaCxAqcsOld.setZmclList(aeoList); + } saveOrUpdate(otaBaCxAqcs); ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) { otaBaCxAqcsOld = new OtaBaCxAqcs(); } List reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); + + for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { + if (aeoNew.getId().equals(aeoOld.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoNew.getFileName())); + } + } + for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { + if (aeoOld.getId().equals(aeoNew.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoOld.getFileName())); + } + } otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index 32d24f4a3..d4cc7dc9e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -81,6 +81,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxZxsjyq.getZmclList()) { @@ -88,12 +89,42 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxZxsjyqOld.getZmcl(), AttachmentEO.class); + otaBaCxZxsjyqOld.setZmclList(aeoList); + } saveOrUpdate(otaBaCxZxsjyq); + ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxZxsjyqOld)) { otaBaCxZxsjyqOld = new OtaBaCxZxsjyq(); } + List reList = cu.comparisonRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, otaBaCxZxsjyqOld, otaBaCxZxsjyq, sysDictService); + for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { + if (aeoNew.getId().equals(aeoOld.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoNew.getFileName())); + } + } + for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { + if (aeoOld.getId().equals(aeoNew.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoOld.getFileName())); + } + } otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 257d5b1a0..5a7c9dd7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -22,6 +22,19 @@ public class ComparisonUtil { public ComparisonUtil() { } + + public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { + String content = title + "中添加了附件:'" + attName; + OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); + return jl; + } + + public OtaBaCxTxjl delAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { + String content = title + "中删除了附件:'" + attName; + OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); + return jl; + } + /** * 对比字段并添加到记录 */ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 9266877f8..f003acfa6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3854,6 +3854,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl noCiteInspectionItem = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + String deliveryResult = ""; for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) { // 匹配数据 类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成 boolean flag = ( @@ -3863,13 +3864,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl @@ -283,7 +283,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')+$t('chinese')" - @input="onInput" + @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="itemval.dataValue"/> @@ -405,7 +405,7 @@

@@ -730,7 +730,7 @@ :disabled="itemval.isLock == '1' ? true: false" :maxLength="1000" :placeholder="$t('pleaseEnter')+$t('chinese')" - @input="onInput" + @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="itemval.dataValue"/>
@@ -917,14 +917,14 @@ } }) }, - onInput(r) { - let value = r.target.value - r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '') - this.detailDateList.forEach((item) => { - if (item.controlVerify == '2') { - item.dataValue = r.target.value - } - }) + onInput(r, item, index) { + let value = r.replace(/[^\u4e00-\u9fa5]/g, '') + this.detailDate.paramsConfigData[item][index].dataValue = value + // this.detailDateList.forEach((item) => { + // if (item.controlVerify == '2') { + // item.dataValue = value + // } + // }) }, uploadSuccess(data) { let attIdList = [] diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 591c724e9..08939f295 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -111,7 +111,7 @@
- {{$t('Vehicledynamictype')}} + {{$t('Vehicledynamictype')}}