Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -200,7 +200,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 			String cid = projectRecords.getWorkContractInfo().getId();
 			WorkContractInfo workContractInfo = contractInfoService.get(cid);
 			WorkClientInfo workClientInfo = new WorkClientInfo();
-			if(null != workContractInfo){
+			/*if(null != workContractInfo){
 				workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 				workContractInfo.setClient(workClientInfo);
 				projectRecords.setWorkContractInfo(workContractInfo);
@@ -208,7 +208,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 				WorkContractInfo workContract = new WorkContractInfo();
 				workContract.setClient(workClientInfo);
 				projectRecords.setWorkContractInfo(workContract);
-			}
+			}*/
 		}
 		return projectRecords;
 	}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -1082,7 +1082,22 @@ public class WorkInvoiceTwoController extends BaseController {
 		map.put("areaName",projectRecords.getArea().getName());//项目地区名称
 		map.put("projectNum",projectRecords.getProjectId());//项目编号
 		map.put("reportDataNum",projectRecords.getReportData().getNumber());//报告号
-		if(projectRecords.getWorkContractInfo() == null || null == projectRecords.getWorkContractInfo().getClient() || StringUtils.isBlank(projectRecords.getWorkContractInfo().getClient().getName())){
+
+		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+			String id = projectRecords.getWorkContractInfo().getId();
+			WorkContractInfo workContractInfo = workContractInfoService.get(id);
+			if(workContractInfo!=null){
+				String oid = workContractInfo.getChargeCompany();
+				Office office = officeService.get(oid);
+				if(office!=null){
+					map.put("officeName",office.getTopCompany());//部门
+					map.put("officeId",office.getId());//部门
+				}
+			}
+			
+			projectRecords.setWorkContractInfo(workContractInfo);
+		}
+		if(projectRecords.getWorkContractInfo() == null){
 			//无合同状态下，获取委托方的名称
 			projectRecordsService.queryLinkmanInfos(projectRecords);
 			if (projectRecords.getWorkClientLinkmanList() != null && projectRecords.getWorkClientLinkmanList().size() > 0) {
@@ -1090,19 +1105,10 @@ public class WorkInvoiceTwoController extends BaseController {
 				map.put("clientName",linkman.getClientId().getName());//委托方
 			}
 		}else{
-			map.put("clientName",projectRecords.getWorkContractInfo().getClient().getName());//委托方
+			map.put("clientName",projectRecords.getWorkContractInfo().getClientName());//委托方
 		}
 		map.put("workContractName",projectRecords.getWorkContractInfo().getName());//合同名称
-		String id = projectRecords.getWorkContractInfo().getId();
-		WorkContractInfo workContractInfo = workContractInfoService.get(id);
-		if(workContractInfo!=null){
-			String oid = workContractInfo.getChargeCompany();
-			Office office = officeService.get(oid);
-			if(office!=null){
-				map.put("officeName",office.getTopCompany());//部门
-				map.put("officeId",office.getId());//部门
-			}
-		}
+
 		return JsonMapper.toJsonString(map);
 	}
 	/**

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -1050,8 +1050,7 @@
 		<include refid="projectRecordsColumns"/>
 		,
 		wci.name AS "workContractInfo.name",
-		wct.id AS "workContractInfo.client.id",
-		wct.name AS "workContractInfo.client.name",
+		wci.clientName AS "workContractInfo.clientName",
 		o.top_company AS "office.name",
 		dsu.name as "projectRegistrant",
 		prd.number as "reportData.number",

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -1839,7 +1839,7 @@
 		  rpr.project_id as 'projectNum',
 		  wci.name as 'workContractName',
 		  prd.number as 'reportDataNum',
-		  wct.name as 'clientName'
+		  wci.clientName as 'clientName'
 		from work_invoice_project_relation a
 		left join rural_project_records rpr on a.project_id = rpr.id
 		left join work_contract_info wci on rpr.contract_id = wci.id

src/main/webapp/webpage/modules/sys/gridinvoiceproject.jsp

@@ -407,7 +407,7 @@
 														<td class="codenumber">${obj.reportData.number}</td>
 														<td class="codelabel">${obj.projectRegistrant}</td>
 														<td class="codelabel">${obj.leaderNameStr}</td>
-														<td class="codelabel">${obj.workContractInfo.client.name}</td>
+														<td class="codelabel">${obj.workContractInfo.clientName}</td>
 														<td class="codelabel">${obj.invoiceFlag}</td>
 													</tr>
 												</c:forEach>

src/main/webapp/webpage/modules/sys/gridselectcallprojectOnReimbur.jsp

@@ -221,7 +221,7 @@
 									<td class="codeprojectId">${obj.projectId}</td>
 									<td class="codeCName">${obj.workContractInfo.name}</td>
 									<td class="codenumber">${obj.reportData.number}</td>
-									<td class="codeCCName">${obj.workContractInfo.client.name}</td>
+									<td class="codeCCName">${obj.workContractInfo.clientName}</td>
 								</tr>
 							</c:forEach>
 						</c:when>