无法导入合享excel文件，专利号导入无效分析对比文件

PAS/src/main/java/cn/cslg/pas/common/model/vo/ProjectImportVO.java

@@ -10,7 +10,7 @@ public class ProjectImportVO extends BaseVO {
     private String createName;
     private List<Integer> createIds;
     private Integer tenantId;
-
+    private Integer asCompare;
     /**
      * 多个专利号，以 ",|，" 分隔
      */
@@ -29,4 +29,5 @@ public class ProjectImportVO extends BaseVO {
      */
     private Integer productId;
 
+
 }

PAS/src/main/java/cn/cslg/pas/common/utils/ExcelUtils.java

@@ -12,9 +12,11 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 
 public class ExcelUtils {
 
@@ -162,4 +164,20 @@ public class ExcelUtils {
         cellStyle.setBorderRight(BorderStyle.THIN);
         cellStyle.setBorderTop(BorderStyle.THIN);
     }
+    public static String getValue(Cell cell) {
+        if (cell != null) {
+            if (cell.getCellType() == CellType.NUMERIC && HSSFDateUtil.isCellDateFormatted(cell)) {
+                Date date = cell.getDateCellValue();
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                String dateString = dateFormat.format(date);
+            return dateString;
+            }
+            else{
+                return cell.toString();
+            }
+        }
+        return "";
+    }
+
+
 }

PAS/src/main/java/cn/cslg/pas/common/utils/ReadExcelUtils.java

@@ -121,7 +121,7 @@ public class ReadExcelUtils {
         //获得总列数
         int columns = firstRow.getLastCellNum();
         for (int i = 0; i < columns; i++) {
-            map.put(firstRow.getCell(i) + "", needRow.getCell(i) + "");
+            map.put(firstRow.getCell(i) + "", ExcelUtils.getValue(needRow.getCell(i)) + "");
         }
 
         //开始装载专利摘要附图（判断用07还是03的方法获取图片）

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -124,7 +124,8 @@ public class ProjectImportController {
                 .setProjectId(patentDTO.getProjectId())
                 .setReportId(patentDTO.getReportId())
                 .setProductId(patentDTO.getProductId())
-                .setConditions(patentDTO.getPatentNo());
+                .setConditions(patentDTO.getPatentNo())
+                .setAsCompare(patentDTO.getAsCompare());
         uploadTaskService.addPatentNoTask(taskAddNewDTO);
         return Response.success();
     }

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/ExcuteDataToVOService.java

@@ -31,9 +31,8 @@ public class ExcuteDataToVOService {
         Map<Object, Object> patentMap = patentData.getMap();
         //取出专利摘要附图
         PictureData pictureData = patentData.getPictureData();
-
         //专利基础数据装配（与数据源配置文件对象进行匹配装载）
-        UploadParamsVO uploadParamsVO = UploadPatentBatchUtil.processData(patentMap, jsonData);
+        UploadParamsVO uploadParamsVO = UploadPatentBatchUtil.processData(patentMap,jsonData);
         uploadParamsVO.setPictureData(pictureData);
         return uploadParamsVO;
     }

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/PantentQueueService.java

@@ -577,7 +577,8 @@ public class PantentQueueService {
                 if (queueData.getTask().getProjectId() != null && !queueData.getTask().getProjectId().equals(0)) {
                     //与专题库关联入库
                     uploadPatentToDBService.uploadAssoThemaPat(queueData.getUploadParamsVO(), queueData.getTask().getProjectId());
-                } else if (queueData.getTask().getReportId() != null && !queueData.getTask().getReportId().equals(0)) {
+                }
+                else if (queueData.getTask().getReportId() != null && !queueData.getTask().getReportId().equals(0)) {
                     //与报告关联入库（调用报告系统接口）
                     ImportTaskPatent importTaskPatent = new ImportTaskPatent();
                     importTaskPatent.setImportTaskId(queueData.getTask().getId());

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/UploadTaskService.java

@@ -280,7 +280,8 @@ public class UploadTaskService {
                 .setTaskName("多个专利号导入方式任务")
                 .setTaskType(0)
                 .setTaskType2(5)
-                .setIsAddType(2);
+                .setIsAddType(2)
+                   ;
 
         //根据下载的网站类型新增任务
         if (taskAddNewDTO.getTaskType2().equals(3)) {