From 54cada12c8cb902b36bca6d89d8c813eba28b93b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 14:51:40 +0800 Subject: [PATCH 01/10] =?UTF-8?q?66949=20=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86-=E5=A1=AB=E5=86=99=E4=BA=BA?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 208 +++++++++++++++++- 1 file changed, 199 insertions(+), 9 deletions(-) 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..715725108 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 targetConfigDataRemoveWrap = new QueryWrapper<>(); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigDataEO.getParamsConfigId()); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsConfigDataEO.getParamsCollectManifestId()); + 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,9 +5890,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 0) { From 435cc74e0898a0e7eb70135282cb1d8bc516a7dc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:04:05 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 715725108..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,11 +4007,11 @@ 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::getParamsConfigId, paramsConfigDataEO.getParamsConfigId()); - targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsConfigDataEO.getParamsCollectManifestId()); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); } @@ -5893,7 +5893,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 0) { From 886127274a31514e9ed335725179f9bb2d23e922 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:05:56 +0800 Subject: [PATCH 03/10] =?UTF-8?q?67249=20=E6=96=87=E6=A1=A3=E5=BA=93?= =?UTF-8?q?=E5=AF=BC=E5=85=A5-=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=AF=A6=E6=83=85-=E6=B3=95=E8=A7=84=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 2976585cf..eb79ea948 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5963,11 +5963,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"); if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; - if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 100) { + if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 100 + "个字符, "; + errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; }else{ - errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 100 + " char, "; + errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 200 + " char, "; } countError++; }else { From 1d9244367573571492f775a2d36b594865f6a212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 29 Mar 2023 15:35:56 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=96=87=E6=9C=AC-?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=E4=B8=BA=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8E=A7=E4=BB=B6=E5=8F=AF=E4=BB=A5=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index f1749be35..21fee26a9 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -30,7 +30,7 @@ @@ -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 = [] From 9e3c47e4f1f56d282b7e8a35857133d22574e1ba Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:37:16 +0800 Subject: [PATCH 05/10] =?UTF-8?q?67243=20=E6=96=87=E6=A1=A3=E5=BA=93-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5-=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 59 +++++++++++++------ 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index eb79ea948..dfc132eed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5269,10 +5269,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = new LinkedList<>(); @@ -5960,14 +5960,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() > 200) { + if(StringUtils.isEmpty(standNumberOrClause)){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-法规编号/条款不能为空, "; + }else{ + 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 += "Details of the phased implementation standNumberOrClause Can not be more than " + 200 + " char, "; + errorMsg += "Phased Implementation Details - Regulation No./clause Can not be more than " + 200 + " char, "; } countError++; }else { @@ -5976,6 +5983,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 +6001,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 +6050,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 15:41:57 +0800 Subject: [PATCH 06/10] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB=E5=8A=A0-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 9d0fee01e..fc0b2d14b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -49,8 +49,8 @@   {{$t('positioningandnavigationsystem')}} - -   {{$t('vehiclesatellitepositioningequipment')}} + + {{$t('vehiclesatellitepositioningequipment')}}   {{$t('inertialnavigationsystem')}} @@ -70,19 +70,19 @@ -   {{$t('signalingdevices')}} + {{$t('signalingdevices')}} -   {{$t('driverassistancefunctioncontrols')}} + {{$t('driverassistancefunctioncontrols')}} -   {{$t('drivingassistancefunctionindicatorsignaldevice')}} + {{$t('drivingassistancefunctionindicatorsignaldevice')}} -   {{$t('steerinwheelreleaseindicatorsignaldevice')}} + {{$t('steerinwheelreleaseindicatorsignaldevice')}} -   {{$t('driverattentionindicatorsignaldevice')}} + {{$t('driverattentionindicatorsignaldevice')}} From ec879f53b53fc832406eafc7e18bd4debf36e121 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 15:46:50 +0800 Subject: [PATCH 07/10] 67229 --- .../vehicleinformation/components/basicInformation.vue | 1 - jero-web/src/views/otamanagement/vehicleregistration/index.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index e8a778c32..dd8bfcfee 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -281,7 +281,6 @@ import { message } from 'ant-design-vue' localStorage.removeItem('otaIdT') localStorage.setItem('otaIdT',value) - this.$forceUpdate() this.getData() }, // 模板下载 diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index af337a5f0..c3b9810aa 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -385,7 +385,7 @@ export default { localStorage.removeItem('otaIdT') this.$router.push({ path: '/vehicleinformation', - query: {} + query: { type:1} }) }, viewProcessClick(row) { From ae76a8983a56a93e3424bc34b41a26b324dd6381 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:57:39 +0800 Subject: [PATCH 08/10] =?UTF-8?q?67329=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationInventoryEOServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 Date: Wed, 29 Mar 2023 16:03:28 +0800 Subject: [PATCH 09/10] =?UTF-8?q?67262=20=E6=96=87=E6=A1=A3=E5=BA=93-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?-=E5=B7=A5=E4=BD=9C=E8=A1=A8=E5=90=8D=E7=A7=B0=E6=98=AF?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index dfc132eed..c12829455 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5076,6 +5076,13 @@ public class BussDocumentLibraryEOServiceImpl 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 Date: Wed, 29 Mar 2023 16:08:17 +0800 Subject: [PATCH 10/10] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB=E5=8A=A0-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 57 ++++++++++++------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index fc0b2d14b..d5b38ab0f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -15,58 +15,58 @@

{{$t('componentname')}} -   {{$t('networksecurityrequirements')}} + {{$t('networksecurityrequirements')}} -   {{$t('millimeterwaveradar')}} + {{$t('millimeterwaveradar')}} -   {{$t('ultrasonicradar')}} + {{$t('ultrasonicradar')}} -   {{$t('camera')}} + {{$t('camera')}} -   {{$t('asternimage')}} + {{$t('asternimage')}} -   {{$t('Monocularbinocularmultiocular')}} + {{$t('Monocularbinocularmultiocular')}} -   {{$t('driverattentionmonitoringsystem')}} + {{$t('driverattentionmonitoringsystem')}} -   {{$t('driversurveillancecamera')}} + {{$t('driversurveillancecamera')}} -   {{$t('drivermonitoringinfraredsensor')}} + {{$t('drivermonitoringinfraredsensor')}} - -   {{$t('positioningandnavigationsystem')}} + + {{$t('positioningandnavigationsystem')}} {{$t('vehiclesatellitepositioningequipment')}} -   {{$t('inertialnavigationsystem')}} + {{$t('inertialnavigationsystem')}} -   {{$t('wheelspeedmeter')}} + {{$t('wheelspeedmeter')}} -   {{$t('highprecisionmap')}} + {{$t('highprecisionmap')}} -   {{$t('electronicfence')}} + {{$t('electronicfence')}} -   {{$t('vehiclecommunicationsystem')}} + {{$t('vehiclecommunicationsystem')}} @@ -86,10 +86,10 @@ -   {{$t('automaticDrivingDataRecordingSystem')}} + {{$t('automaticDrivingDataRecordingSystem')}} - -   {{$t('eventdatarecordingsystem')}} + + {{$t('eventdatarecordingsystem')}}
@@ -1067,6 +1067,7 @@ button{ width: 100%; height: 200px; line-height: 200px; + padding: 10px; } .radio-text-two{ display: inline-block; @@ -1076,6 +1077,9 @@ button{ width: 100%; height: 100px; line-height: 100px; + padding: 10px; + display: flex; + align-items: center; } .radio-text-three{ display: inline-block; @@ -1085,6 +1089,9 @@ button{ width: 100%; height: 50px; line-height: 50px; + padding: 10px; + align-items: center; + display: flex; } .radio-text-four{ display: inline-block; @@ -1094,6 +1101,7 @@ button{ width: 100%; height: 250px; line-height: 250px; + padding: 10px; } .radio-text-five{ display: inline-block; @@ -1103,6 +1111,7 @@ button{ width: 100%; height: 150px; line-height: 150px; + padding: 10px; } .text-box{ display: inline-block; @@ -1131,6 +1140,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-two{ /*display: inline-block;*/ @@ -1144,6 +1154,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-three{ /*display: inline-block;*/ @@ -1156,6 +1167,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-five{ /*display: inline-block;*/ @@ -1168,6 +1180,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-box-three{ display: inline-block; @@ -1177,6 +1190,7 @@ button{ width: 100%; height: 250px; line-height: 250px; + padding: 10px; } .text-box-four{ display: inline-block; @@ -1218,7 +1232,10 @@ button{ border-right: none; width: 100%; height: 100px; - line-height: 100px; + line-height: 20px; + display: flex; + align-items: center; + padding: 10px; } span{ /* overflow: hidden; /*超出部分隐藏*/