Prechádzať zdrojové kódy

新增质量复核问题

[user3] 4 rokov pred
rodič
commit
f305d7e5b2

+ 14 - 3
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -27,6 +27,7 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
@@ -511,7 +512,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 		}*/
 		//添加项目工作内容表
-		Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
+		Projectcontentinfo projectcontentinfo = null;
+		if(StringUtils.isNotBlank(projectRecords.getId())){
+			projectcontentinfo = projectcontentinfoDao.getByProjectId(projectRecords.getId());
+		}
+		if (null==projectcontentinfo){
+			projectcontentinfo = new Projectcontentinfo();
+		}
 		projectcontentinfo.setProjectOnRural(projectRecords);
 		projectcontentinfo.setCompanyId(projectRecords.getCompany().getId());
 		projectcontentinfo.setOfficeId(projectRecords.getOffice().getId());
@@ -519,8 +526,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		projectcontentinfo.setParentIds("0,");
 		projectcontentinfo.setParent(new Projectcontentinfo("0"));
 		projectcontentinfo.setName(projectRecords.getProjectId());
-		projectcontentinfo.preInsert();
-		projectcontentinfoDao.insertOnRural(projectcontentinfo);
+		if (StringUtils.isNotBlank(projectcontentinfo.getId())){
+			projectcontentinfoDao.update(projectcontentinfo);
+		}else{
+			projectcontentinfo.preInsert();
+			projectcontentinfoDao.insertOnRural(projectcontentinfo);
+		}
 		logger.info("保存项目耗时:{}ms;启动流程耗时:{}ms",t4-t1,System.currentTimeMillis()-t4);
 	}