合同登记

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

@@ -593,7 +593,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 		}
 		//判断是否需要生成报告号
-		if(projectRecords.getCreateReportFlag()){
+		if(projectRecords.getCreateReportFlag()&&projectStatus!=ProjectStatusEnum.TSTORE){
 			this.createReportDataId(projectRecords);
 		}
 		/*//项目添加报告号

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -291,7 +291,10 @@ public class RuralCostProjectRecordsController extends BaseController {
                 }
             }
             //根据审核人id获取审核人
-            projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+            if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
+
+                projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+            }
         } else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());
@@ -431,7 +434,10 @@ public class RuralCostProjectRecordsController extends BaseController {
             }
         }
         //根据审核人id获取审核人
-        projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+        if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
+
+            projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+        }
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsView";
     }
@@ -544,6 +550,8 @@ public class RuralCostProjectRecordsController extends BaseController {
                 projectRecords.setProjectType("2");
                 projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.TSTORE);//保存
             }
+            //将委托方联系人存入数据库中//将施工方联系人存储数据库中
+            ruralProjectContactPersonService.addNewProjectContactPerson(projectRecords);
             addMessage(redirectAttributes, "暂存项目成功");
         } catch (Exception e) {
             logger.error("暂存项目异常：", e);
@@ -624,7 +632,10 @@ public class RuralCostProjectRecordsController extends BaseController {
             }
         }
         //根据审核人id获取审核人
-        projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+        if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
+
+            projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+        }
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify";
     }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -265,7 +265,10 @@ public class RuralProjectRecordsController extends BaseController {
 				}
 			}
 			//根据审核人id获取审核人
-			projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+			if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
+
+				projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+			}
 		}else {
 		    projectRecords.setCreateBy(UserUtils.getUser());
 		    projectRecords.setCreateDate(new Date());
@@ -330,7 +333,10 @@ public class RuralProjectRecordsController extends BaseController {
 			}
 		}
 		//根据审核人id获取审核人
-		projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+		if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
+
+			projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsView";
 	}
@@ -525,7 +531,10 @@ public class RuralProjectRecordsController extends BaseController {
 			}
 		}
 		//根据审核人id获取审核人
-		projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+		if(StringUtils.isNotBlank(projectRecords.getReviewerPersonId())){
+
+			projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
+		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsAdminModify";
 	}