From 770bd8a4187145c0dbe66d7f52a9f814450e9fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 13 Jan 2023 08:59:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 5417c8271..8d7e32124 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -160,11 +160,16 @@ ALTER TABLE `laws_weilai`.`params_report_detail` -- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937' --- 项目库置顶 2023-1-12 未同步生产环境 -CREATE TABLE `laws_weilai`.`top_project` ( - `id` varchar(36) NOT NULL COMMENT 'id', - `project_library_base_id` varchar(36) NULL COMMENT '项目id', - `flag` varchar(255) NULL COMMENT '置顶标识', - `sort` varchar(255) NULL COMMENT '置顶排序', - PRIMARY KEY (`id`) -); +-- 项目库置顶 2023-1-12 已同步生产环境 +CREATE TABLE `top_project` ( + `id` varchar(36) NOT NULL, + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `project_library_base_id` varchar(32) DEFAULT NULL COMMENT '项目id', + `flag` varchar(32) DEFAULT NULL COMMENT '置顶标识', + `sort` varchar(255) DEFAULT NULL COMMENT '置顶排序', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; From 421aa6778bdff9160c55deabad00c3c445b7fa19 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 13 Jan 2023 14:07:30 +0800 Subject: [PATCH 2/3] =?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 --- .../project/entity/ProjectLibraryBase.java | 43 ++++++++++++++++++- .../impl/ProjectLibraryBaseServiceImpl.java | 29 ++++++++----- 2 files changed, 61 insertions(+), 11 deletions(-) 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 d61f8c8dd..936f46f88 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,6 +26,7 @@ import java.util.List; @TableName("project_library_base") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) +@JsonIgnoreProperties public class ProjectLibraryBase implements Comparable { private static final long serialVersionUID = 1L; @@ -153,5 +155,44 @@ public class ProjectLibraryBase implements Comparable { return projectName+yearName+targetMarket+projectVersion; } - + @Override + public String toString() { + return "ProjectLibraryBase{" + + "id='" + id + '\'' + + ", projectNameId='" + projectNameId + '\'' + + ", projectName='" + projectName + '\'' + + ", yearNameId='" + yearNameId + '\'' + + ", yearName='" + yearName + '\'' + + ", targetMarket='" + targetMarket + '\'' + + ", projectStatus='" + projectStatus + '\'' + + ", studioEngineer='" + studioEngineer + '\'' + + ", studioEngineerName='" + studioEngineerName + '\'' + + ", certificationEngineer='" + certificationEngineer + '\'' + + ", certificationEngineerName='" + certificationEngineerName + '\'' + + ", vehiclePlatform='" + vehiclePlatform + '\'' + + ", digitalPlatform='" + digitalPlatform + '\'' + + ", ipdInfo='" + ipdInfo + '\'' + + ", vehicleDevelopmentPlan='" + vehicleDevelopmentPlan + '\'' + + ", attestationPlan='" + attestationPlan + '\'' + + ", createBy='" + createBy + '\'' + + ", createTime=" + createTime + + ", updateBy='" + updateBy + '\'' + + ", sysOrgCode='" + sysOrgCode + '\'' + + ", updateTime=" + updateTime + + ", cut='" + cut + '\'' + + ", startTime='" + startTime + '\'' + + ", endTime='" + endTime + '\'' + + ", targetMarketName='" + targetMarketName + '\'' + + ", parentId='" + parentId + '\'' + + ", projectVersion='" + projectVersion + '\'' + + ", softwareVersion='" + softwareVersion + '\'' + + ", versionLast='" + versionLast + '\'' + + ", explanation='" + explanation + '\'' + + ", sort='" + sort + '\'' + + ", flag='" + flag + '\'' + + ", brand='" + brand + '\'' + + ", brandText='" + brandText + '\'' + + ", brandTextEn='" + brandTextEn + '\'' + + '}'; + } } 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 1b393189d..1a97e88b3 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 @@ -874,9 +874,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImple.getProjectName().toLowerCase().contains(String.valueOf(params.get("projectName")).toLowerCase())).collect(Collectors.toList()); } - + List projectLibraryBaseParentList = result.stream().filter(e -> StringUtils.isBlank(e.getParentId())).distinct().collect(Collectors.toList()); //处理搜索版本号,(因为列表展示数据是以主项目为主并绑定子项目, 所以搜索的时候只有子项目这种情况需要特殊处理) List resultNew = getProjectLibraryBases(result, projectLibraryBaseListParent); + disposeData(resultNew,"",false); //数据组装 @@ -887,7 +888,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl children = result.stream() .filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList()); @@ -916,9 +917,13 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl collect1 = result.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); resultNew.addAll(collect1); + List projectLibraryBaseList = new ArrayList<>(); for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseListParent) { + List resultNewTemp = new ArrayList<>(); //子项目 List collect = result.stream().filter(e -> projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect)){ - resultNew.add(projectLibraryBase); + resultNewTemp.addAll(collect); } //子项目的子项目 if(ObjectUtils.isNotEmpty(resultChild)){ List collect2 = resultChild.stream().filter(e -> e.getParentId().equals(projectLibraryBase.getId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect2)){ - resultNew.add(projectLibraryBase); + resultNewTemp.addAll(collect2); } } + if(ObjectUtils.isNotEmpty(resultNewTemp)){ + projectLibraryBase.setChildren(resultNewTemp); + projectLibraryBaseList.add(projectLibraryBase); + } } - resultNew = resultNew.stream().distinct().collect(Collectors.toList()); - return resultNew; +// resultNew = resultNew.stream().distinct().collect(Collectors.toList()); + return projectLibraryBaseList; } // /** // * 分页列表查询 From b5b214099f009fe7f4878d779e1c246aab742b56 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 13 Jan 2023 14:09:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsList.vue | 31 ++++++++++++------- .../views/documentManage/collection/index.vue | 25 +++++++++------ .../regulationsKanban/components/addModel.vue | 12 +++++-- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 674fb5c81..18c98e03a 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -56,14 +56,14 @@
{{$t('filingExternalOpinions')}}:
- - {{$t('clickUpload')}} + v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text-index"> + + {{$t('clickUpload')}}
-
- - {{$t('viewFile')}} +
+ + {{$t('viewFile')}}
@@ -94,10 +94,10 @@ total: 0, pageSize: 10, pageNo: 1, - flag:false, + flag: false, dataSource: [], formInline: {}, - administrators:false, + administrators: false, userInfoQuery: {}, columns: [ { @@ -164,8 +164,11 @@ } }) } - getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => { - this.flag = res + getAction('/project/projectUserPermission/hasProcessControlButton', { + type: 'LawsOpinionGather', + id: this.$route.query.id + }).then((res) => { + this.flag = res }) }, methods: { @@ -215,7 +218,7 @@ actiProcInstId: this.actiProcInstId } downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls', - this.$route.query.serialNumber+ ' ' +this.$t('evaluationResults') + '.zip', query) + this.$route.query.serialNumber + ' ' + this.$t('evaluationResults') + '.zip', query) }, getData() { this.formInline = JSON.parse(JSON.stringify(this.$route.query)) @@ -381,4 +384,10 @@ overflow: hidden; text-align: right; } + + .operator-text-index { + display: inline-block; + /*margin-right: 16px;*/ + margin-left: 16px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index 5d9532bcd..ead524a18 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -102,15 +102,16 @@