Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!204

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<String, List<ImportDto>> dataMap, String header)  {
+        Workbook workbook=new XSSFWorkbook();
+
+        try {
+            for (Map.Entry<String,  List<ImportDto>> entry : dataMap.entrySet()) {
+                List<ImportDto> 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;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java

@@ -40,9 +40,9 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
 
     @ApiOperation("查询父所有资源")
     @GetMapping("/list")
-    public ResponseMessage<List<SarModelTree>> getAll(SarModelTree sarVppsTree){
+    public ResponseMessage<List<SarModelTree>> getAll(){
-//        List<SarModelTree> tsResources = iSarModelTreeService.getAll(sarVppsTree);
+        List<SarModelTree> tsResources = iSarModelTreeService.getAll(null);
-        List<SarModelTree> tsResources = iSarModuleTreeService.getAll(sarVppsTree);
+//        List<SarModelTree> tsResources = iSarModuleTreeService.getAll(null);
         return Result.success(tsResources);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -2226,8 +2226,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //                    String readFilePath = "E:\\上汽企标流程总览.pdf";
                     try {
                         // 判断文件是docx还是PDF
-                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")|| attFileEO.getFileSuffix().equals("DOC")|| attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
-                            if(attFileEO.getFileSuffix().equals("doc")){
+                            if(attFileEO.getFileSuffix().equals("doc")||attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC")|| attFileEO.getFileSuffix().equals("DOCX")){
                                 FileInputStream fis = new FileInputStream(readFilePath);
                                 WordExtractor wordExtractor = new WordExtractor(fis);
                                 String txt = wordExtractor.getText();

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -45,22 +45,17 @@
      put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort,text_status_buss
   </sql>
     <sql id="Base_Column_List_show" >
-     stand_year,dicapplyCountry.DIC_TYPE_NAME as applyCountryShow,dicstandSort.DIC_TYPE_NAME as standSortShow,
+        SAR_BUSSIONESS_STAND.modify_time,
-     dicstandNature.DIC_TYPE_NAME as standNatrueShow,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
   </sql>
 
     <sql id="Group_Column_List_show" >
-    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
   </sql>
 
 
@@ -354,10 +349,6 @@
 
     <!-- 分页查询条件 -->
     <sql id="SarBussionInfo_Where_Clause">
-        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 @@
     <select id="getBussionessStandInfoPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
         select * from
         (select tmp_tb.*  from
-        (select <include refid="Base_Column_List_show" />,
+        (select <include refid="Base_Column_List_show" />
-        (case WHEN dicstandStatus.DIC_TYPE_NAME = '已发布' THEN 1
-        WHEN dicstandStatus.DIC_TYPE_NAME = '计划修订' THEN 2
-        WHEN dicstandStatus.DIC_TYPE_NAME = '修订中' THEN 3
-        WHEN dicstandStatus.DIC_TYPE_NAME = '已修订' THEN 4
-        WHEN dicstandStatus.DIC_TYPE_NAME = '被替代' THEN 5
-        WHEN dicstandStatus.DIC_TYPE_NAME = '废止' THEN 6
-        WHEN dicstandStatus.DIC_TYPE_NAME IS NULL THEN 7 END) AS paixu
         from SAR_BUSSIONESS_STAND
         <include refid="SarBussionInfo_Where_Clause"/>
         GROUP BY <include refid="Group_Column_List_show"/>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -60,8 +60,7 @@
      SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
      SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
      concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
-     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow,
+     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
-     dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
   </sql>
 
     <sql id="Group_Column_List_Show">
@@ -69,8 +68,7 @@
      SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
      SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
      concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
-     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME,
+     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicstandTextStatus.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
-     dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,dicstandTextStatus.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
   </sql>
 
     <!-- 查询条件 -->
@@ -372,14 +370,6 @@
     </select>
 
     <sql id="SarStandardsInfo_Where_Clause">
-        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
         <include refid="Base_Column_List_Show"/>,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
         <include refid="Base_Column_List_Show"/>
         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
         <include refid="Base_Column_List_Show"/>,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)

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;