diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java new file mode 100644 index 00000000..7fac0233 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.ImportExcelDatas.comment; + +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +@Component +public class ExclExport extends ExclErrorOut { + + + /** + * 导出多个sheet页的excl + */ + public Workbook exportData(Map> dataMap, String header) { + Workbook workbook=new XSSFWorkbook(); + + try { + for (Map.Entry> entry : dataMap.entrySet()) { + List datas = entry.getValue(); + Sheet sheet = workbook.createSheet(entry.getKey()); + super.createHeader(workbook,sheet,header); + super.createDatas(workbook,sheet,datas); + + } + } catch (Exception e) { + e.printStackTrace(); + } + + return workbook; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index f8cfa34b..dcbc369e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -40,9 +40,9 @@ public class SarModelTreeController extends BaseController { @ApiOperation("查询父所有资源") @GetMapping("/list") - public ResponseMessage> getAll(SarModelTree sarVppsTree){ -// List tsResources = iSarModelTreeService.getAll(sarVppsTree); - List tsResources = iSarModuleTreeService.getAll(sarVppsTree); + public ResponseMessage> getAll(){ + List tsResources = iSarModelTreeService.getAll(null); +// List tsResources = iSarModuleTreeService.getAll(null); return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index e9af7d73..341c2033 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -2226,8 +2226,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl - stand_year,dicapplyCountry.DIC_TYPE_NAME as applyCountryShow,dicstandSort.DIC_TYPE_NAME as standSortShow, - dicstandNature.DIC_TYPE_NAME as standNatrueShow,SAR_BUSSIONESS_STAND.modify_time, + SAR_BUSSIONESS_STAND.modify_time, SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort, stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, - stand_name, stand_code,SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME as standStatusShow,SAR_BUSSIONESS_STAND.text_status_buss + stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss - stand_year,dicapplyCountry.DIC_TYPE_NAME,dicstandSort.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,SAR_BUSSIONESS_STAND.modify_time, - SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, - SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature, - SAR_BUSSIONESS_STAND.stand_sort, stand_status, replaced_stand_num, replace_stand_num,put_time, issue_time, stand_en_name, stand_name, stand_code, - SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME + SAR_BUSSIONESS_STAND.id @@ -354,10 +349,6 @@ - left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) - left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) - left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) @@ -584,14 +575,7 @@ - left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is - not null and dicountry.valid_flag = 0) - left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) - left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and - dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status AND dicstandTextStatus.dic_id IS NOT NULL @@ -555,19 +545,6 @@ (select tmp_tb.* from (select ,SAR_STAND_ATTR_INFO.CHJL AS CHJL, - (case WHEN dicstandState.DIC_TYPE_NAME = '草稿' THEN 1 - WHEN dicstandState.DIC_TYPE_NAME = '征求意见稿' THEN 2 - WHEN dicstandState.DIC_TYPE_NAME = '送审稿' THEN 3 - WHEN dicstandState.DIC_TYPE_NAME = '报批稿' THEN 4 - WHEN dicstandState.DIC_TYPE_NAME = '发布稿' THEN 5 - WHEN dicstandState.DIC_TYPE_NAME = '已实施' THEN 6 - WHEN dicstandState.DIC_TYPE_NAME = '计划修订' THEN 7 - WHEN dicstandState.DIC_TYPE_NAME = '修订中' THEN 8 - WHEN dicstandState.DIC_TYPE_NAME = '已修订' THEN 9 - WHEN dicstandState.DIC_TYPE_NAME = '已作废' THEN 10 - WHEN dicstandState.DIC_TYPE_NAME IS NULL THEN 11 - WHEN dicstandState.DIC_TYPE_NAME ='' THEN 11 - END) AS paixu, ( CASE WHEN ZCCSSRQ = 'TBD' THEN '6999-01-01' @@ -746,14 +723,6 @@ select from SAR_STANDARDS_INFO - left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is - not null and dicountry.valid_flag = 0) - left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) - left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and - dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status AND dicstandTextStatus.dic_id IS NOT NULL @@ -869,14 +838,6 @@ (select ,SAR_STAND_ATTR_INFO.CHJL AS CHJL from SAR_STANDARDS_INFO - left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is - not null and dicountry.valid_flag = 0) - left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) - left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and - dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index cc34cb29..6ac813bc 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -294,7 +294,7 @@ public class AttFileEOController { String suffix=fileName.substring(fileName.lastIndexOf(".")+1); //只能在pdf中添加水印, //非pdf文件直接下载原文件 - if (suffix.equals("pdf")){ + if (suffix.equals("pdf")||suffix.equals("PDF")){ downloadFilePath=waterFilePath; }else { downloadFilePath=oldFilePath;