模糊查询

src/main/java/com/jeeplus/modules/projectrecord/dao/ProjectClientLinkmanDao.java

@@ -1,8 +1,11 @@
 package com.jeeplus.modules.projectrecord.dao;
 
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workprequalification.entity.WorkProjectLinkman;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 @MyBatisDao
@@ -11,4 +14,11 @@ public interface ProjectClientLinkmanDao {
     public void batchInsert(Map map);
 
     public void deleteProjectLinkmans(@Param("projectId") String projectId,@Param("isEntrust")int isEntrust);
+
+    /**
+     * 根据姓名查询联系人详细信息
+     * @param name
+     * @return
+     */
+    public WorkClientLinkman getLinkManByName(String name);
 }

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

@@ -226,8 +226,20 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	}
 	@Transactional(readOnly = false)
 	public void saveProject(ProjectRecords projectRecords,ProjectStatusEnum projectStatus) throws Exception {
-        long t1 = System.currentTimeMillis();
-        WorkContractInfo workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
+		long t1 = System.currentTimeMillis();
+
+		WorkContractInfo workContractInfo = null;
+		Office company= new Office();
+		Office office =  new Office();
+        if(StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))){
+            //有合同状态
+			workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
+			company.setId(workContractInfo.getCompanyId());
+			projectRecords.setCompany(company);
+			office.setId(workContractInfo.getChargeCompany());
+			projectRecords.setOffice(office);
+
+        }
         Integer oldStatus = projectRecords.getProjectStatus();
         projectRecords.setProjectStatus(projectStatus.getValue());
         User createBy = projectRecords.getCreateBy();
@@ -236,12 +248,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		}else {
 		    createBy = UserUtils.getUser();
         }
-		Office company= new Office();
-		company.setId(workContractInfo.getCompanyId());
-		projectRecords.setCompany(company);
-		Office office =  new Office();
-		office.setId(workContractInfo.getChargeCompany());
-		projectRecords.setOffice(office);
+
 		if(StringUtils.isBlank(projectRecords.getProjectId())){
             projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(),ProjectRecords.SERIAL_BIZCODE));
         }
@@ -292,7 +299,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	 *
 	 * @param projectId
 	 * @param linkmanList
-	 * @param isEntrust   是否委托方
+	 * @param isEntrust   是否委托方,1委托方，0施工方
 	 */
 	private void saveLinkmanInfos(String projectId, List<WorkClientLinkman> linkmanList, boolean isEntrust) {
 		assert (projectId != null);

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

@@ -20,10 +20,10 @@
         var validateForm;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-                if($(".trIdAdds").length==0){
-                    top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
-                    return;
-                }
+                // if($(".trIdAdds").length==0){
+                //     top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
+                //     return;
+                // }
                 if($("#workClientLinkmanList tr").length==0){
                     top.layer.alert('请至少选择一个委托方联系人！', {icon: 0});
                     return;