diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index ee0f3a4ae..5af2789e3 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -205,6 +205,11 @@ CREATE TABLE `params_report_export_history` ( ALTER TABLE `laws_weilai`.`params_manifest_history` ADD COLUMN `source_params_manifest_id` varchar(50) NULL COMMENT '源参数清单id' AFTER `params_template_publish_version`; +-- 上报库表 添加字段 2022-07-08 +ALTER TABLE `laws_weilai`.`params_report` + ADD COLUMN `project_name` varchar(200) NULL COMMENT '项目名称' AFTER `params_template_publish_version`, + ADD COLUMN `title` varchar(200) NULL COMMENT '清单标题' AFTER `project_name`; + ALTER TABLE `laws_opinion_gather` ADD COLUMN `opinion_archive_id` varchar(4000) NULL COMMENT '意见归档文件id' AFTER `prc_num`; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java index e8d81dd1a..357bf81ba 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java @@ -1,7 +1,6 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -70,11 +69,9 @@ public class ParamsReportEO implements Serializable { @ApiModelProperty(value = "对应参数模板发布版本") private Integer paramsTemplatePublishVersion; - @TableField(exist = false) @ApiModelProperty(value = "项目名称") private String projectName; - @TableField(exist = false) @ApiModelProperty(value = "清单标题") private String title; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml index 6b84de8f0..3314b963f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml @@ -13,6 +13,8 @@ + + @@ -24,8 +26,8 @@ pr.create_time as create_time, pr.update_by as update_by, pr.update_time as update_time, - pm.title as title, - pni.project_name as project_name + if (pm.title is not null, pm.title, pr.title) as title, + if (pni.project_name is not null, concat(pni.project_name,'-', pyni.year_name), pr.project_name) as project_name @@ -48,6 +50,7 @@ left join params_manifest as pm on pm.id = pr.old_params_manifest_id left join project_library_base as plb on plb.id = pm.project_id left join project_name_info as pni on plb.project_name_id = pni.id + left join project_year_name_info as pyni on plb.year_name_id=pyni.id ) tmp_tb order by create_time desc diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java index ff7746e6f..51f147836 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java @@ -67,4 +67,5 @@ public interface IParamsReportEOService extends IService { ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId, Integer version); + boolean setProjectNameAndTitle(List oldParamsManifestIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index b53905e06..20b992308 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -3,13 +3,15 @@ package com.jero.modules.cert.report.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; +import com.jero.modules.cert.collect.vo.ParamsManifestVO; import com.jero.modules.cert.report.entity.ParamsReportEO; import com.jero.modules.cert.report.mapper.ParamsReportEOMapper; import com.jero.modules.cert.report.service.IParamsReportEOService; -import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,6 +27,9 @@ public class ParamsReportEOServiceImpl extends ServiceImpl oldParamsManifestIdList) { + List updateEOList = new ArrayList<>(); + + List paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList); + paramsManifestEOList.forEach(paramsManifestVO -> { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, paramsManifestVO.getId()) + .eq(ParamsReportEO::getVersion, paramsManifestVO.getVersion()); + ParamsReportEO paramsReportEO = getOne(queryWrapper); + + ParamsReportEO updateEO = new ParamsReportEO(); + updateEO.setId(paramsReportEO.getId()); + updateEO.setTitle(paramsManifestVO.getTitle()); + updateEO.setProjectName(paramsManifestVO.getProjectName()); + + updateEOList.add(updateEO); + }); + + return updateBatchById(updateEOList); + } }