From cc976709a59ad91fe7a42eaf304b5502034fafb8 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 15:18:01 +0800 Subject: [PATCH 01/36] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../projectManagement/components/addModel.vue | 21 ++ .../components/changeExtensionModel.vue | 263 ++++++++++++++++++ .../projectLibrary/index.vue | 57 ++-- 5 files changed, 324 insertions(+), 19 deletions(-) create mode 100644 jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 641254c9d..99d08418e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1320,4 +1320,5 @@ module.exports = { thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data', secondaryDirectory:'Secondary directory', OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected', + projectVersion:'Project Version', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ee36dd5cd..ae714d087 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1421,4 +1421,5 @@ module.exports = { thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单', secondaryDirectory:'二级目录', OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员', + projectVersion:'项目版本', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 30c6324e2..ac2dc5671 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -194,6 +194,20 @@ + + +
+
+ {{$t('explain')}} +
+ + + +
+ +
@@ -243,6 +257,13 @@ trigger: 'blur' } ], + explain:[ + { + max: 300, + message: this.$t('explain') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], attestationPlan: [ { pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue new file mode 100644 index 000000000..645b46d43 --- /dev/null +++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue @@ -0,0 +1,263 @@ + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 89c1b78a8..767b76a02 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -129,6 +129,9 @@ + + {{$t('changeExtension')}} +
+ + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/versionStatistics.vue b/jero-web/src/views/projectManagement/components/versionStatistics.vue new file mode 100644 index 000000000..a635a771b --- /dev/null +++ b/jero-web/src/views/projectManagement/components/versionStatistics.vue @@ -0,0 +1,211 @@ + + + + + \ No newline at end of file From e9554cfbe214ce3dc182996a85731b70eb59c8c9 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 17 Oct 2022 14:51:17 +0800 Subject: [PATCH 03/36] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/changeExtensionModel.vue | 40 ++++++++++++------- .../projectLibrary/index.vue | 2 +- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue index 645b46d43..4702d7eaa 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue @@ -70,13 +70,13 @@ trigger: 'blur' } ], - projectVersion:[ + projectVersion: [ { required: true, message: this.$t('projectVersion') + this.$t('cannotEmpty'), trigger: 'blur' } - ], + ] }, disabled: false, projectNameList: [], @@ -98,7 +98,28 @@ }, editModel(value) { this.visible = true - this.formInline = value + this.formInline.id = value.id + if (!value.children) { + this.formInline.projectVersion = '01' + } else if (value.children && value.children.length > 0) { + let projectVersion = value.children[value.children.length - 1].projectVersion + if (projectVersion.slice(0, 1) == '0') { + let num = projectVersion.slice(1, 2) + let numIndex = parseInt(num) + 1 + if (numIndex.length == 1) { + this.formInline.projectVersion = '0' + numIndex + } else { + this.formInline.projectVersion = numIndex + } + } else { + let index = parseInt(projectVersion) + 1 + if (index.length == 1) { + this.formInline.projectVersion = '0' + index + } else { + this.formInline.projectVersion = index + } + } + } this.formInline = { ...this.formInline } this.$nextTick(() => { this.$refs.ruleForm.clearValidate() @@ -110,15 +131,6 @@ handleSubmit() { this.$refs.ruleForm.validate(valid => { if (valid) { - let url = '' - let Action - if (this.formInline.id) { - url = this.url.edit - Action = putAction - } else { - url = this.url.add - Action = postAction - } let query = JSON.parse(JSON.stringify(this.formInline)) Object.keys(query).forEach(res => { if (query[res] && query[res] instanceof Array) { @@ -126,12 +138,12 @@ } }) this.confirmLoading = true - Action(url, query).then((res) => { + postAction('/project/projectLibraryBase/addChild', query).then((res) => { if (res.success) { this.confirmLoading = false this.$message.success(this.$t('OperationSuccessful')) this.visible = false - this.$emit('addModelList') + this.$emit('changeExtensionForm') } else { this.$message.warning(res.message) this.confirmLoading = false diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 767b76a02..64b5a9793 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -272,7 +272,7 @@ this.toggleSearchStatus = !this.toggleSearchStatus }, changeExtensionClick(val) { - this.$refs.changeExtensionModelRef.addModel(JSON.parse(JSON.stringify(val))) + this.$refs.changeExtensionModelRef.editModel(JSON.parse(JSON.stringify(val))) }, changeExtensionForm() { From cffd8630a9e9463430c3e48d8abd4f490661ffb3 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 17 Oct 2022 14:58:48 +0800 Subject: [PATCH 04/36] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/changeExtensionModel.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue index 4702d7eaa..cf507de9a 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue @@ -99,12 +99,11 @@ editModel(value) { this.visible = true this.formInline.id = value.id - if (!value.children) { + if (!value.versionLast) { this.formInline.projectVersion = '01' - } else if (value.children && value.children.length > 0) { - let projectVersion = value.children[value.children.length - 1].projectVersion - if (projectVersion.slice(0, 1) == '0') { - let num = projectVersion.slice(1, 2) + } else if (value.versionLast) { + if (value.versionLast.slice(0, 1) == '0') { + let num = value.versionLast.slice(1, 2) let numIndex = parseInt(num) + 1 if (numIndex.length == 1) { this.formInline.projectVersion = '0' + numIndex @@ -112,7 +111,7 @@ this.formInline.projectVersion = numIndex } } else { - let index = parseInt(projectVersion) + 1 + let index = parseInt(value.versionLast) + 1 if (index.length == 1) { this.formInline.projectVersion = '0' + index } else { From 308cdf5ffbe126016d73a2f17883195870cb1a2d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 17 Oct 2022 16:30:59 +0800 Subject: [PATCH 05/36] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/ProjectDetails.vue | 4 ++-- .../src/views/projectManagement/components/addModel.vue | 6 +++--- .../projectLibrary/components/changeExtensionModel.vue | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index e4b5ccaef..145d068fa 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -79,8 +79,8 @@
{{$t('explain')}} - {{queryForm.explain}} + {{queryForm.explanation}}
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index ac2dc5671..f5491a55f 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -200,9 +200,9 @@
{{$t('explain')}}
- +
@@ -257,7 +257,7 @@ trigger: 'blur' } ], - explain:[ + explanation:[ { max: 300, message: this.$t('explain') + this.$t('cannotExceed') + 300 + this.$t('Characters'), diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue index cf507de9a..3a5bbeb04 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue @@ -32,9 +32,10 @@
{{$t('explain')}}
- + @@ -63,7 +64,7 @@ visible: false, yearNameDataList: [], rules: { - explain: [ + explanation: [ { max: 300, message: this.$t('explain') + this.$t('cannotExceed') + 300 + this.$t('Characters'), From 88a6ef1ae2876bfa1ce657342e42484c836a1273 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 17 Oct 2022 16:31:32 +0800 Subject: [PATCH 06/36] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/projectLibrary/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 64b5a9793..40230bc35 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -227,7 +227,7 @@ align: 'center', width: 280, ellipsis: true, - dataIndex: 'explain' + dataIndex: 'explanation' }, // { // title: this.$t('certifiedEngineer'), From 525eab9ff733e4a6718ae614e3147b49aa001c1a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 17 Oct 2022 16:58:33 +0800 Subject: [PATCH 07/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 14 +++ .../project/entity/ProjectLibraryBase.java | 14 +++ .../service/IProjectLibraryBaseService.java | 8 ++ .../impl/ProjectLibraryBaseServiceImpl.java | 91 ++++++++++++++++++- 4 files changed, 122 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 46058eaca..c943984bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -77,6 +77,20 @@ public class ProjectLibraryBaseController extends JeroController addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { + projectLibraryBaseService.addChild(projectLibraryBase); + return Result.OK("添加成功！"); + } /** * 编辑 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index b5eeb4c7e..8fe663fd7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -109,4 +109,18 @@ public class ProjectLibraryBase implements Serializable { /**目标市场展示名称*/ @TableField(exist = false) private java.lang.String targetMarketName; + + //主项目id parent_id + private String parentId; + + //排序 + private String projectVersion; + + //最后一个版本 + @TableField(exist = false) + private String versionLast; + + //说明 + private String explanation; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index f6f29e54c..0168cf5db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -26,6 +26,14 @@ public interface IProjectLibraryBaseService extends IService */ void add(ProjectLibraryBase projectLibraryBase) throws ParseException; + /** + * 项目扩展(添加子项目-子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致) + * + * @param projectLibraryBase + * @return + */ + void addChild(ProjectLibraryBase projectLibraryBase) throws ParseException; + /** * 更新 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 583d26a56..f5a90ed15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1,6 +1,6 @@ package com.jero.modules.project.service.impl; -import cn.hutool.core.lang.func.Func1; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,9 +11,26 @@ import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.enums.DictCodeEnum; -import com.jero.modules.project.entity.*; -import com.jero.modules.project.enums.*; -import com.jero.modules.project.mapper.*; +import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLawsInventoryLogEO; +import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectLibraryRoleRelEO; +import com.jero.modules.project.entity.ProjectRelatedPersonnel; +import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.entity.ProjectTaskPlanning; +import com.jero.modules.project.enums.CertificationProgressEnum; +import com.jero.modules.project.enums.CurrentProjectStatusEnum; +import com.jero.modules.project.enums.DesignComplianceStatusEnum; +import com.jero.modules.project.enums.InventoryAffirmStatusEnum; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.ProjectRoleEnum; +import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; +import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; +import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; +import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; +import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; @@ -26,6 +43,7 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; @@ -33,6 +51,7 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; @@ -40,7 +59,13 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.text.ParseException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -131,6 +156,62 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectRelatedPersonnelList = projectRelatedPersonnelMapper.queryPageList(id, + DictCodeEnum.DUTY_TERRITORY.getValue(), + null, + null, + null, + null); + if(projectRelatedPersonnelList.size() != 0){ + for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnelList) { + projectRelatedPersonnel.setId(UUID.randomUUID().toString().replace("-", "")); + projectRelatedPersonnel.setProjectId(projectId); + } + projectRelatedPersonnelService.saveBatch(projectRelatedPersonnelList); + } + + //法规/认证任务计划添加数据 projectTaskPlanningService + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectTaskPlanning::getProjectId,projectLibraryBase.getId()); + ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.getOne(wrapper); + if(ObjectUtils.isNotEmpty(projectTaskPlanning)){ + projectTaskPlanning.setId(UUID.randomUUID().toString().replace("-", "")); + projectTaskPlanning.setProjectId(projectId); + projectTaskPlanningService.add(projectTaskPlanning); + } + + + //初始化当前项目的studio与项目库 角色关系 projectLibraryRoleRelEOService + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ProjectLibraryRoleRelEO::getProjectLibraryId,projectLibraryBase.getId()); + ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.getOne(queryWrapper); + if(ObjectUtils.isNotEmpty(projectLibraryRoleRelEO)){ + projectLibraryRoleRelEO.setId(UUID.randomUUID().toString().replace("-", "")); + projectLibraryRoleRelEO.setProjectLibraryId(projectId); + projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO); + } + } + /**检查车型名称id,年款号,目标市场同时存在,报错*/ public void checkExitData(ProjectLibraryBase projectLibraryBase){ From 1f33d84d1a57b13ad6db953d9fbed695d975478e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 18 Oct 2022 09:07:34 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 17 +++- .../project/entity/ProjectLibraryBase.java | 13 ++- .../mapper/ProjectLibraryBaseMapper.java | 3 +- .../mapper/xml/ProjectLibraryBaseMapper.xml | 68 +++++++++++++- .../service/IProjectLibraryBaseService.java | 7 +- .../impl/ProjectLibraryBaseServiceImpl.java | 88 +++++++++++++++++-- 6 files changed, 178 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index c943984bf..88a16ebc7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -1,6 +1,6 @@ package com.jero.modules.project.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; @@ -12,7 +12,15 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -46,8 +54,9 @@ public class ProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { - IPage pageList= projectLibraryBaseService.queryPageList(params); - return Result.OK(params.get("cut").toString(),pageList); + List pageList= projectLibraryBaseService.queryPageList(params); + Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList); + return Result.OK(params.get("cut").toString(),pages); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 8fe663fd7..eb7f70757 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; +import java.util.List; /** @@ -25,7 +25,7 @@ import java.io.Serializable; @TableName("project_library_base") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class ProjectLibraryBase implements Serializable { +public class ProjectLibraryBase implements Comparable { private static final long serialVersionUID = 1L; /**主键*/ @@ -123,4 +123,13 @@ public class ProjectLibraryBase implements Serializable { //说明 private String explanation; + @TableField(exist = false) + private List children; + + @Override + public int compareTo(ProjectLibraryBase o) { + return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序 +// return o.id-this.id;//降序 + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java index 1611566e0..7710ab8fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java @@ -16,7 +16,8 @@ import java.util.Map; */ public interface ProjectLibraryBaseMapper extends BaseMapper { /**分页列表*/ - IPage queryPageList(IPage page, Map params); + List queryPageList(@Param("params") Map params); +// IPage queryPageList(IPage page, Map params); List getList(@Param("projectLibraryBase") ProjectLibraryBase projectLibraryBase); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index ddbfbb6d4..fa9462420 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -43,7 +43,10 @@ plb.create_time, plb.sys_org_code, plb.update_by, - plb.update_time + plb.update_time, + parent_id, + project_version, + explanation from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id @@ -113,6 +116,69 @@ order by plb.create_time desc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index 76cf8f7ec..8cc1a0e92 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -102,4 +102,6 @@ public interface IProjectLibraryBaseService extends IService void disposeData(List records,String cut,boolean disposeTargetMarketFlag); Page getPages(Integer currentPage, Integer pageSize, List list); + + void top(String id,String flag); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0f687c9d3..232ebfb7a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -25,6 +25,7 @@ import com.jero.modules.project.enums.InventoryAffirmStatusEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.enums.TopEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -570,6 +571,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort); + List list = this.list(wrapper); + if(list.size() != 0){ + String sort = list.get(list.size() - 1).getSort(); + int sortTemp = Integer.valueOf(sort) + 1; + projectLibraryBase.setSort(String.valueOf(sortTemp)); + }else{ + projectLibraryBase.setSort("1"); + } + projectLibraryBase.setFlag(TopEnum.TOP_CANCEL.getValue()); + } + this.updateById(projectLibraryBase); + } } From 94dad9ec77734e256d178880408fb254bde6fee6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 15:17:03 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/changeExtensionModel.vue | 2 +- .../projectLibrary/index.vue | 27 ++++++++++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0e8ba619b..bb486614c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1324,4 +1324,6 @@ module.exports = { softwareVersion:'Software version', versionStatistics:'Version statistics', addSubproject:'Add Subproject', + Topping:'Topping', + cancelTopping:'Cancel Topping', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2aa54842d..b9960edde 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1425,4 +1425,6 @@ module.exports = { softwareVersion:'软件版本', versionStatistics:'版本统计', addSubproject:'添加子项目', + Topping:'置顶', + cancelTopping:'取消置顶', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue index a7734d0bd..47ffd5479 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue @@ -100,7 +100,7 @@ editModel(value) { this.visible = true this.formInline = {} - this.formInline.id = value.id + this.formInline.id = value.parentId || value.id if (!value.versionLast) { this.formInline.projectVersion = '01' } else if (value.versionLast) { diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 27b7cb97b..78717c720 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -129,6 +129,11 @@ + + {{record.flag == '1'?$t('cancelTopping'):$t('Topping')}} + {{$t('addSubproject')}} @@ -254,7 +259,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 160, + width: 252, scopedSlots: { customRender: 'operation' } } ], @@ -271,6 +276,26 @@ handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, + toppingClick(row) { + let flag = '' + if (row.flag == '1') { + flag = '0' + } else { + flag = '1' + } + let query = { + flag: flag, + id: row.id + } + getAction('/project/projectLibraryBase/top', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, changeExtensionClick(val) { this.$refs.changeExtensionModelRef.editModel(JSON.parse(JSON.stringify(val))) }, From 9c94f247bf843c9a838c1c6fcf576a2856ff34b6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 18 Oct 2022 15:54:14 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProjectLibraryBaseMapper.xml | 4 +++- .../impl/ProjectLibraryBaseServiceImpl.java | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index ab571bf8d..3fa838a91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -47,7 +47,9 @@ plb.parent_id, plb.project_version, plb.explanation, - plb.software_version + plb.software_version, + plb.sort, + plb.flag from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 232ebfb7a..a359144a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; @@ -981,11 +982,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort); @@ -995,11 +993,19 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(ProjectLibraryBase::getId,id); + updateWrapper.set(ProjectLibraryBase::getSort,null).set(ProjectLibraryBase::getFlag,null); + this.update(projectLibraryBase,updateWrapper); } - this.updateById(projectLibraryBase); } } From e955f4b1f7ff63f5b8494516947068e297281870 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 18 Oct 2022 16:07:48 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=AD--=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BB=E7=89=88=E6=9C=AC=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=BB=98=E8=AE=A400?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index a359144a4..0db931257 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -426,6 +426,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for(ProjectLibraryBase projectLibraryBase: records){ + //历史数据的主版本没有版本号,所以默认给00 + if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){ + projectLibraryBase.setProjectVersion("00"); + } //目标市场 Map param = new HashMap<>(); param.put("cut",cut); From fc98ad795ec0c122cbb7ade96baab810b4e8aaf4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 20 Oct 2022 09:22:18 +0800 Subject: [PATCH 21/36] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0SQL=202.=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E7=9B=B8=E5=85=B3=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 ++++ .../controller/ProjectLibraryBaseController.java | 13 +++++++++++++ .../project/service/IProjectLibraryBaseService.java | 13 +++++++++++++ .../service/impl/ProjectLibraryBaseServiceImpl.java | 12 ++++++++++++ 4 files changed, 42 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 117861bdb..3c4e7c32e 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -13,4 +13,8 @@ ALTER TABLE `laws_weilai`.`project_library_base` ADD COLUMN `sort` varchar(255) NULL COMMENT '排序(用于置顶功能)' AFTER `software_version`, ADD COLUMN `flag` varchar(255) NULL COMMENT '置顶(flag为空的时候为置顶, flag为1的时候取消置顶)' AFTER `sort`; +-- 认证参数列表添加字段--------2022-10-20 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_manifest` +ADD COLUMN `project_version` varchar(255) NULL COMMENT '相关项目版本' AFTER `params_template_name`, +ADD COLUMN `explanation` varchar(2000) NULL COMMENT '说明' AFTER `project_version`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index e3e377a93..93d455678 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -242,5 +242,18 @@ public class ProjectLibraryBaseController extends JeroController getVersionsInfo(String id) { + List versionsInfoList = projectLibraryBaseService.getVersionsInfo(id); + return Result.OK(versionsInfoList); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index 8cc1a0e92..d600f7167 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -103,5 +103,18 @@ public interface IProjectLibraryBaseService extends IService Page getPages(Integer currentPage, Integer pageSize, List list); + /** + * 项目置顶,取消置顶(只置顶主项目) + * @param id + * @param flag 0为置顶, 1为取消置顶 + * @return + */ void top(String id,String flag); + + /** + * 获取项目所有的版本(主版本和子版本的集合) + * @param id + * @return + */ + List getVersionsInfo(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0db931257..3acb77e41 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1011,6 +1011,18 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl getVersionsInfo(String id) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(ProjectLibraryBase::getId,id).or().in(ProjectLibraryBase::getParentId,id); + List list = this.list(wrapper); + List result = new ArrayList<>(); + if(list.size() != 0){ + result = list.stream().map(ProjectLibraryBase::getProjectVersion).collect(Collectors.toList()); + } + return result; + } } From a0853e245cc68d97e333491c7711a076aced6306 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 20 Oct 2022 09:34:39 +0800 Subject: [PATCH 22/36] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5(?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC,?= =?UTF-8?q?=E8=AF=B4=E6=98=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cert/collect/entity/ParamsManifestEO.java | 6 ++++++ .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml | 8 +++++++- .../collect/service/impl/ParamsManifestEOServiceImpl.java | 2 ++ .../jero/modules/cert/collect/vo/ParamsManifestVO.java | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 9d9cb0d9b..4c73955ec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -103,4 +103,10 @@ public class ParamsManifestEO implements Serializable { @TableField(exist = false) private String projectName; + //相关项目版本 + private String projectVersion; + + //说明 + private String explanation; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 592058433..4ed99565e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -16,6 +16,8 @@ + + @@ -27,6 +29,8 @@ + + @@ -43,6 +47,8 @@ pm.project_id as project_id, pm.params_template_id as params_template_id, pm.params_template_publish_version as params_template_publish_version, + pm.project_version as project_version, + pm.explanation as explanation, if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name @@ -134,4 +140,4 @@ where project_id = #{projectId} order by create_time desc - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 7ebdaab76..114509fbc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -187,6 +187,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Thu, 20 Oct 2022 11:00:01 +0800 Subject: [PATCH 23/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 +- jero-web/src/common/lang/zh-cn.js | 4 +- .../components/TaskParameterCollection.vue | 39 +- .../dialog/ParameterTemplateAdd.vue | 177 ++++- .../dialog/ProjectCollectionParameters.vue | 731 +++++++++++------- 5 files changed, 622 insertions(+), 333 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bb486614c..1b443d691 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -786,6 +786,7 @@ module.exports = { parameter: 'Parameter', changeExtension: 'Change Extension', addDetailList: 'Add', + editDetailList:'Edit DetailList', detailedList: 'DetailedList', copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completed', @@ -1321,9 +1322,10 @@ module.exports = { secondaryDirectory:'Secondary directory', OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected', projectVersion:'Project Version', - softwareVersion:'Software version', + softwareVersion:'Authentication Software version', versionStatistics:'Version statistics', addSubproject:'Add Subproject', Topping:'Topping', cancelTopping:'Cancel Topping', + relatedProjectVersion:'Related project version', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index b9960edde..dce5f85ad 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -802,6 +802,7 @@ module.exports = { parameter: '参数', changeExtension: '变更扩展', addDetailList: '添加清单', + editDetailList:'编辑清单', detailedList: '清单', copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', @@ -1422,9 +1423,10 @@ module.exports = { secondaryDirectory:'二级目录', OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员', projectVersion:'项目版本', - softwareVersion:'软件版本', + softwareVersion:'认证软件版本', versionStatistics:'版本统计', addSubproject:'添加子项目', Topping:'置顶', cancelTopping:'取消置顶', + relatedProjectVersion:'相关项目版本', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 49f49a182..f3e6b97fc 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -84,13 +84,21 @@ /> - + - + @@ -98,14 +106,23 @@ - + - + @@ -155,6 +172,13 @@ ellipsis: true, dataIndex: 'paramsTemplateName' }, + { + title: this.$t('relatedProjectVersion'), + align: 'center', + width: 120, + ellipsis: true, + dataIndex: 'projectVersion' + }, { title: this.$t('collectionCompletionTime'), align: 'center', @@ -218,6 +242,7 @@ selectedRowKeysArray: '', templatetitle: '', templatetitleId: '', + areaTitle:'', rowId: '', version: 0, itemId: '', // 配置id @@ -303,12 +328,12 @@ this.$refs.configureRef.addModel(item.id, item) }, handleCancel(val) { - this.areaVisible = val + this.areaVisible = false this.getlist() }, // 项目收集参数 drawerhandleCancel(val) { - this.drawerVisible = val + this.drawerVisible = false }, copysubmit() { this.drawerVisible = false @@ -330,11 +355,13 @@ }, edit(edit) { this.areaVisible = true + this.areaTitle = this.$t('editDetailList') setTimeout(() => { this.$refs.templateRef.editData(edit) }, 50) }, handleAdd() { + this.areaTitle = this.$t('addDetailList') this.areaVisible = true }, // 变更扩展 diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index a4151bd78..f8818d1c4 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -10,21 +10,78 @@ :wrapper-col='wrapperCol' > - - - - + +
+
+ * + {{$t('title')}} +
+ + + + + + + + + + +
+ + + + + + + +
+
+ {{$t('relatedProjectVersion')}} +
+ + + + + + {{ item }} + + + + +
+ + +
+
+ {{$t('explain')}} +
+ + + +
+ + -
+
{{$t('zoneOfApplication')}} @@ -34,9 +91,9 @@ - - - + + +
- - - - - - - - + + + + + + + +
@@ -65,16 +122,17 @@
- - - - - + + + + + {{ $t('query') }} @@ -92,11 +150,11 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll='{x: 600,y:400}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> -
+
{ + if (res.success) { + this.projectVersionList = res.result || [] + } else { + this.projectVersionList = [] + } + }) + }, pageOnChange(page, pageSize) { this.pageNo = page this.loadData() @@ -244,6 +323,11 @@ }, editData(edit) { // 编辑一行的数据 + if (edit.projectVersion) { + edit.projectVersion = edit.projectVersion.split(',') + }else{ + edit.projectVersion = [] + } this.row = edit this.formData = { ...edit } this.selectedRowKeys = edit.paramsTemplateId.split(',') @@ -265,10 +349,17 @@ this.confirmLoading = true let postDate = { title: this.formData.title, + projectVersion: this.formData.projectVersion, + explanation: this.formData.explanation, paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0], paramsTemplatePublishVersion: this.row.version || this.selectedRowKeysDate[0].version, projectId: this.projectId } + Object.keys(postDate).forEach(res => { + if (postDate[res] && postDate[res] instanceof Array) { + postDate[res] = postDate[res].join(',') + } + }) if (this.formData.id) { //编辑 postDate = { @@ -375,14 +466,23 @@ } .drawer-bootom-button { - display: flex; - justify-content: center; + position: absolute; + bottom: 0; + width: 100%; + border-top: 1px solid #e8e8e8; + padding: 10px 16px; + text-align: right; + left: 0; + z-index: 100; + background: #fff; + border-radius: 0 0 2px 2px; } .Required { color: red; margin-right: 4px; } + .box-title-text { line-height: 1.4; display: flex; @@ -390,7 +490,7 @@ } .title-text { - width: 114px; + width: 84px; text-align: right; display: inline-block; font-weight: 500; @@ -410,10 +510,10 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 100px); display: inline-block; margin-top: 2px; - height: 40px; + /*height: 40px;*/ margin-bottom: 24px; } @@ -466,6 +566,19 @@ line-height: 6px; color: #fff; } + + .box-button { + height: 38px; + } + + .itemOption { + display: inline-block; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index fa940c45d..d6c03ca68 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -10,29 +10,80 @@ :wrapper-col='wrapperCol' > - - - - + +
+
+ * + {{$t('title')}} +
+ + + +
- + +
+
+ {{$t('relatedProjectVersion')}} +
+ + + + + + {{ item }} + + + + +
- + + + +
+
+ {{$t('explain')}} +
+ + + +
- - - - + +
+
+ {{$t('entryName')}} +
+ + + +
- - - + + + + + + + + {{ $t('query') }} {{ $t('reset') }} @@ -48,7 +99,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll='{x: 600,y:400}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> @@ -60,7 +111,7 @@ -
+
- +
\ No newline at end of file From 13308fdb039dea3e231fdc158255713c563f9ff5 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 20 Oct 2022 11:10:41 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/parameterlist/components/addModel.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 5eb433eda..2af0965a4 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -225,6 +225,7 @@ @@ -600,9 +601,12 @@ export default { }; }) - - - + }, + onInput(r) { + let value = r.target.value + r.target.value = value.replace(/[！!#]/g, '') + this.formInline.controlValues = r.target.value + this.formInline = {...this.formInline} }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { From 2a6c57e570ed62fbcf6fc19cb86933531e645ce4 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 20 Oct 2022 11:25:21 +0800 Subject: [PATCH 25/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialog/ParameterTemplateAdd.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index f8818d1c4..6e8b589cf 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -323,14 +323,15 @@ }, editData(edit) { // 编辑一行的数据 - if (edit.projectVersion) { - edit.projectVersion = edit.projectVersion.split(',') + let query = JSON.parse(JSON.stringify(edit)) + if (query.projectVersion) { + query.projectVersion = query.projectVersion.split(',') }else{ - edit.projectVersion = [] + query.projectVersion = [] } - this.row = edit - this.formData = { ...edit } - this.selectedRowKeys = edit.paramsTemplateId.split(',') + this.row = query + this.formData = { ...query } + this.selectedRowKeys = query.paramsTemplateId.split(',') }, //新增 handleSubmit() { From d51e4fe80b068dce186c95f0cec41d74567f38a0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 20 Oct 2022 11:29:32 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 3acb77e41..39ecfdd40 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1020,6 +1020,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = new ArrayList<>(); if(list.size() != 0){ result = list.stream().map(ProjectLibraryBase::getProjectVersion).collect(Collectors.toList()); + Collections.sort(result); } return result; } From d5ce89b410919bfe601514c2cd8205c575b567fa Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 21 Oct 2022 16:08:25 +0800 Subject: [PATCH 27/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/xml/ProjectLibraryBaseMapper.xml | 8 ++++---- .../service/impl/ProjectLibraryBaseServiceImpl.java | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index 3fa838a91..954daa5bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -68,10 +68,10 @@ ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1') - (pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%')) - - - + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 39ecfdd40..32943004c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -491,6 +491,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImple.getProjectName().toLowerCase().contains(String.valueOf(params.get("projectName")).toLowerCase())).collect(Collectors.toList()); + } //数据组装 List resultTemp = new LinkedList<>(); for (ProjectLibraryBase projectLibraryBase : result) { From 1e8d18700ba16a1b02a783bdd69420d66f3692ff Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 21 Oct 2022 17:22:17 +0800 Subject: [PATCH 28/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81--?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectLibraryBaseController.java | 13 +++++++++++++ .../service/IProjectLibraryBaseService.java | 7 +++++++ .../impl/ProjectLibraryBaseServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 93d455678..6a492db0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -255,5 +255,18 @@ public class ProjectLibraryBaseController extends JeroController versionStatistics(String id) { + List projectLibraryBasesList = projectLibraryBaseService.versionStatistics(id); + return Result.OK(projectLibraryBasesList); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index d600f7167..ab619a582 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -117,4 +117,11 @@ public interface IProjectLibraryBaseService extends IService * @return */ List getVersionsInfo(String id); + + /** + * 版本统计 + * @param id + * @return + */ + List versionStatistics(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 32943004c..c6624ebb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1028,6 +1028,22 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl versionStatistics(String id) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(ProjectLibraryBase::getId,id).or().in(ProjectLibraryBase::getParentId,id); + List list = this.list(wrapper); + if(list.size() != 0){ + Collections.sort(list); + } + return list; + } } From c184964399b2ad45fae8a629d1588fea2c1e5401 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 21 Oct 2022 17:30:11 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=98=9A=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/projectStatus.vue | 5 +++-- .../projectManagement/components/versionStatistics.vue | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/projectStatus.vue b/jero-web/src/views/projectManagement/components/projectStatus.vue index 311476fba..6e408344b 100644 --- a/jero-web/src/views/projectManagement/components/projectStatus.vue +++ b/jero-web/src/views/projectManagement/components/projectStatus.vue @@ -1,7 +1,8 @@