From 6fddd2f92c8bc2dbcc8838cacf599ff48ac52521 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Thu, 21 Jul 2022 09:14:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 7de7fda86..254824c4f 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -386,7 +386,7 @@ ALTER TABLE `laws_weilai`.`sys_user` DROP INDEX `uniq_sys_user_phone`, DROP INDEX `uniq_sys_user_email`; --- 参数项清单 修改字段长度 2022-07-17 +-- 参数项清单 修改字段长度 2022-07-17 2022-07-20 已同步生产环境 ALTER TABLE `laws_weilai`.`params_info` MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`, MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`; @@ -419,7 +419,7 @@ ALTER TABLE `laws_weilai`.`report_cert_category_params_info` MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`, MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`; --- 文档翻译表 +-- 文档翻译表 2022-07-20 已同步生产环境 CREATE TABLE `laws_weilai`.`doc_translation` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', From 603de44f9a3eddb61aa222a39d1293c07a5976b5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 22 Jul 2022 15:09:50 +0800 Subject: [PATCH 2/6] =?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 --- .../components/listEditModel.vue | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index eef2f448c..38f185c66 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -985,77 +985,77 @@ }, getProject(row, res, callback) { //设计符合性确认-发起人 - if (row.designInitiator == 1) { - this.designInitiatorList = res.result.lawEngineerList || [] - } else if (row.designInitiator == 2) { - this.designInitiatorList = res.result.certificationEngineerList || [] - } else if (row.designInitiator == 3) { - this.designInitiatorList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.designInitiatorList = res.result.studioPersonList || [] - } else if (!row.designInitiator || row.designInitiator == '') { + // if (row.designInitiator == 1) { + // this.designInitiatorList = res.result.lawEngineerList || [] + // } else if (row.designInitiator == 2) { + // this.designInitiatorList = res.result.certificationEngineerList || [] + // } else if (row.designInitiator == 3) { + // this.designInitiatorList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.designInitiatorList = res.result.studioPersonList || [] + // } else if (!row.designInitiator || row.designInitiator == '') { this.designInitiatorList = res.result.allPersonList || [] - } + // } //设计符合性确认-责任人 - if (row.designDuty == 1) { - this.designDutyList = res.result.lawEngineerList || [] - } else if (row.designDuty == 2) { - this.designDutyList = res.result.certificationEngineerList || [] - } else if (row.designDuty == 3) { - this.designDutyList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.designDutyList = res.result.studioPersonList || [] - } else if (!row.designDuty || row.designDuty == '') { + // if (row.designDuty == 1) { + // this.designDutyList = res.result.lawEngineerList || [] + // } else if (row.designDuty == 2) { + // this.designDutyList = res.result.certificationEngineerList || [] + // } else if (row.designDuty == 3) { + // this.designDutyList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.designDutyList = res.result.studioPersonList || [] + // } else if (!row.designDuty || row.designDuty == '') { this.designDutyList = res.result.allPersonList || [] - } + // } //prehomo确认-发起人 - if (row.prehomoInitiator == 1) { - this.prehomoInitiatorList = res.result.lawEngineerList || [] - } else if (row.prehomoInitiator == 2) { - this.prehomoInitiatorList = res.result.certificationEngineerList || [] - } else if (row.prehomoInitiator == 3) { - this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.prehomoInitiatorList = res.result.studioPersonList || [] - } else if (!row.prehomoInitiator || row.prehomoInitiator == '') { + // if (row.prehomoInitiator == 1) { + // this.prehomoInitiatorList = res.result.lawEngineerList || [] + // } else if (row.prehomoInitiator == 2) { + // this.prehomoInitiatorList = res.result.certificationEngineerList || [] + // } else if (row.prehomoInitiator == 3) { + // this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.prehomoInitiatorList = res.result.studioPersonList || [] + // } else if (!row.prehomoInitiator || row.prehomoInitiator == '') { this.prehomoInitiatorList = res.result.allPersonList || [] - } + // } //prehomo确认-责任人 - if (row.prehomoDuty == 1) { - this.prehomoDutyList = res.result.lawEngineerList || [] - } else if (row.prehomoDuty == 2) { - this.prehomoDutyList = res.result.certificationEngineerList || [] - } else if (row.prehomoDuty == 3) { - this.prehomoDutyList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.prehomoDutyList = res.result.studioPersonList || [] - } else if (!row.prehomoDuty || row.prehomoDuty == '') { + // if (row.prehomoDuty == 1) { + // this.prehomoDutyList = res.result.lawEngineerList || [] + // } else if (row.prehomoDuty == 2) { + // this.prehomoDutyList = res.result.certificationEngineerList || [] + // } else if (row.prehomoDuty == 3) { + // this.prehomoDutyList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.prehomoDutyList = res.result.studioPersonList || [] + // } else if (!row.prehomoDuty || row.prehomoDuty == '') { this.prehomoDutyList = res.result.allPersonList || [] - } + // } //验证符合性确认-发起人 - if (row.verifyInitiator == 1) { - this.verifyInitiatorList = res.result.lawEngineerList || [] - } else if (row.verifyInitiator == 2) { - this.verifyInitiatorList = res.result.certificationEngineerList || [] - } else if (row.verifyInitiator == 3) { - this.verifyInitiatorList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.verifyInitiatorList = res.result.studioPersonList || [] - } else if (!row.verifyInitiator || row.verifyInitiator == '') { + // if (row.verifyInitiator == 1) { + // this.verifyInitiatorList = res.result.lawEngineerList || [] + // } else if (row.verifyInitiator == 2) { + // this.verifyInitiatorList = res.result.certificationEngineerList || [] + // } else if (row.verifyInitiator == 3) { + // this.verifyInitiatorList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.verifyInitiatorList = res.result.studioPersonList || [] + // } else if (!row.verifyInitiator || row.verifyInitiator == '') { this.verifyInitiatorList = res.result.allPersonList || [] - } + // } //验证符合性确认-责任人 - if (row.verifyDuty == 1) { - this.verifyDutyList = res.result.lawEngineerList || [] - } else if (row.verifyDuty == 2) { - this.verifyDutyList = res.result.certificationEngineerList || [] - } else if (row.verifyDuty == 3) { - this.verifyDutyList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.verifyDutyList = res.result.studioPersonList || [] - } else if (!row.verifyDuty || row.verifyDuty == '') { + // if (row.verifyDuty == 1) { + // this.verifyDutyList = res.result.lawEngineerList || [] + // } else if (row.verifyDuty == 2) { + // this.verifyDutyList = res.result.certificationEngineerList || [] + // } else if (row.verifyDuty == 3) { + // this.verifyDutyList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.verifyDutyList = res.result.studioPersonList || [] + // } else if (!row.verifyDuty || row.verifyDuty == '') { this.verifyDutyList = res.result.allPersonList || [] - } + // } callback() }, getData(row, res) { From 4628439169b53d27c544c480c9d3bd86969044b0 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 22 Jul 2022 15:15:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=A4=A7=E5=B0=8F=E5=86=99=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/document/enums/SearchEnum.java | 2 -- .../impl/ProjectRelatedPersonnelServiceImpl.java | 15 ++++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java index 279e77bcd..3b1ea5267 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -12,8 +12,6 @@ public enum SearchEnum { FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"); - - String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 66e03ed80..8f2136160 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -55,14 +55,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; +import java.util.*; import java.util.stream.Collectors; /** @@ -1047,7 +1040,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getUsername())) + lawEngineerId = lawEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase())) .map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); } midId.append(lawEngineerId).append(","); @@ -1081,7 +1074,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getUsername())) + engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase())) .map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); } midId.append(engineeringInterfacePersonId).append(","); @@ -1130,7 +1123,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getUsername())) + certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase())) .map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); } midId.append(certificationEngineerId).append(","); From fa0a81eadf7d0f465019827764206177f7428b27 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 22 Jul 2022 15:34:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E4=B8=BA=20=E2=80=9C?= =?UTF-8?q?=E4=B8=80=E8=88=AC=E7=94=A8=E6=88=B7=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SysUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index e457b8b91..2783d1166 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -519,7 +519,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserDepartMapper.insert(sysUserDepart); // 添加用户角色关系 - SysUserRole userRole = new SysUserRole(sysUser.getId(), "1534020318437208065"); // 新增用户默认角色均为工程师 + SysUserRole userRole = new SysUserRole(sysUser.getId(), "1550369502225551361"); // 新增用户默认角色均为一般用户 sysUserRoleMapper.insert(userRole); // 添加用户信息 From 2715dd2b682f6ae7f6cea2dd4db48db60d1eb8a6 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sun, 24 Jul 2022 17:22:01 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA=20=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=E8=A7=92=E8=89=B2=E5=8F=AA?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 29 +++++++++++++++++-- .../collect/vo/ParamsCollectManifestVO.java | 3 ++ .../ParameterItemCollectionList.vue | 6 ++-- 3 files changed, 34 insertions(+), 4 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 50ebb976f..78ca3a4a4 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 @@ -2157,8 +2157,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> dataList = paramsCollectManifestEOMapper.listInfoForExport(queryEO); // 查询导出数据 + if (dataList == null || dataList.isEmpty()){ + // 没有查到数据，进行提示 + if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) { + throw new JeroBootException("No data, unable to export"); + } else { + throw new JeroBootException("无数据，无法导出"); + } + } List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询所有配置列 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java index 1421ccb64..cc37935f7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java @@ -74,4 +74,7 @@ public class ParamsCollectManifestVO { private String exportName; // 导出文件名 + @ApiModelProperty(value = "用户类型") + private String userTypes; // 用户类型 + } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index b1076e198..273116a1a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -822,11 +822,13 @@ paramsTemplateId: this.$route.query.paramsTemplateId, paramsTemplatePublishVersion:1, cut: this.cut, + userTypes: this.currentPersonRole, exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' } - console.log(query) getAction('/params/collectManifest/exportAll', query).then((res) => { - + if (res && !res.success) { + this.$message.error(res.message) + } this.textLoading = false }) }, From 8674a7d52f782d21e8cea1053ef8d16ccceafbfa Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sun, 24 Jul 2022 17:31:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E7=9A=84=E6=A8=AA=E7=BA=BF=E7=BC=A9=E7=9F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 273116a1a..682fbe51a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -3,7 +3,7 @@
- {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}})——{{$t(this.paramsManifest.title)}} + {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.paramsManifest.title)}}