Merge remote-tracking branch 'origin/master'

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

@@ -231,6 +231,16 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 			List<User> users = workProjectUserDao.projectUsers(records.getId());
 			records.setMembercount(users.size());
 		}
+		//判断是否为无合同项目
+		for (ProjectRecords records : recordsList) {
+			if(StringUtils.isBlank(records.getWorkContractInfo().getId())){
+				List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(records.getId(), 1);
+				for(WorkClientLinkman linkman :clientLinkmanList){
+					WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());
+					records.getWorkContractInfo().setClient(clientInfo);
+				}
+			}
+		}
 		page.setList(recordsList);
 		return page;
 	}

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

@@ -11,6 +11,10 @@ import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+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.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
@@ -48,6 +52,10 @@ public class ProjectRecordsUserController extends BaseController {
 	private WorkContractInfoService contractInfoService;
 	@Autowired
 	private WorkProjectUserDao workProjectUserDao;
+	@Autowired
+	private WorkClientLinkmanDao workClientLinkmanDao;
+	@Autowired
+	private WorkClientInfoService workClientInfoService;
 	
 	@ModelAttribute
 	public ProjectRecords get(@RequestParam(required=false) String id) {
@@ -80,9 +88,18 @@ public class ProjectRecordsUserController extends BaseController {
 	public String form(ProjectRecords projectRecords, Model model) {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			//设置合同信息
-			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-			workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
-			projectRecords.setWorkContractInfo(workContractInfo);
+			//判定是否为无合同项目
+			if(StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+				WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
+				workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()), "construction_project_type", ""));
+				projectRecords.setWorkContractInfo(workContractInfo);
+			}else{
+				List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 1);
+				for(WorkClientLinkman linkman :clientLinkmanList){
+					WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());
+					projectRecords.getWorkContractInfo().setClient(clientInfo);
+				}
+			}
 			//设置项目组成员
 			projectRecordsService.queryUserNames(projectRecords);
 			//设置委托方联系人信息