Эх сурвалжийг харах

解决档案系统文件同步失败的问题(路径无法访问,获取pdf页数时报错)

lvy 3 өдөр өмнө
parent
commit
f86c8a7906

+ 3 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/InformationQueryClient.java

@@ -90,6 +90,9 @@ public interface InformationQueryClient {
     @PostMapping(API_PREFIX + "/getInformationByContractId")
     List<InformationQuery> getInformationByContractId(@RequestParam Long contractId,@RequestParam Integer classify);
 
+    @PostMapping(API_PREFIX + "/getInformationByContractIdAndApprovedStatus")
+    List<InformationQuery> getInformationByContractIdAndApprovedStatus(@RequestParam Long contractId,@RequestParam Integer classify);
+
     @PostMapping(API_PREFIX + "/getInformationByContractId1")
     void getInformationByContractId1(Long contractId);
 

+ 4 - 0
blade-service/blade-business/src/main/java/org/springblade/business/feignClient/InformationQueryClientImpl.java

@@ -116,6 +116,10 @@ public class InformationQueryClientImpl implements InformationQueryClient {
     public List<InformationQuery> getInformationByContractId(Long contractId, Integer classify) {
         return informationQueryMapper.getInformationByContractId(contractId,classify);
     }
+    @Override
+    public List<InformationQuery> getInformationByContractIdAndApprovedStatus(Long contractId, Integer classify) {
+        return informationQueryMapper.getInformationByContractIdAndApprovedStatus(contractId,classify);
+    }
 
     @Override
     public void getInformationByContractId1(Long contractId) {

+ 1 - 0
blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.java

@@ -142,6 +142,7 @@ public interface InformationQueryMapper extends BaseMapper<InformationQuery> {
     List<InformationQuery> selectChildrenNodeInfo(@Param("ids") List<Long> removeList);
 
     List<InformationQuery> getInformationByContractId(@Param("contractId") Long contractId, @Param("classify")Integer classify);
+    List<InformationQuery> getInformationByContractIdAndApprovedStatus(@Param("contractId") Long contractId, @Param("classify")Integer classify);
 
     List<TabBusstimeInfo> getTabussTimeInfo(@Param("tables") List<String> tables);
 

+ 12 - 0
blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -990,6 +990,18 @@
         where is_deleted = 0
           and contract_id = #{contractId} and classify = #{classify} and status in(0,1,2) and is_deleted = 0;
     </select>
+    <select id="getInformationByContractIdAndApprovedStatus" resultMap="informationQueryResultMap">
+        select id,
+               wbs_id,
+               name,
+               e_visa_pdf_url,
+               business_time,
+               classify,
+               e_visa_pdf_page,
+               e_visa_pdf_size,
+               node_pdf_url
+        from u_information_query where is_deleted = 0 and contract_id = #{contractId} and classify = #{classify} and status = 2 and is_deleted = 0;
+    </select>
 
     <select id="getTabussTimeInfo" resultMap="tabBusstimeInfoResultMap">
         select * from m_tab_busstime_info where is_deleted = 0

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -742,7 +742,7 @@ public class ArchiveTreeContractSyncImpl {
         //获取某个合同段所有的电签完成的文件题名,取 id wbsid name,eVisaPdfUrl
 //        List<InformationQuery> informationQueryList = new ArrayList<>();
       //  informationQueryClient.getInformationByContractId1(contractId);
-        List<InformationQuery> informationQueryList = informationQueryClient.getInformationByContractId(contractId,classify);
+        List<InformationQuery> informationQueryList = informationQueryClient.getInformationByContractIdAndApprovedStatus(contractId,classify);
         return informationQueryList;
 
         //互殴去
@@ -862,7 +862,7 @@ public class ArchiveTreeContractSyncImpl {
                 pdfSize = CommonUtil.getResourceLength(archiveFile.getPdfFileUrl());
                 archiveFile.setFileSize(pdfSize);
                 archiveFile.setFilePage(Integer.valueOf(pdfPage));
-            } catch (IOException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }