质量流程单（报告号后面加上’号‘；无合同项目捞取到委托单位）

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -955,7 +955,15 @@ public class WorkFullManageController extends BaseController {
 
 		//获取合同信息
 		WorkContractInfo workContractInfo = workContractInfoService.get(ruralProjectRecords.getWorkContractInfo().getId());
-
+		//无合同状态下，获取委托方的名称
+		if (workContractInfo == null) {
+			projectRecordsService.queryLinkmanInfos(ruralProjectRecords);
+			if (ruralProjectRecords.getWorkClientLinkmanList() != null && ruralProjectRecords.getWorkClientLinkmanList().size() > 0) {
+				WorkClientLinkman linkman = ruralProjectRecords.getWorkClientLinkmanList().get(0);
+				workContractInfo = new WorkContractInfo();
+				workContractInfo.setClient(linkman.getClientId());
+			}
+		}
 		List<RuralReportConsultant> consultants = Lists.newArrayList();
 		//将自己添加到咨询员数据中
 		//根据用户查询技能信息（项目负责人信息）
@@ -1098,7 +1106,7 @@ public class WorkFullManageController extends BaseController {
 		if(StringUtils.isBlank(projectReportData.getNumber())){
 			data.put("number","");
 		}else{
-			data.put("number",projectReportData.getNumber());
+			data.put("number",projectReportData.getNumber()+" 号");
 		}
 		data.put("projectName",ruralProjectRecords.getProjectName());
 		//咨询类别
@@ -1110,7 +1118,11 @@ public class WorkFullManageController extends BaseController {
 			}else{
 				data.put("entrustUnit","");
 			}
-			data.put("contractNumber",workContractInfo.getContractNum());
+			if (StringUtils.isNotBlank(workContractInfo.getContractNum())){
+				data.put("contractNumber",workContractInfo.getContractNum());
+			}else{
+				data.put("contractNumber","");
+			}
 		}else{
 			data.put("entrustUnit","");
 			data.put("contractNumber","");