+
{{$t('Deadline')}}: {{result.verifyDueDate}}
{{$t('ProcessStatus')}}: {{result.verifyStatus}}
{{statusText[result.verifyFlowTaskStatus]}}
-
@@ -231,7 +231,7 @@
handleExport() {
},
- verifyTaskClick(val, num) {
+ verifyTaskClick(val, num,isTrue) {
let query = {}
switch (num) {
case 1:
@@ -243,7 +243,7 @@
id: this.$route.query.id,
studioEngineer: this.$route.query.studioEngineer,
serialNumber: val.serialNumber,
- TaskKey: val.designTaskDefinitionKey,
+ TaskKey: isTrue ? val.designTaskDefinitionKey : 'hhhhh',
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
@@ -251,7 +251,7 @@
deliverableTemplate: 'designDeliverableTemplate',
projectName: this.$route.query.projectName,
projectNameId: this.$route.query.projectNameId,
- primaryKeyId: val.designTaskDetailId
+ primaryKeyId: val.designTaskDetailId,
}
break
case 2:
@@ -262,7 +262,7 @@
studioEngineer: this.$route.query.studioEngineer,
projectLibraryId: this.$route.query.id,
serialNumber: val.serialNumber,
- TaskKey: val.prehomoTaskDefinitionKey,
+ TaskKey: isTrue ? val.prehomoTaskDefinitionKey : 'hhhh',
flowType: 3,
id: this.$route.query.id,
Sponsor: 'prehomoInitiatorName',
@@ -271,7 +271,7 @@
deliverableTemplate: 'prehomoDeliverableTemplate',
projectName: this.$route.query.projectName,
projectNameId: this.$route.query.projectNameId,
- primaryKeyId: val.prehomoTaskDetailId
+ primaryKeyId: val.prehomoTaskDetailId,
}
break
case 3:
@@ -283,7 +283,7 @@
studioEngineer: this.$route.query.studioEngineer,
serialNumber: val.serialNumber,
projectTaskInventoryId: val.projectLawsInventoryId,
- TaskKey: val.verifyTaskDefinitionKey,
+ TaskKey: isTrue ? val.verifyTaskDefinitionKey : 'hhhhh',
flowType: 4,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',
@@ -291,7 +291,7 @@
deliverableTemplate: 'verifyDeliverableTemplate',
projectName: this.$route.query.projectName,
projectNameId: this.$route.query.projectNameId,
- primaryKeyId: val.verifyTaskDetailId
+ primaryKeyId: val.verifyTaskDetailId,
}
break
}
From 72182adfa3ac2508350d1d04acf79a03278152b0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 May 2022 18:29:52 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5(=E6=A0=87=E5=87=86=E7=B1=BB=E5=9E=8B=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BussDocumentLibraryEOServiceImpl.java | 44 +++++++++----------
1 file changed, 22 insertions(+), 22 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 fd965da4b..73953ca9e 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
@@ -4667,28 +4667,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl
> listBySerialNumber = getListBySerialNumber(value);
- String serialNumberStr = "";
- StringBuilder sb = new StringBuilder();
- List list = new ArrayList<>();
- for (Map stringObjectMap : listBySerialNumber) {
- sb.append((String) stringObjectMap.get("id") + ",");
- list.add((String) stringObjectMap.get("serial_number"));
- }
- if (StringUtils.isNotBlank(value)) {
- for (String s : value.split(",")) {
- if (!list.contains(s)) {
- sb.append(s);
- }
- }
- }
- if (ObjectUtils.isNotEmpty(sb)) {
- String substring = sb.toString();
- if (substring.endsWith(",") || substring.endsWith("，")){
- substring = substring.substring(0, substring.length() - 1);
- }
- value = substring;
- }
+// List> listBySerialNumber = getListBySerialNumber(value);
+// String serialNumberStr = "";
+// StringBuilder sb = new StringBuilder();
+// List list = new ArrayList<>();
+// for (Map stringObjectMap : listBySerialNumber) {
+// sb.append((String) stringObjectMap.get("id") + ",");
+// list.add((String) stringObjectMap.get("serial_number"));
+// }
+// if (StringUtils.isNotBlank(value)) {
+// for (String s : value.split(",")) {
+// if (!list.contains(s)) {
+// sb.append(s);
+// }
+// }
+// }
+// if (ObjectUtils.isNotEmpty(sb)) {
+// String substring = sb.toString();
+// if (substring.endsWith(",") || substring.endsWith("，")){
+// substring = substring.substring(0, substring.length() - 1);
+// }
+// value = substring;
+// }
}
}
}
From 17fd92a13accdb1eac886336e272d4f6488de6f3 Mon Sep 17 00:00:00 2001
From: liyawei
Date: Tue, 10 May 2022 18:33:21 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=9F=A5=E8=AF=A2=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ParamsCollectManifestEOServiceImpl.java | 136 ++++++++++--------
.../impl/ParamsConfigEOServiceImpl.java | 11 +-
.../impl/ParamsManifestEOServiceImpl.java | 37 +++++
.../cert/collect/vo/ParamsConfigDataVO.java | 6 +-
4 files changed, 123 insertions(+), 67 deletions(-)
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 871fe2b5b..60aa2e40d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -187,67 +187,66 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> listMap = new ArrayList<>();
- if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
- list.forEach(collectManifestEO -> { // 参数收集清单
- // 处理数据字典字段 中英文切换 认证类型，责任领域
- List certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
- List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
- String certCategoryName = "";
- String dutyTerritoryName = "";
- if (CutEnum.CN.getValue().equals(cut)) {
- certCategoryName = dictItemList.stream()
- .filter(e -> certCategory.contains(e.getItemValue()))
- .map(SysDictItem::getItemText)
- .collect(Collectors.joining(","));
+ list.forEach(collectManifestEO -> { // 参数收集清单
+ // 处理数据字典字段 中英文切换 认证类型，责任领域
+ List certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
+ List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
+ String certCategoryName = "";
+ String dutyTerritoryName = "";
+ if (CutEnum.CN.getValue().equals(cut)) {
+ certCategoryName = dictItemList.stream()
+ .filter(e -> certCategory.contains(e.getItemValue()))
+ .map(SysDictItem::getItemText)
+ .collect(Collectors.joining(","));
- dutyTerritoryName = dictItemList.stream()
- .filter(e -> dutyTerritory.contains(e.getItemValue()))
- .map(SysDictItem::getItemText)
- .collect(Collectors.joining(","));
+ dutyTerritoryName = dictItemList.stream()
+ .filter(e -> dutyTerritory.contains(e.getItemValue()))
+ .map(SysDictItem::getItemText)
+ .collect(Collectors.joining(","));
- } else if (CutEnum.EN.getValue().equals(cut)) {
- certCategoryName = dictItemList.stream()
- .filter(e -> certCategory.contains(e.getItemValue()))
- .map(SysDictItem::getEnName)
- .collect(Collectors.joining(","));
+ } else if (CutEnum.EN.getValue().equals(cut)) {
+ certCategoryName = dictItemList.stream()
+ .filter(e -> certCategory.contains(e.getItemValue()))
+ .map(SysDictItem::getEnName)
+ .collect(Collectors.joining(","));
- dutyTerritoryName = dictItemList.stream()
- .filter(e -> dutyTerritory.contains(e.getItemValue()))
- .map(SysDictItem::getEnName)
- .collect(Collectors.joining(","));
+ dutyTerritoryName = dictItemList.stream()
+ .filter(e -> dutyTerritory.contains(e.getItemValue()))
+ .map(SysDictItem::getEnName)
+ .collect(Collectors.joining(","));
- }
+ }
// String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut);
- collectManifestEO.setCertCategory(certCategoryName);
+ collectManifestEO.setCertCategory(certCategoryName);
// String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut);
- collectManifestEO.setDutyTerritory(dutyTerritoryName);
+ collectManifestEO.setDutyTerritory(dutyTerritoryName);
- // 处理状态字段
- Map collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
- String stateName = collectManifestStateMap.get(collectManifestEO.getState());
- collectManifestEO.setState(stateName);
+ // 处理状态字段
+ Map collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
+ String stateName = collectManifestStateMap.get(collectManifestEO.getState());
+ collectManifestEO.setState(stateName);
- Map manifestMap = objectToMap(collectManifestEO); // 对象转map
- String controlType = collectManifestEO.getControlType();
- String paramsCollectManifestId = collectManifestEO.getId();
+ Map manifestMap = objectToMap(collectManifestEO); // 对象转map
+ String controlType = collectManifestEO.getControlType();
+ String paramsCollectManifestId = collectManifestEO.getId();
- if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
- paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
- Map configMap = new HashMap<>();
- String paramsConfigId = paramsConfigEO.getId();
- ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
- List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
- configMap.put("controlType", controlType);
- configMap.put("list", paramsConfigDataVOList);
- manifestMap.put(paramsConfigEO.getId(), configMap);
- });
- }
+ if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+ paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
+ Map configMap = new HashMap<>();
+ String paramsConfigId = paramsConfigEO.getId();
+ ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+ List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+ configMap.put("controlType", controlType);
+ configMap.put("list", paramsConfigDataVOList);
+ manifestMap.put(paramsConfigEO.getId(), configMap);
+ });
+ }
+
+ listMap.add(manifestMap);
+ });
- listMap.add(manifestMap);
- });
- }
return listMap;
}
@@ -266,7 +265,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> getControlValueMapList(String controlValue) {
+ List> controlValueMapList = new ArrayList<>();
+ if (StringUtils.isNotEmpty(controlValue)) {
+ controlValue = controlValue.replace("，", ",");
+ String[] controlValueStr = controlValue.split(",");
+ for (int i = 0; i < controlValueStr.length; i++) {
+ Map controlValueMap = new HashMap<>();
+ controlValueMap.put("lable", controlValueStr[i]);
+ controlValueMap.put("value", controlValueStr[i]);
+ controlValueMapList.add(controlValueMap);
+ }
+ }
+ return controlValueMapList;
+ }
+
/**
* 列表表头中英文切换
*
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
index 1964bf891..0626bf4f9 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
@@ -52,18 +52,18 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigVO.getParamsConfigEOList();
-// int ind = 1;
+ int ind = 1;
List addConfigList = new ArrayList<>(); // 新增的配置
List updateConfigList = new ArrayList<>(); // 修改的配置
for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
paramsConfigEO.setParamsManifestId(paramsManifestId);
-// paramsConfigEO.setDisplaySeq(ind);
+ paramsConfigEO.setDisplaySeq(ind);
if (StringUtils.isEmpty(paramsConfigEO.getId())) {
addConfigList.add(paramsConfigEO);
} else {
updateConfigList.add(paramsConfigEO);
}
-// ind++;
+ ind++;
}
// 删除的配置
@@ -96,10 +96,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl configEOQueryWrapper = new LambdaQueryWrapper<>();
+ configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
+ paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+ // 关联删除收集的参数项（包含配置数据）
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, id);
+ List paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+ if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+ List paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+ paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+ }
+
removeById(id);
}
@@ -139,6 +161,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl ids) {
+
+ // 关联删除配置
+ LambdaQueryWrapper configEOQueryWrapper = new LambdaQueryWrapper<>();
+ configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+ paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+ // 关联删除收集的参数项（包含配置数据）
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+ List paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+ if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+ List paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+ paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+ }
removeByIds(ids);
}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
index a2495d85f..a21291b8e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
@@ -2,6 +2,9 @@ package com.jero.modules.cert.collect.vo;
import lombok.Data;
+import java.util.List;
+import java.util.Map;
+
/**
* @Author: liyawei
* @Description:
@@ -11,6 +14,7 @@ import lombok.Data;
public class ParamsConfigDataVO {
private String type; // 类型：文本，单选，多选，附件
private String isMust; // 是否必填 1-必填 0-非必填
- private String controlValue; // 控件备选值，控件校验
+ private String controlVerify; // 控件校验
+ private List> controlValue; // 控件备选值
private String dataValue; // 配置具体数据
}
From 700e3bda62e9e0d616f49600a9e14f81a68074d6 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 10 May 2022 18:35:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/projectManagement/components/fixedPlateForm.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/views/projectManagement/components/fixedPlateForm.vue b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue
index 26fc25c51..7be6ec98d 100644
--- a/jero-web/src/views/projectManagement/components/fixedPlateForm.vue
+++ b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue
@@ -46,7 +46,12 @@
versionsName: [
{
required: true,
- message: this.$t('publishComment') + this.$t('cannotEmpty'),
+ message: this.$t('versionName') + this.$t('cannotEmpty'),
+ trigger: 'blur'
+ },
+ {
+ max: 200,
+ message: this.$t('versionName') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
trigger: 'blur'
}
]