2/18

src/main/java/cn/cslg/pas/domain/business/AssoProjectFile.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.joda.time.DateTime;
 
+import java.util.Date;
+
 /**
  * <p>
  *     专利数据库/报告文件关联表
@@ -41,5 +43,5 @@ public class AssoProjectFile extends BaseEntity<AssoProjectFile> {
      * 创建时间
      */
     @TableField(value = "create_time")
-    private DateTime createTime;
+    private Date createTime;
 }

src/main/java/cn/cslg/pas/service/business/PatentDigProjectFilesService.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -319,7 +320,9 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
         if (projectId == null) {
             throw new XiaoShiException("projectId为空");
         }
+        //流程id
         Integer processId = queryPatentDigProjectFilesDTO.getProcessId();
+        //任务id
         Integer taskId = queryPatentDigProjectFilesDTO.getTaskId();
         LambdaQueryWrapper<PatentDigProjectFiles> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PatentDigProjectFiles::getProjectId, projectId);
@@ -379,7 +382,7 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
                 patentDigProjectFilesVO.setProjectId(projectId);
                 patentDigProjectFilesVO.setFileGuid(item.getFileGuid());
                 patentDigProjectFilesVO.setCreateId(item.getCreateId());
-                patentDigProjectFilesVO.setCreateTime(item.getCreateTime().toDate());
+                patentDigProjectFilesVO.setCreateTime(item.getCreateTime());
                 patentDigProjectFilesVOS.add(patentDigProjectFilesVO);
             });
         }

src/main/java/cn/cslg/pas/service/business/PatentExportService.java

@@ -136,8 +136,10 @@ public class PatentExportService {
                         PatentConfigVO patentConfigVO = patentConfigVOS.stream().filter(item -> item.getValue().equals(column)).findFirst().orElse(null);
                         String exportClass = patentConfigVO.getExportClass();
                         GetValueImp getValueImp = patentExportFactory.getClass(exportClass);
-                        String reValue = getValueImp.getValue(value);
-                        map.put(patentExportVO.getName(), reValue);
+                        if (getValueImp != null) {
+                            String reValue = getValueImp.getValue(value);
+                            map.put(patentExportVO.getName(), reValue);
+                        }
                     }
                 }
                 //新建一普通行