Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -37,6 +37,10 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientLinkmanDao;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontent.web.WorkContentTypeController;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
@@ -104,6 +108,10 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 	private SerialNumTplService serialNumTplService;
 	@Autowired
 	private ProjectReportNumService projectReportNumService;
+	@Autowired
+	private WorkClientLinkmanDao workClientLinkmanDao;
+	@Autowired
+	private WorkClientInfoService workClientInfoService;
 
 	public ProjectReportData get(String id) {
 		ProjectReportData projectReportData = super.get(id);
@@ -253,6 +261,15 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 			String projectMaster = projectRecordsService.getMasterStr(projectReportDatas.getProject().getId());
 			projectReportDatas.setProjectMaster(projectMaster);
 		}
+		if(StringUtils.isBlank(projectReportDatas.getClientName())){
+			List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectReportDatas.getProject().getId(), 1);
+			if(null != clientLinkmanList){
+				for(WorkClientLinkman linkman :clientLinkmanList){
+					WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());
+					projectReportDatas.setClientName(clientInfo.getName());
+				}
+			}
+		}
 		return projectReportDatas;
 	}