From d4c86d08aaf49d41b10c1ac4ae4aab967a3f625f Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 6 Jul 2022 16:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9-=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 15 +++++++++ .../ParamsReportDetailEOController.java | 32 +++++++++++++++++- .../service/IParamsReportDetailEOService.java | 3 ++ .../impl/ParamsReportDetailEOServiceImpl.java | 33 ++++++++++++++----- 4 files changed, 74 insertions(+), 9 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index fa6abf466..0ded1e880 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -182,3 +182,18 @@ ALTER TABLE `laws_weilai`.`params_report_config` -- 法规意见收集添加字段 文档库/标准id ALTER TABLE `laws_opinion_gather` ADD COLUMN `stand_id` varchar(64) NULL COMMENT '文档库/标准id' AFTER `acti_proc_inst_id`; + +-- 上报库导出历史表 +CREATE TABLE `params_report_export_history` ( + `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 '所属部门', + `params_manifest_id` varchar(50) DEFAULT NULL COMMENT '上报库id', + `export_type` varchar(50) DEFAULT NULL COMMENT '导出类型', + `export_time` datetime DEFAULT NULL COMMENT '导出时间', + `export_file_id` varchar(50) DEFAULT NULL COMMENT '导出文件id', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 51494c3c4..718155cc4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -96,7 +96,7 @@ public class ParamsReportDetailEOController extends JeroController getConfigLableListCustom(ParamsReportDetailVO paramsReportDetailVO) { + List> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO); + return Result.OK(configLabelList); + } + + /** + * 导出模板下拉选项 + * + * @param + * @return + */ + @AutoLog(value = "上报库参数项-导出模板下拉选项") + @ApiOperation(value="上报库参数项-导出模板下拉选项", notes="上报库参数项-导出模板下拉选项") + @GetMapping(value = "/getTemplateLabelList") +// @RequiresPermissions("report:detail:export:custom") + public Result getTemplateLabelList() { + List> templateLabelList = paramsReportDetailEOService.getTemplateLabelList(); + return Result.OK(templateLabelList); + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index b9150f5f5..6c65c50d2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -40,4 +40,7 @@ public interface IParamsReportDetailEOService extends IService> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO); + + // 导出模板下拉选项 + List> getTemplateLabelList(); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index f31c090aa..18b71515c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -18,16 +18,10 @@ import com.jero.modules.cert.collect.entity.*; import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; -import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; -import com.jero.modules.cert.report.entity.ParamsReportConfigEO; -import com.jero.modules.cert.report.entity.ParamsReportDetailEO; -import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; +import com.jero.modules.cert.report.entity.*; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; -import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; -import com.jero.modules.cert.report.service.IParamsReportConfigEOService; -import com.jero.modules.cert.report.service.IParamsReportDetailEOService; -import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService; +import com.jero.modules.cert.report.service.*; import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.document.enums.FieldTypeEnum; @@ -647,6 +641,29 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> getTemplateLabelList() { + // 查询所有导出模板 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime); + List paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper); + + List> templateLabelList = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(paramsExportTemplateEOList)) { + for (ParamsExportTemplateEO paramsExportTemplateEO : paramsExportTemplateEOList) { + Map map = new HashMap<>(); + map.put("label", paramsExportTemplateEO.getTemplateName()); + map.put("value", paramsExportTemplateEO.getId()); + templateLabelList.add(map); + } + } + + return templateLabelList; + } + private void downLoadFileList(List allRelevFileList,String fileNowPath) { File nowFile = new File(fileNowPath); if (nowFile.exists()){