소스 검색

20250415 dify功能修改

lrj 4 달 전
부모
커밋
bda9492b78
2개의 변경된 파일11개의 추가작업 그리고 6개의 파일을 삭제
  1. 10 6
      src/main/java/cn/cslg/pas/common/utils/ReadExcelUtils.java
  2. 1 0
      src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

+ 10 - 6
src/main/java/cn/cslg/pas/common/utils/ReadExcelUtils.java

@@ -253,22 +253,26 @@ public class ReadExcelUtils {
         //查找列
         int columns = firstRow.getLastCellNum();
         for (int t = 0; t < columns; t++) {
-            if (firstRow.getCell(t).toString().equals("申请号")) {
+            if (firstRow.getCell(t).toString().trim().equals("申请号")) {
                 ANOCellId = t;
             }
-            if (firstRow.getCell(t).toString().equals("公开号")) {
+            if (firstRow.getCell(t).toString().trim().equals("公开(公告)号")) {
                 PNOCellId = t;
             }
         }
         for (int i = 1; i < rows; i++) {
             Row row = sheet.getRow(i);
             if (ANOCellId != null) {
-                String appNo = row.getCell(ANOCellId).toString();
-                appNos.add(appNo);
+                if(row.getCell(ANOCellId)!=null) {
+                    String appNo = row.getCell(ANOCellId).toString();
+                    appNos.add(appNo);
+                }
             }
             if(PNOCellId!=null){
-                String publicNo=row.getCell(PNOCellId).toString();
-                publicNos.add(publicNo);
+                if(row.getCell(PNOCellId)!=null) {
+                    String publicNo = row.getCell(PNOCellId).toString();
+                    publicNos.add(publicNo);
+                }
             }
 
         }

+ 1 - 0
src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -249,6 +249,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                     totalNum += map.get(BusinessUtil.PUBLIC_NO).size();
                     totalNum += map.get(BusinessUtil.APP_NO).size();
                 } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
             importTask.setAllNum(totalNum);