A类项目审核完成后生成报告号后端页面

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

@@ -1324,8 +1324,13 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         projectReportData.setTechnicistDate(new Date());
                         notifyRole = "审批通过";
                         synchronized (SYN_BYTE) {
-                            /*String reportNo = createReportNo(reportData.getConditionType());
-                            projectReportData.setNumber(reportNo);*/
+                            //获取项目信息
+                            RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportData.getProject().getId());
+
+                            if(StringUtils.isBlank(projectReportData.getNumber()) && "2".equals(ruralProjectRecords.getSubmitMoney())){
+                                String reportNo = createReportNo(reportData.getConditionType());
+                                projectReportData.setNumber(reportNo);
+                            }
                             //添加审核通过日期
                             projectReportData.setAuditPassDate(new Date());
                             if(null == projectReportData.getFirstAuditDate()){
@@ -2262,7 +2267,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         ProjectReportData projectReportDataInfo = projectReportDataService.get(projectReportData.getId());
         String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
         String str =  "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
-        if(StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
+        if(null != projectReportDataInfo && StringUtils.isNotBlank(projectReportDataInfo.getNumber())){
             title = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
             str = "报告号："+projectReportDataInfo.getNumber()+"。项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
         }

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

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

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

@@ -361,6 +361,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 //            projectRecords.setProjectStatus(ProjectStatusEnum.IN_APRL.getValue());
             if (!projectRecords.getIsNewRecord()) {//编辑表单保存
                 RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
+				String oldSubmitMoney = t.getSubmitMoney();
 				//if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
 				if("其他".equals(belongingDepartmentName)){
 					t.setBelongingDepartment(belongingDepartmentName);
@@ -384,6 +385,15 @@ public class RuralCostProjectRecordsController extends BaseController {
 					projectPlanList.get(projectPlanList.size()-1).setEndDate(endDate);
 					t.setProjectPlanList(projectPlanList);
 				}
+
+				//查询项目报告信息
+				ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+				//判定 是否将B类项目修改成A类项目
+				if(StringUtils.isNotBlank(projectReportData.getNumber()) && "1".equals(oldSubmitMoney) && "2".equals(projectRecords.getSubmitMoney())){
+					addMessage(redirectAttributes, "无法将已生成报告号的项目从B类修改成A类项目");
+					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+				}
+
 				projectRecordsService.saveProject(t, ProjectStatusEnum.SIGNED);//保存
 				/*}else if(t.getProjectStatus() == 2){
 					addMessage(redirectAttributes, "项目已送审，无法重复送审");

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

@@ -325,6 +325,7 @@ public class RuralProjectRecordsController extends BaseController {
 //            projectRecords.setProjectStatus(ProjectStatusEnum.IN_APRL.getValue());
             if (!projectRecords.getIsNewRecord()) {//编辑表单保存
                 RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
+				String oldSubmitMoney = t.getSubmitMoney();
 				//if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
 					MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 					//判断是否存在项目计划，存在将计划开始时间和计划结束时间进行修改
@@ -342,6 +343,15 @@ public class RuralProjectRecordsController extends BaseController {
 						projectPlanList.get(projectPlanList.size()-1).setEndDate(endDate);
 						t.setProjectPlanList(projectPlanList);
 					}
+
+					//查询项目报告信息
+					ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+					//判定 是否将B类项目修改成A类项目
+					if(StringUtils.isNotBlank(projectReportData.getNumber()) && "1".equals(oldSubmitMoney) && "2".equals(projectRecords.getSubmitMoney())){
+						addMessage(redirectAttributes, "无法将已生成报告号的项目从B类修改成A类项目");
+						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+					}
+
 					projectRecordsService.saveProject(t, ProjectStatusEnum.SIGNED);//保存
 				/*}else if(t.getProjectStatus() == 2){
 					addMessage(redirectAttributes, "项目已送审，无法重复送审");
@@ -356,7 +366,7 @@ public class RuralProjectRecordsController extends BaseController {
 				if (null != workContractInfo){
 					if ( "7".equals(workContractInfo.getContractState()) || "1"==workContractInfo.getDelFlag()){
 						addMessage(redirectAttributes, "该项目选择的合同已被作废或删除");
-						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 					}
 				}
 				//添加查询类型(工程咨询)