项目批次归档

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -219,15 +219,18 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             //获取归档批次信息
             //项目归档批次
             ProjectFilingbatchRelation relation=filingbatchRelationDao.getProjectId(records.getId());
-            if(relation!=null && StringUtils.isNotBlank(relation.getId())){
+            if(null != relation && StringUtils.isNotBlank(relation.getId())){
                 records.setFilingBatch(relation.getFilingBatch());
                 records.setFilingProjectStatus(relation.getStatus());
                 records.setBoxNum(relation.getBoxNum());
                 records.setReBoxNum(relation.getReBoxNum());
+                //查询批次流程状态
                 ProjectFilingBatch filingBatch=projectFilingBatchDao.findByFilingBatch(relation.getFilingBatch());
-                records.setFilingBatchId(filingBatch.getId());
-                records.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
-                records.setFilingStatus(filingBatch.getFilingStatus());
+                if(null != filingBatch){
+                    records.setFilingBatchId(filingBatch.getId());
+                    records.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
+                    records.setFilingStatus(filingBatch.getFilingStatus());
+                }
             }
             //判定 如果项目上报信息超期 并且没有上报则江状态改为超期未上报
             /*if(records.getReportedType().equals("1") && !records.getReportedState().equals("5") && !records.getReportedState().equals("7") && null != records.getAuditPassDate()){
@@ -271,9 +274,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 projectRecordTreeData.setBoxNum(relation.getBoxNum());
                 projectRecordTreeData.setReBoxNum(relation.getReBoxNum());
                 ProjectFilingBatch filingBatch=projectFilingBatchDao.findByFilingBatch(relation.getFilingBatch());
-                projectRecordTreeData.setFilingBatchId(filingBatch.getId());
-                projectRecordTreeData.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
-                projectRecordTreeData.setFilingStatus(filingBatch.getFilingStatus());
+                if(null != filingBatch){
+                    projectRecordTreeData.setFilingBatchId(filingBatch.getId());
+                    projectRecordTreeData.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
+                    projectRecordTreeData.setFilingStatus(filingBatch.getFilingStatus());
+                }
             }else{
                 projectRecordTreeData.setFilingStatus(0);
                 projectRecordTreeData.setFilingProjectStatus(0);