WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-上报库参数项-自定义导出下拉选

Browse Source
This commit is contained in:
liyawei
2022-07-06 16:01:07 +08:00
parent dc9a4b9032
commit d4c86d08aa
4 changed files with 74 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+15
View File
@@ -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;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+31 -1
View File
@@ -96,7 +96,7 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
}
/**
* 冻结配置-下拉选项
* 配置下拉选项(常规导出)
*
* @param paramsReportDetailVO
* @return
@@ -110,4 +110,34 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
return Result.OK(configLabelList);
}
/**
* 配置下拉选项(自定义导出)
*
* @param paramsReportDetailVO
* @return
*/
@AutoLog(value = "上报库参数项-配置下拉选项(自定义导出)")
@ApiOperation(value="上报库参数项-配置下拉选项(自定义导出)", notes="上报库参数项-配置下拉选项(自定义导出)")
@GetMapping(value = "/getConfigLabelListCustom")
// @RequiresPermissions("report:detail:export:custom")
public Result<?> getConfigLableListCustom(ParamsReportDetailVO paramsReportDetailVO) {
List<Map<String, String>> 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<Map<String, String>> templateLabelList = paramsReportDetailEOService.getTemplateLabelList();
return Result.OK(templateLabelList);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+3
View File
@@ -40,4 +40,7 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
// 配置-下拉选项
List<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO);
// 导出模板下拉选项
List<Map<String, String>> getTemplateLabelList();
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+25 -8
View File
@@ -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<ParamsReportDet
return configLabelList;
}
@Autowired
private IParamsExportTemplateEOService paramsExportTemplateEOService;
@Override
public List<Map<String, String>> getTemplateLabelList() {
// 查询所有导出模板
LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime);
List<ParamsExportTemplateEO> paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper);
List<Map<String, String>> templateLabelList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(paramsExportTemplateEOList)) {
for (ParamsExportTemplateEO paramsExportTemplateEO : paramsExportTemplateEOList) {
Map<String, String> map = new HashMap<>();
map.put("label", paramsExportTemplateEO.getTemplateName());
map.put("value", paramsExportTemplateEO.getId());
templateLabelList.add(map);
}
}
return templateLabelList;
}
private void downLoadFileList(List<OSSFile> allRelevFileList,String fileNowPath) {
File nowFile = new File(fileNowPath);
if (nowFile.exists()){