Browse Source

归档修改

user5 2 years ago
parent
commit
18fb14233d

+ 2 - 2
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -6051,8 +6051,8 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
 					if(null != workContractInfo){
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-						model.addAttribute("workClientInfo", clientInfo);
+						/*WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						model.addAttribute("workClientInfo", clientInfo);*/
 						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
 							//收费标准
 							String [] biao=workContractInfo.getChargeCriterion().split(",");

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -385,7 +385,7 @@
 								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label ">客户名称:</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
+										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">