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

@@ -241,15 +241,13 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 			office.setId(workContractInfo.getChargeCompany());
         }else{
         	//无合同
-//			WorkClientLinkman workClientLinkman = projectRecords.getWorkClientLinkmanList().get(0);
-//			workClientInfo = workClientInfoService.get(workClientLinkman.getClientId());
-			company.setId(UserUtils.getUser().getComId());
+			company.setId(UserUtils.getUser().getCompany().getId());
 			office.setId(UserUtils.getUser().getOffice().getId());
 		}
 		projectRecords.setCompany(company);
 		projectRecords.setOffice(office);
 
-        Integer oldStatus = projectRecords.getProjectStatus();
+		Integer oldStatus = projectRecords.getProjectStatus();
         projectRecords.setProjectStatus(projectStatus.getValue());
         User createBy = projectRecords.getCreateBy();
 		if(createBy != null){

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -98,7 +98,21 @@ public class ProjectRecordsController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-		Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords); 
+		Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords);
+        //无合同状态下，获取委托方的名称
+		List<ProjectRecords> list = page.getList();
+		for (int i = 0; i < list.size(); i++) {
+			ProjectRecords records1 = list.get(i);
+			if (records1.getWorkContractInfo() == null) {
+				projectRecordsService.queryLinkmanInfos(records1);
+				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+					WorkContractInfo contractInfo = new WorkContractInfo();
+					contractInfo.setClient(linkman.getClientId());
+					records1.setWorkContractInfo(contractInfo);
+				}
+			}
+		}
 		model.addAttribute("page", page);
 		return "modules/projectrecord/projectRecordsList";
 	}
@@ -154,7 +168,7 @@ public class ProjectRecordsController extends BaseController {
             } else {//新增表单保存
                 projectRecordsService.saveProject(projectRecords,ProjectStatusEnum.IN_APRL);//保存
             }
-            addMessage(redirectAttributes, "保存项目成功");
+			addMessage(redirectAttributes, "保存项目成功");
         }catch (Exception e){
 		    logger.error("保存项目异常：",e);
             addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
@@ -574,17 +588,6 @@ public class ProjectRecordsController extends BaseController {
         }
     }
 
-//    /**
-//     * 无合同状态下，输入联系人，查询系统中是否有此联系人
-//     * @param workClientLinkman
-//     * @return
-//     */
-//    @ResponseBody
-//    @RequestMapping("queryLinkMan")
-//    public WorkClientLinkman queryLinkMan(WorkClientLinkman workClientLinkman){
-//        return  projectRecordsService.getLinkMan(workClientLinkman);
-//    }
-
     /**
      * 项目登记新增客户管理
      */
@@ -607,25 +610,33 @@ public class ProjectRecordsController extends BaseController {
 			map.put("linkName",linkman.getName());
 			map.put("linkMobile",linkman.getLinkMobile());
 			map.put("linkPhone",linkman.getLinkPhone());
+			map.put("str","保存信息成功！");
         }catch (Exception e){
             e.printStackTrace();
         }
 		return map;
     }
 
-    @ResponseBody
+	/**
+	 *选择合同-Ajax自动映射联系人
+	 * @param clientId
+	 * @return
+	 */
+	@ResponseBody
 	@RequestMapping(value = "getLinkManByClientId")
     public Map<String, Object> queryWorkClientLinkMen(String clientId){
 		WorkClientLinkman linkman = workClientInfoService.queryLinkManByClientId(clientId);
-		WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
-		Map<String,Object> map = new HashMap<>();
-		map.put("id",linkman.getId());
-		map.put("clientId",workClientInfo.getId());
-		map.put("clientName",workClientInfo.getName());
-		map.put("linkName",linkman.getName());
-		map.put("linkMobile",linkman.getLinkMobile());
-		map.put("linkPhone",linkman.getLinkPhone());
-		return map;
-
+		if (linkman != null) {
+			WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
+			Map<String, Object> map = new HashMap<>();
+			map.put("id", linkman.getId());
+			map.put("clientId", workClientInfo.getId());
+			map.put("clientName", workClientInfo.getName());
+			map.put("linkName", linkman.getName());
+			map.put("linkMobile", linkman.getLinkMobile());
+			map.put("linkPhone", linkman.getLinkPhone());
+			return map;
+		}
+		return null;
 	}
 }

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -102,6 +102,7 @@
 
         });
 
+
         function setContractValue(obj){
             var clientId = $("#contractClientId").val();
             $.ajax({
@@ -116,16 +117,17 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    //获取联系人
-                    setLinkMan(data.client.id);
                     $("#constructionProjectType").val(data.constructionProjectTypeStr);
                     $("#linkmanId").val(data.workClinetInfoIds);
+                    //清理之前的联系人
+                    var newClientId  = data.client.id;
+                    if(clientId != newClientId){
+                        $("#workClientLinkmanList tr").remove()
+                        setLinkMan(newClientId);
+                    }
+                    // console.log(clientId+"------"+newClientId);
                 }
             });
-            var newClientId  =$("#contractClientId").val();
-            if (clientId != newClientId){
-                $("#workClientLinkmanList tr").remove();
-            }
         }
 
         function setLinkMan(client_Id) {
@@ -144,6 +146,11 @@
                     $("#workClientLinkmanList"+row+"_name").val(d.linkName);
                     $("#workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
                     $("#workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone);
+
+                    $("#workClientLinkmanList"+row+"_clientName").prop("readonly","readonly");
+                    $("#workClientLinkmanList"+row+"_name").prop("readonly","readonly");
+                    $("#workClientLinkmanList"+row+"_linkMobile").prop("readonly","readonly");
+                    $("#workClientLinkmanList"+row+"_linkPhone").prop("readonly","readonly");
                 }
             });
         }