跟新首次导入项目时的为空查询出错情况

src/main/java/com/jeeplus/modules/sg/information/entity/InformationDto.java

@@ -1,7 +1,9 @@
 package com.jeeplus.modules.sg.information.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
-
+/**
+ * 用于查询模板的导出
+ * */
 public class InformationDto {
 
     //项目定义号

src/main/java/com/jeeplus/modules/sg/information/entity/append.java

@@ -1,7 +1,9 @@
 package com.jeeplus.modules.sg.information.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
-
+/**
+ * 存放导入送审的实体
+ * */
 public class append {
     //项目定义号
     private String projectId;

src/main/java/com/jeeplus/modules/sg/information/mapper/InformationMapper.java

@@ -23,27 +23,37 @@ public interface InformationMapper extends BaseMapper<Information> {
 
     int insertInfor(Information information);
 
-
+    //根据项目定义号，查询
     Information findListById(@Param("projectId") String projectId);
 
-    //    void save(List<Information> entity);
+    //插入\更新项目信息（不包含送审信息），使用replace into根据数据库主键（project_id）判断插入或更新
+    //更新流程，删除该条数据，重新插入
     int saveInfo(@Param("information") List<Information> list);
 
+    //根据项目定义号，项目名称，更新审定日期---暂未使用
     int updateInformationDate(Information information);
 
+    //将所有符合项目定义号、第一次完成时间是null的值，第一次完成时间为当前时间，是否完成修改为是---暂未使用
     int updateDate(List<Material> material);
 
+    //根据项目定义号与项目名称查询---暂未使用
     Information findInformationByID(Information information);
 
+    //导入送审更新
     int updateAppend(List<append> list);
 
+    //根据导入查询文件导出物料清单
     List<Material> allNoBack(List<Information> list);
 
+    //根据页面查询导出物料清单
     List<Material> allNo(List<Information> list);
 
+    //根据导入查询文件导出项目清单
     List<Information> exportInfor(List<Information> list);
 
+    //根据页面查询导出项目清单
     List<Information> export(List<Information> list);
 
+    //根据页面得到项目定义号
     List<Information> findIdByList(List<Information> list);
 }

src/main/java/com/jeeplus/modules/sg/information/service/InformationService.java

@@ -94,15 +94,8 @@ public class InformationService extends CrudService<InformationMapper, Informati
 	public int updateDate(List<Material> material){
 		return informationMapper.updateDate(material);
 	}
-/*	@Transactional(readOnly = false)
-	public void insert(List<Information> entity) {
-		for (int i = 0; i < entity.size(); i++) {
-			if (entity.get(i).getIsNewRecord()) {
-				entity.get(i).preInsert();
-			}
-		}
-		informationMapper.save(entity);
-	}*/
+
+
 
 	public Information findListById(String projectId){
 		return informationMapper.findListById(projectId);

src/main/java/com/jeeplus/modules/sg/information/utils/ImportInformation.java

@@ -211,20 +211,24 @@ public  class ImportInformation {
                 }
                 if (projectType.equals("配网建设改造项目")||projectType.equals("配网专项成本")){
                     Information inforById = informationService.findListById(projectId.toString());
-                    if (inforById.getFirstFinish() != null || inforById.getFirstFinish()!="") {
-                        information.setFirstFinish(inforById.getFirstFinish());
-                    }else{
+                    if (inforById != null) {
+                        if (inforById.getFirstFinish() != null || inforById.getFirstFinish() != "") {
+                            information.setFirstFinish(inforById.getFirstFinish());
+                        } else {
+                            information.setFirstFinish(firstFinish);
+                        }
+                        if (inforById.getFirstFinishDate() != null) {
+                            information.setFirstFinishDate(inforById.getFirstFinishDate());
+                        }
+                        if (inforById.getSecondFinish() != null || inforById.getSecondFinish() != "") {
+                            information.setSecondFinish(inforById.getSecondFinish());
+                        }
+                        if (inforById.getSecondFinishDate() != null) {
+                            information.setSecondFinishDate(inforById.getSecondFinishDate());
+                        }
+                    } else {
                         information.setFirstFinish(firstFinish);
                     }
-                    if (inforById.getFirstFinishDate() != null) {
-                        information.setFirstFinishDate(inforById.getFirstFinishDate());
-                    }
-                    if (inforById.getSecondFinish() != null || inforById.getSecondFinish()!="") {
-                        information.setSecondFinish(inforById.getSecondFinish());
-                    }
-                    if (inforById.getSecondFinishDate() != null) {
-                        information.setSecondFinishDate(inforById.getSecondFinishDate());
-                    }
                     Object projectGrade = ei.getCellValue(row, 4);
                     Object projectYear = ei.getCellValue(row, 6);
                     Object projectTotal = ei.getCellValue(row, 7);

src/main/java/com/jeeplus/modules/sg/material/service/MaterialService.java

@@ -54,17 +54,7 @@ public class MaterialService extends CrudService<MaterialMapper, Material> {
 		entity.preInsert();
 		materialMapper.insert(entity);
 	}
-	/*
-	@Transactional(readOnly = false)
-	public void insert(List<Material> entity) {
-		for (int i = 0; i < entity.size(); i++) {
-			if (entity.get(i).getIsNewRecord()) {
-				entity.get(i).preInsert();
-			}
-		}
-		materialMapper.save(entity);
-	}
-*/
+
 
 	@Transactional(readOnly = false)
 	public void saveMater(List<Material> entity) {