合同登记

src/main/java/com/jeeplus/modules/workcontractinfo/dao/WorkContractInfoDao.java

@@ -9,6 +9,7 @@ import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractAnnex;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractListInfo;

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -243,7 +243,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 		return workContractInfo;
 	}
-
 	/**
 	 * 仅查询合同信息
 	 * @param id
@@ -1141,6 +1140,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		page.setList(dao.findListByclient(client));
 		return page;
 	}
+
+
+
 	public WorkContractInfo getByProcessInstanceId(String processInstanceId){
 		WorkContractInfo workClientInfo = workContractInfoDao.getByProcessInstanceId(processInstanceId);
 		return workClientInfo;
@@ -3291,61 +3293,70 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	public void updateWorkContractInfo(WorkContractInfo workContractInfo) {
 		String contractId = workContractInfo.getId();
 		WorkClientInfo client = workContractInfo.getClient();
-		WorkClientInfo clientInfo = workClientInfoService.get(client.getId());
-		//根据客户信息查询委托方联系人信息
-		if(workContractInfo.getWorkClientInfoList().size()==0){
-			WorkClientInfo workClientInfo = new WorkClientInfo();
-			workClientInfo.setId(clientInfo.getId());
-			workClientInfo.setName(clientInfo.getName());
-			workClientInfo.setCompanyType(DictUtils.getMainDictLabel(clientInfo.getCompanyType(),"company_type",""));
-			workClientInfo.setCompanyIndustry(DictUtils.getMainDictLabel(clientInfo.getCompanyIndustry(),"company_industry",""));
-			workClientInfo.setArea(clientInfo.getArea());
-			workContractInfo.getWorkClientInfoList().add(workClientInfo);
+//			WorkClientInfo clientInfo = workClientInfoService.get(client.getId());
+		List<WorkClientLinkman> list = workContractInfoDao.getList(workContractInfo.getContractNum());
+		for (WorkClientLinkman workClientLinkman : workContractInfo.getWorkClientLinkmanList()) {
+			WorkClientLinkman workClientInfo = new WorkClientLinkman();
+			workClientInfo.preInsert();
+			workClientInfo.setName(workClientLinkman.getName());
+			workClientInfo.setQq(workClientLinkman.getQq());
+			workClientInfo.setEmail(workClientLinkman.getEmail());
+			workClientInfo.setContractNum(workClientLinkman.getContractNum());
+			workClientInfo.setLinkMobile(workClientLinkman.getLinkMobile());
+			workClientInfo.setLinkPhone(workClientLinkman.getLinkPhone());
+			workClientInfo.setPosition(workClientLinkman.getPosition());
+			workClientInfo.setOffice(workClientLinkman.getOffice());
 		}
+		System.out.println("==================124"+workContractInfo.getWorkClientLinkmanList());
+		//根据客户信息查询委托方联系人信息
+		workContractInfo.setWorkClientLinkmanList(workContractInfo.	getWorkClientLinkmanList());
 
-		WorkContractClient workContractClient1 = new WorkContractClient();
-		workContractClient1.setContractId(contractId);
-		List<WorkContractClient> list1 =workContractClientService.findList(workContractClient1);
-		if(list1!=null && list1.size()>0){
-			for(WorkContractClient w :list1){
-				workContractClientService.delete(w);
-			}
-			for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()){
-				if(workClientInfo.DEL_FLAG_NORMAL.equals(workClientInfo.getDelFlag())){
-					String clientId = workClientInfo.getId();
-					if (clientId == null){
-						continue;
-					}
-					WorkContractClient workContractClient = new WorkContractClient();
-					workContractClient.setContractId(contractId);
-					workContractClient.setClientId(clientId);
-					List<WorkContractClient> list2 =workContractClientService.findList(workContractClient);
-					if(list2!=null&&list2.size()>0){
-						logger.info("无法重复添加关联关系");
-					}else{
-						//第一次新增
-						workContractClientService.save(workContractClient);
-					}
-				}
-			}
-		}else{
-			for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()){
-				String clientId = workClientInfo.getId();
-				if (clientId == null){
-					continue;
-				}
-				WorkContractClient workContractClient = new WorkContractClient();
-				workContractClient.setContractId(contractId);
-				workContractClient.setClientId(clientId);
-				List<WorkContractClient> list2 =workContractClientService.findList(workContractClient);
-				if(list2!=null&&list2.size()>0){
-					logger.info("无法重复添加关联关系");
-				}else{
-					//第一次新增
-					workContractClientService.save(workContractClient);
-				}
-			}
-		}
+//		WorkContractClient workContractClient1 = new WorkContractClient();
+		//联系人
+//		WorkClientLinkman workClientLinkman =new WorkClientLinkman();
+
+//		workContractClient1.setContractId(contractId);
+//		List<WorkContractClient> list1 =workContractClientService.findList(workContractClient1);
+//		if(list1!=null && list1.size()>0){
+//			for(WorkContractClient w :list1){
+//				workContractClientService.delete(w);
+//			}
+//			for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()){
+//				if(workClientInfo.DEL_FLAG_NORMAL.equals(workClientInfo.getDelFlag())){
+//					String clientId = workClientInfo.getId();
+//					if (clientId == null){
+//						continue;
+//					}
+//					WorkContractClient workContractClient = new WorkContractClient();
+//					workContractClient.setContractId(contractId);
+//					workContractClient.setClientId(clientId);
+//					List<WorkContractClient> list2 =workContractClientService.findList(workContractClient);
+//					if(list2!=null&&list2.size()>0){
+//						logger.info("无法重复添加关联关系");
+//					}else{
+//						//第一次新增
+//						workContractClientService.save(workContractClient);
+//					}
+//				}
+//			}
+//		}else{
+//			for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()){
+//				String clientId = workClientInfo.getId();
+//				if (clientId == null){
+//					continue;
+//				}
+//				WorkContractClient workContractClient = new WorkContractClient();
+//				workContractClient.setContractId(contractId);
+//				workContractClient.setClientId(clientId);
+//				List<WorkContractClient> list2 =workContractClientService.findList(workContractClient);
+//				if(list2!=null&&list2.size()>0){
+//					logger.info("无法重复添加关联关系");
+//				}else{
+//					//第一次新增
+//					workContractClientService.save(workContractClient);
+//				}
+//			}
+//		}
 	}
 	@Transactional(readOnly = false)
 	public void auditInvalidate(WorkContractInfo workContractInfo) throws Exception {

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -48,6 +48,7 @@ import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 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.dao.WorkContractInfoCopyDao;
 import com.jeeplus.modules.workcontractinfo.entity.*;
@@ -65,6 +66,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -134,7 +136,6 @@ public class WorkContractInfoController extends BaseController {
         }
         return entity;
     }
-
     /**
      * 合同管理列表页面
      */
@@ -177,7 +178,6 @@ public class WorkContractInfoController extends BaseController {
         //workContractInfo.setIsTotal("1");
         Page<WorkContractInfo> page = workContractInfoService.findPage(new Page<WorkContractInfo>(request, response), workContractInfo);
         List<WorkContractInfo> list = page.getList();
-
         //查询所有和当前登陆人有关的项目的审核
         WorkProjectNotify workProjectNotify = new WorkProjectNotify();
         workProjectNotify.setUser(UserUtils.getUser());
@@ -552,17 +552,11 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
-//        workClientInfo.setName(request.getParameter("name"));//客户名称
-//        workClientInfo.setUscCode(request.getParameter("uscCode"));//统一社会信用代码
-//        workClientInfo.setJobTypeStr(request.getParameter("JobTypeStr"));//代表方
-//        workClientInfo.setTelephone(request.getParameter("telephone"));
-//        workClientInfo.setLinkname(request.getParameter("linkname"));//联系人姓名
-//        workClientInfo.setPosition(request.getParameter("position"));//职务
-//        workClientInfo.setQq(request.getParameter("qq"));//QQ
-//        workClientInfo.setLinkPhone(request.getParameter("linkPhone"));//联系人电话
-//        workClientInfo.setLinkMobile(request.getParameter("linkMobile"));//手机
-//        workClientInfo.setEmail(request.getParameter("email"));
-//        workClientInfoService.save(workClientInfo);//保存客户信息
+        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getContractNum()));
+
+//        workContractInfo.getWorkClientLinkmanList().forEach(w->{
+//            System.out.println(w.getName() + "---" + w.getEmail());
+//        });
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/newWorkContract/" + view;
     }
@@ -576,6 +570,7 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
         model.addAttribute("workContractInfo", workContractInfo);
+//        model.addAttribute("clientLinkmanList",clientLinkmanList);
         return "modules/workcontractinfo/workContractInfoAdminForm";
     }
 
@@ -890,10 +885,14 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
+        List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getContractNum());
+        System.out.println("=================================>>>>>>>>>>>>>>>>"+clientList);
+
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
         model.addAttribute("alterInfo",alterInfo);
         model.addAttribute("workContractInfo", workContractInfo);
+        model.addAttribute("clientList",clientList);
         return "modules/workcontractinfo/workContractInfoLookForm";
     }
     @RequestMapping(value = "lookForma")
@@ -940,7 +939,7 @@ public class WorkContractInfoController extends BaseController {
      */
 //	@RequiresPermissions(value={"workcontractinfo:workContractInfo:add","workcontractinfo:workContractInfo:edit"},logical=Logical.OR)
     @RequestMapping(value = "save")
-    public String save(WorkContractInfo workContractInfo, Model model,
+    public String save(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
                        RedirectAttributes redirectAttributes) throws Exception {
         if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
@@ -971,6 +970,7 @@ public class WorkContractInfoController extends BaseController {
                 }
                 workContractInfo.setWorkAttachments(list1);
                 WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
+                System.out.println("=============================="+t.getClientName());
 //                status =2,审核中。status=5,审核已通过
                 if (t.getContractState().equals("2")) {
                     addMessage(redirectAttributes, "审核中的合同不能修改");
@@ -986,7 +986,7 @@ public class WorkContractInfoController extends BaseController {
                 t.setRecordState("1");
                 t.setSignatureStatus("1");
                 workContractInfoService.save(t);
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
 //                合同评价信息，
 //                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
@@ -994,10 +994,10 @@ public class WorkContractInfoController extends BaseController {
 //                workContractReview.setContractName(workContractInfo.getName());
 //                workContractReviewService.save(workContractReview);
                 Map<String, Object> variables = new HashMap<String, Object>();
-                t.setContractState("2");
-                String str=workContractInfoService.save(t, variables,contextPath,url);//保存
+                t.setContractState("5");
+                String str=workContractInfoService.save(workClientLinkman,t, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
-                    addMessage(redirectAttributes, "合同申请提交失败:"+str);
+                    addMessage(redirectAttributes, "合同提交失败:"+str);
                 }else {
                     addMessage(redirectAttributes, "修改保存合同管理成功");
                 }
@@ -1023,11 +1023,11 @@ public class WorkContractInfoController extends BaseController {
                     }
                 }
                 workContractInfo.setWorkAttachments(list1);
-                workContractInfo.setContractState("1");
+                workContractInfo.setContractState("5");
                 workContractInfo.setRecordState("1");
                 workContractInfo.setSignatureStatus("1");
                 workContractInfoService.save(workContractInfo);//暂存
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
                 /* 合同评价信息
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
@@ -1039,7 +1039,7 @@ public class WorkContractInfoController extends BaseController {
 
                 workContractInfo.setContractState("2");
                 Map<String, Object> variables = new HashMap<String, Object>();
-               String str= workContractInfoService.save(workContractInfo, variables,contextPath,url);//保存
+               String str= workContractInfoService.save(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
@@ -1061,7 +1061,7 @@ public class WorkContractInfoController extends BaseController {
      */
 //	@RequiresPermissions(value={"workcontractinfo:workContractInfo:add","workcontractinfo:workContractInfo:edit"},logical=Logical.OR)
     @RequestMapping(value = "newSave")
-    public String newSave(WorkContractInfo workContractInfo, Model model,
+    public String newSave(WorkContractInfo workContractInfo, Model model,WorkClientLinkman workClientLinkman,
                        RedirectAttributes redirectAttributes,WorkClientInfo workClientInfo) throws Exception {
         if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
@@ -1107,7 +1107,7 @@ public class WorkContractInfoController extends BaseController {
                 t.setRecordState("1");
                 t.setSignatureStatus("1");
                 workContractInfoService.save(t);
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
 //                合同评价信息，
 //                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
@@ -1116,7 +1116,7 @@ public class WorkContractInfoController extends BaseController {
 //                workContractReviewService.save(workContractReview);
                 Map<String, Object> variables = new HashMap<String, Object>();
                 t.setContractState("2");
-                String str=workContractInfoService.newSave(workClientInfo,t, variables,contextPath,url);//保存
+                String str=workContractInfoService.newSave(workClientLinkman,t, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
@@ -1147,14 +1147,10 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setContractState("1");
                 workContractInfo.setRecordState("1");
                 workContractInfo.setSignatureStatus("1");
-                Area area = new Area();
-                area.setId("9AF3266E03384019BFE935DD9F35332F");
-                area.setName("南京");
-                workClientInfo.setArea(area);
-                workClientInfoService.save(workClientInfo);
                 workContractInfoService.save(workContractInfo);//提交
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.get(workContractInfo);
                 /* 合同评价信息
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 String id = workContractInfo.getId();
@@ -1165,7 +1161,8 @@ public class WorkContractInfoController extends BaseController {
 
                 workContractInfo.setContractState("2");
                 Map<String, Object> variables = new HashMap<String, Object>();
-               String str= workContractInfoService.newSave(workClientInfo,workContractInfo, variables,contextPath,url);//保存
+//                workClientLinkman.setContractId(workContractInfo.getId());
+               String str= workContractInfoService.newSave(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
@@ -1205,94 +1202,211 @@ public class WorkContractInfoController extends BaseController {
      * 暂存合同管理
      */
     @RequestMapping(value = "store")
-    public String store(HttpServletRequest request,WorkContractInfo workContractInfo, Model model, RedirectAttributes redirectAttributes) throws Exception{
-        if (!beanValidator(model, workContractInfo)){
+    public String store(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
+                       RedirectAttributes redirectAttributes) throws Exception {
+        if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
         }
-        //判断是否有总合同
-        if(!Strings.isNullOrEmpty(workContractInfo.getTotalContractId()) && !"0".equals(workContractInfo.getTotalContractId())){
-            workContractInfo.setIsTotalName("子合同");
-            workContractInfo.setIsTotal(null);
-        }else{
-            workContractInfo.setIsTotalName("总合同");
-            workContractInfo.setIsTotal("1");
-            workContractInfo.setTotalContractId("0");
-            //workContractInfo.setCommonFlag(IdGen.uuid());
-        }
-        if(!workContractInfo.getIsNewRecord()){//编辑表单保存
-            List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
-            List<WorkClientAttachment> list1 = new ArrayList<>();
-            List<WorkClientAttachment> list2 = new ArrayList<>();
-            for (WorkClientAttachment workClientAttachment:list){
-                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
-                    list1.add(workClientAttachment);
+        String url = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
+        String contextPath = request.getContextPath();
+        try {
+            //判断是否有总合同
+            if(!Strings.isNullOrEmpty(workContractInfo.getTotalContractId()) && !"0".equals(workContractInfo.getTotalContractId())){
+                workContractInfo.setIsTotalName("子合同");
+                workContractInfo.setIsTotal(null);
+            }else{
+                workContractInfo.setIsTotalName("总合同");
+                workContractInfo.setIsTotal("1");
+                workContractInfo.setTotalContractId("0");
+                //workContractInfo.setCommonFlag(IdGen.uuid());
+            }
+            if (!workContractInfo.getIsNewRecord()) {
+                List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
+                List<WorkClientAttachment> list1 = new ArrayList<>();
+                List<WorkClientAttachment> list2 = new ArrayList<>();
+                for (WorkClientAttachment workClientAttachment:list){
+                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                        list1.add(workClientAttachment);
+                    }else {
+                        list2.add(workClientAttachment);
+                    }
+                }
+                workContractInfo.setWorkAttachments(list1);
+                WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
+//                System.out.println("=============================="+t.getClientName());
+//                status =2,审核中。status=5,审核已通过
+                if (t.getContractState().equals("2")) {
+                    addMessage(redirectAttributes, "审核中的合同不能修改");
+                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+                }
+                if (t.getContractState().equals("5")) {
+                    addMessage(redirectAttributes, "已通过合同不能修改");
+                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+                }
+                //将编辑表单中的非NULL值覆盖数据库记录中的值
+                MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
+//                t.setContractState("1");
+//                t.setRecordState("1");
+//                t.setSignatureStatus("1");
+                workContractInfoService.save(t);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
+
+//                合同评价信息，
+//                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+//                workContractReview.setWorkAttachments(list2);
+//                workContractReview.setContractName(workContractInfo.getName());
+//                workContractReviewService.save(workContractReview);
+                Map<String, Object> variables = new HashMap<String, Object>();
+                t.setContractState("1");
+                String str=workContractInfoService.save(workClientLinkman,t, variables,contextPath,url);//保存
+                if (StringUtils.isNotBlank(str)){
+                    addMessage(redirectAttributes, "合同提交失败:"+str);
                 }else {
-                    list2.add(workClientAttachment);
+                    addMessage(redirectAttributes, "修改保存合同管理成功");
                 }
-            }
-            workContractInfo.setWorkAttachments(list1);
-            WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
-            if (t.getContractState().equals("2")) {
-                addMessage(redirectAttributes, "审核中的合同不能修改");
-                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
-            }
-            if (t.getContractState().equals("5")) {
-                addMessage(redirectAttributes, "已通过合同不能修改");
-                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
-            }
-            //将编辑表单中的非NULL值覆盖数据库记录中的值
-            MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
-            /*String state = request.getParameter("state");
-            if(!("3").equals(t.getContractState())){
-                t.setContractState(state.toString());
-            }*/
 
-            workContractInfoService.save(t);//保存
-            workContractInfoService.updateWorkContractInfo(workContractInfo);
-            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
-            if(workContractReview != null){
+            } else {//新增表单保存
+                //第一次创建都只能给部门负责人审核
+                String comId = UserUtils.getUser().getComId();
+                String name = UserUtils.getUser().getName();
+
+                workContractInfo.setCreateName(name);
+                workContractInfo.setCreateCompany(comId);
+                workContractInfo.setCompanyId(comId);
+                workContractInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+                List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
+                List<WorkClientAttachment> list1 = new ArrayList<>();
+                List<WorkClientAttachment> list2 = new ArrayList<>();
+                for (WorkClientAttachment workClientAttachment:list){
+                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                        //  flag = 44 代表合同附件 ，
+                        list1.add(workClientAttachment);
+                    }else {
+                        list2.add(workClientAttachment);
+                    }
+                }
+                workContractInfo.setWorkAttachments(list1);
+                workContractInfo.setContractState("1");
+                workContractInfo.setRecordState("1");
+                workContractInfo.setSignatureStatus("1");
+//                workContractInfoService.save(workContractInfo);//暂存
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
+
+                /* 合同评价信息
+                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+                String id = workContractInfo.getId();
+                workContractReview.setContractId(id);
                 workContractReview.setWorkAttachments(list2);
                 workContractReview.setContractName(workContractInfo.getName());
-                workContractReviewService.save(workContractReview);
-            }
-            addMessage(redirectAttributes, "暂存合同管理成功");
-            return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
-        }else{//新增表单保存
-            //第一次创建都只能给部门负责人审核
-            String comId = UserUtils.getUser().getComId();
-            String name = UserUtils.getUser().getName();
+                workContractReviewService.save(workContractReview);*/
 
-            workContractInfo.setCreateName(name);
-            workContractInfo.setCreateCompany(comId);
-            workContractInfo.setCompanyId(comId);
-            workContractInfo.setOfficeId(UserUtils.getSelectOffice().getId());
-            List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
-            List<WorkClientAttachment> list1 = new ArrayList<>();
-            List<WorkClientAttachment> list2 = new ArrayList<>();
-            for (WorkClientAttachment workClientAttachment:list){
-                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
-                    list1.add(workClientAttachment);
+                workContractInfo.setContractState("2");
+                Map<String, Object> variables = new HashMap<String, Object>();
+                String str= workContractInfoService.save(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
+                if (StringUtils.isNotBlank(str)){
+                    addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
-                    list2.add(workClientAttachment);
+                    addMessage(redirectAttributes, "保存合同管理成功");
                 }
             }
-            workContractInfo.setWorkAttachments(list1);
-            workContractInfo.setContractState("1");
-            workContractInfo.setRecordState("1");
-            workContractInfo.setSignatureStatus("1");
-            workContractInfoService.save(workContractInfo);//暂存
-            workContractInfoService.updateWorkContractInfo(workContractInfo);
-//            合同评审暂时不用
-//            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
-//            String id = workContractInfo.getId();
-//            workContractReview.setContractId(id);
-//            workContractReview.setWorkAttachments(list2);
-//            workContractReview.setContractName(workContractInfo.getName());
-//            workContractReviewService.save(workContractReview);
-            addMessage(redirectAttributes, "暂存合同管理成功");
+        }catch (Exception e){
+            addMessage(redirectAttributes, "保存合同管理失败");
+
+            logger.error("Exception e:"+e);
+            e.printStackTrace();
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }
+//    public String store(HttpServletRequest request,WorkContractInfo workContractInfo, Model model, RedirectAttributes redirectAttributes) throws Exception{
+//        if (!beanValidator(model, workContractInfo)){
+//            return form(workContractInfo, model);
+//        }
+//        String url = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
+//        //判断是否有总合同
+//        if(!Strings.isNullOrEmpty(workContractInfo.getTotalContractId()) && !"0".equals(workContractInfo.getTotalContractId())){
+//            workContractInfo.setIsTotalName("子合同");
+//            workContractInfo.setIsTotal(null);
+//        }else{
+//            workContractInfo.setIsTotalName("总合同");
+//            workContractInfo.setIsTotal("1");
+//            workContractInfo.setTotalContractId("0");
+//            //workContractInfo.setCommonFlag(IdGen.uuid());
+//        }
+//        if(!workContractInfo.getIsNewRecord()){//编辑表单保存
+//            List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
+//            List<WorkClientAttachment> list1 = new ArrayList<>();
+//            List<WorkClientAttachment> list2 = new ArrayList<>();
+//            for (WorkClientAttachment workClientAttachment:list){
+//                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+//                    list1.add(workClientAttachment);
+//                }else {
+//                    list2.add(workClientAttachment);
+//                }
+//            }
+//            workContractInfo.setWorkAttachments(list1);
+//            WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
+//            if (t.getContractState().equals("2")) {
+//                addMessage(redirectAttributes, "审核中的合同不能修改");
+//                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+//            }
+//            if (t.getContractState().equals("5")) {
+//                addMessage(redirectAttributes, "已通过合同不能修改");
+//                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+//            }
+//            //将编辑表单中的非NULL值覆盖数据库记录中的值
+//            MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
+//            /*String state = request.getParameter("state");
+//            if(!("3").equals(t.getContractState())){
+//                t.setContractState(state.toString());
+//            }*/
+//
+//            workContractInfoService.save(t);//保存
+////            workContractInfoService.updateWorkContractInfo(workContractInfo);
+//            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+//            if(workContractReview != null){
+//                workContractReview.setWorkAttachments(list2);
+//                workContractReview.setContractName(workContractInfo.getName());
+//                workContractReviewService.save(workContractReview);
+//            }
+//            addMessage(redirectAttributes, "暂存合同管理成功");
+//            return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+//        }else{//新增表单保存
+//            //第一次创建都只能给部门负责人审核
+//            String comId = UserUtils.getUser().getComId();
+//            String name = UserUtils.getUser().getName();
+//
+//            workContractInfo.setCreateName(name);
+//            workContractInfo.setCreateCompany(comId);
+//            workContractInfo.setCompanyId(comId);
+//            workContractInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+//            List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
+//            List<WorkClientAttachment> list1 = new ArrayList<>();
+//            List<WorkClientAttachment> list2 = new ArrayList<>();
+//            for (WorkClientAttachment workClientAttachment:list){
+//                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+//                    list1.add(workClientAttachment);
+//                }else {
+//                    list2.add(workClientAttachment);
+//                }
+//            }
+//            workContractInfo.setWorkAttachments(list1);
+//            workContractInfo.setContractState("1");
+//            workContractInfo.setRecordState("1");
+//            workContractInfo.setSignatureStatus("1");
+//            workContractInfoService.save(workContractInfo);//暂存
+////            workContractInfoService.updateWorkContractInfo(workContractInfo);
+////            合同评审暂时不用
+////            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+////            String id = workContractInfo.getId();
+////            workContractReview.setContractId(id);
+////            workContractReview.setWorkAttachments(list2);
+////            workContractReview.setContractName(workContractInfo.getName());
+////            workContractReviewService.save(workContractReview);
+//
+//            addMessage(redirectAttributes, "暂存合同管理成功");
+//        }
+//        return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+//    }
 
 
 
@@ -1300,6 +1414,121 @@ public class WorkContractInfoController extends BaseController {
      * admin修改信息
      */
     @RequestMapping(value = "adminUpdate")
+//    public String adminUpdate(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
+//                        RedirectAttributes redirectAttributes) throws Exception {
+//        if (!beanValidator(model, workContractInfo)) {
+//            return form(workContractInfo, model);
+//        }
+//        String url = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
+//        String contextPath = request.getContextPath();
+//        try {
+//            //判断是否有总合同
+//            if(!Strings.isNullOrEmpty(workContractInfo.getTotalContractId()) && !"0".equals(workContractInfo.getTotalContractId())){
+//                workContractInfo.setIsTotalName("子合同");
+//                workContractInfo.setIsTotal(null);
+//            }else{
+//                workContractInfo.setIsTotalName("总合同");
+//                workContractInfo.setIsTotal("1");
+//                workContractInfo.setTotalContractId("0");
+//                //workContractInfo.setCommonFlag(IdGen.uuid());
+//            }
+//            if (!workContractInfo.getIsNewRecord()) {
+//                List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
+//                List<WorkClientAttachment> list1 = new ArrayList<>();
+//                List<WorkClientAttachment> list2 = new ArrayList<>();
+//                for (WorkClientAttachment workClientAttachment:list){
+//                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+//                        list1.add(workClientAttachment);
+//                    }else {
+//                        list2.add(workClientAttachment);
+//                    }
+//                }
+//                workContractInfo.setWorkAttachments(list1);
+//                WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
+//                System.out.println("=============================="+t.getClientName());
+////                status =2,审核中。status=5,审核已通过
+////                if (t.getContractState().equals("2")) {
+////                    addMessage(redirectAttributes, "审核中的合同不能修改");
+////                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+////                }
+////                if (t.getContractState().equals("5")) {
+////                    addMessage(redirectAttributes, "已通过合同不能修改");
+////                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+////                }
+//                //将编辑表单中的非NULL值覆盖数据库记录中的值
+//                MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
+//                t.setContractState("1");
+//                t.setRecordState("1");
+//                t.setSignatureStatus("1");
+//                workContractInfoService.save(t);
+////                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//
+////                合同评价信息，
+////                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+////                workContractReview.setWorkAttachments(list2);
+////                workContractReview.setContractName(workContractInfo.getName());
+////                workContractReviewService.save(workContractReview);
+//                Map<String, Object> variables = new HashMap<String, Object>();
+//                t.setContractState("1");
+//                String str=workContractInfoService.save(workClientLinkman,t, variables,contextPath,url);//保存
+//                if (StringUtils.isNotBlank(str)){
+//                    addMessage(redirectAttributes, "合同提交失败:"+str);
+//                }else {
+//                    addMessage(redirectAttributes, "修改保存合同管理成功");
+//                }
+//
+//            } else {//新增表单保存
+//                //第一次创建都只能给部门负责人审核
+//                String comId = UserUtils.getUser().getComId();
+//                String name = UserUtils.getUser().getName();
+//
+//                workContractInfo.setCreateName(name);
+//                workContractInfo.setCreateCompany(comId);
+//                workContractInfo.setCompanyId(comId);
+//                workContractInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+//                List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
+//                List<WorkClientAttachment> list1 = new ArrayList<>();
+//                List<WorkClientAttachment> list2 = new ArrayList<>();
+//                for (WorkClientAttachment workClientAttachment:list){
+//                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+//                        //  flag = 44 代表合同附件 ，
+//                        list1.add(workClientAttachment);
+//                    }else {
+//                        list2.add(workClientAttachment);
+//                    }
+//                }
+//                workContractInfo.setWorkAttachments(list1);
+//                workContractInfo.setContractState("1");
+//                workContractInfo.setRecordState("1");
+//                workContractInfo.setSignatureStatus("1");
+//                workContractInfoService.save(workContractInfo);//暂存
+////                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//
+//                /* 合同评价信息
+//                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+//                String id = workContractInfo.getId();
+//                workContractReview.setContractId(id);
+//                workContractReview.setWorkAttachments(list2);
+//                workContractReview.setContractName(workContractInfo.getName());
+//                workContractReviewService.save(workContractReview);*/
+//
+//                workContractInfo.setContractState("2");
+//                Map<String, Object> variables = new HashMap<String, Object>();
+//                String str= workContractInfoService.save(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
+//                if (StringUtils.isNotBlank(str)){
+//                    addMessage(redirectAttributes, "合同申请提交失败:"+str);
+//                }else {
+//                    addMessage(redirectAttributes, "保存合同管理成功");
+//                }
+//            }
+//        }catch (Exception e){
+//            addMessage(redirectAttributes, "保存合同管理失败");
+//
+//            logger.error("Exception e:"+e);
+//            e.printStackTrace();
+//        }
+//        return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+//    }
     public String adminUpdate(HttpServletRequest request,WorkContractInfo workContractInfo, Model model, RedirectAttributes redirectAttributes) throws Exception{
         if (!beanValidator(model, workContractInfo)){
             return form(workContractInfo, model);
@@ -1329,9 +1558,9 @@ public class WorkContractInfoController extends BaseController {
         workContractInfoService.updateWorkContractInfo(workContractInfo);
         //admin修改合同归档案卷号
         //如果案卷号不为空 则进行修改，否则不修改
-        if(StringUtils.isNotBlank(workContractInfo.getFileNum()) && StringUtils.isNotBlank(workContractInfo.getFileNumTow())){
-            workContractInfoService.updateWorkContractRecord(workContractInfo);
-        }
+//        if(StringUtils.isNotBlank(workContractInfo.getFileNum()) && StringUtils.isNotBlank(workContractInfo.getFileNumTow())){
+//            workContractInfoService.updateWorkContractRecord(workContractInfo);
+//        }
         addMessage(redirectAttributes, "修改合同管理成功");
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }
@@ -1735,6 +1964,7 @@ public class WorkContractInfoController extends BaseController {
         return "modules/sys/gridselectAhref";
     }
 
+
     @RequestMapping(value = "getProcess")
     public String getProcess(WorkContractInfo workContractInfo,String auditType, Model model,HttpServletRequest request) throws UnsupportedEncodingException {
 //        String auditType = request.getParameter("auditType");

src/main/resources/mappings/modules/workcontractinfo/WorkContractBorrowDao.xml

@@ -255,6 +255,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.process_instance_id AS "processInstanceId",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.common_flag AS "commonFlag",

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoCopyDao.xml

@@ -41,6 +41,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.process_instance_id AS "processInstanceId",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.common_flag AS "commonFlag",
@@ -87,6 +88,7 @@
 		    a.alter_type AS "alterType",
 		    a.times AS "times",
 			client.name AS "client.name"
+		a.clientName AS "clientName",
 		FROM work_contract_info_copy a
 		<include refid="workContractInfoJoins"/>
 		WHERE a.id = #{id}
@@ -109,6 +111,7 @@
 		a.alter_type AS "alterType",
 		a.times AS "times",
 		client.name AS "client.name"
+		a.clientName AS "clientName",
 		FROM work_contract_info_copy a
 		<include refid="workContractInfoJoins"/>
 		WHERE a.alterbefore_id = #{alterBeforeId} and a.del_flag = 0
@@ -173,6 +176,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -294,6 +298,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -850,6 +855,7 @@
 		a.company_id as companyId,
 		a.office_id AS "officeId"
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.contractTypeDoc,
 		a.contractFeeDoc,
 		a.charge_company_name AS "chargeCompanyName",

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -282,11 +282,11 @@
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
-			<if test="client != null and client.name != null and client.name != ''">
-				AND client.name LIKE concat('%',#{client.name},'%')
+<!--			<if test="client != null and client.id != null and client.id != ''">-->
+<!--				AND a.client_id = #{client.id}-->
+<!--			</if>-->
+			<if test="clientName != null and clientName != ''">
+				AND clientName LIKE concat('%',#{clientName},'%')
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.contract_date BETWEEN #{beginContractDate} AND #{endContractDate}

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormAdd.jsp

@@ -183,10 +183,14 @@
         });
 
         function addRow(list, idx, tpl, row){
-            var idx1 = $("#workClientInfoList tr").length;
-            if(list == '#workClientInfoList' && idx1 < 100){
+            var idx1 = $("#workClientBankList tr").length;
+            if(list == '#workClientBankList'){
                 bornTemplete(list, idx, tpl, row, idx1);
             }
+            var idx2 = $("#workClientLinkmanList tr").length;
+            if(list == '#workClientLinkmanList'){
+                bornTemplete(list, idx, tpl, row, idx2);
+            }
         }
         function bornTemplete(list, idx, tpl, row, idx1){
             $(list).append(Mustache.render(tpl, {
@@ -641,6 +645,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
+		<%--@elvariable id="workContractInfo" type=""--%>
 		<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/newSave" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<%--创建人--%>
@@ -662,7 +667,7 @@
 									<br>
 									<label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
 									<div class="layui-input-block">
-										<form:input path="workClientInfo.name" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control required layui-input"/>
+										<form:input path="clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control required layui-input"/>
 										<span id="ph" style="color:#cc5965"></span>
 									</div>
 									<div id="fuzzyQuerySelect"
@@ -694,15 +699,6 @@
 										<span id="uscPh" style="color:#cc5965"></span>
 									</div>
 								</div>
-<%--								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">--%>
-<%--									<br>--%>
-<%--									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>--%>
-<%--									<div>--%>
-<%--										<form:input path="" name="uscCode" placeholder="统一社会信用代码" htmlEscape="false" id="uscCode" class="form-control required layui-input"/>--%>
-<%--										<input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>--%>
-<%--										<span id="uscPh" style="color:#cc5965"></span>--%>
-<%--									</div>--%>
-<%--								</div><br>--%>
 							</div>
 						</div>
 					</div>
@@ -720,15 +716,16 @@
 									<label for="ext1">非投标项目</label>
 								</div>
 							</div>--%>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
-								<div class="layui-input-block with-icon" <%--style="margin-right:95px;"--%>>
-									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-													cssStyle="background-color:#fff" labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>--%>
+<%--								<div class="layui-input-block with-icon" &lt;%&ndash;style="margin-right:95px;"&ndash;%&gt;>--%>
+<%--									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"--%>
+<%--													cssStyle="background-color:#fff" labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>--%>
+
+<%--								</div>--%>
+<%--								&lt;%&ndash;<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>&ndash;%&gt;--%>
+<%--							</div>--%>
 
-								</div>
-								<%--<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>--%>
-							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block">
@@ -736,6 +733,12 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+								<div class="layui-input-block">
+									<form:input path="contractNum" placeholder="请输入合同编号" htmlEscape="false" class="form-control layui-input"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block">
 									<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
@@ -783,12 +786,6 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
-								<div class="layui-input-block">
-									<form:input path="contractNum" placeholder="请输入合同编号" htmlEscape="false" class="form-control layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">
 									<form:input path="anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>
@@ -916,30 +913,30 @@
 
 							</div>
 						</div>--%>
-						<div class="form-group layui-row">
-							<div class="form-group-label"><h2>联系人信息</h2></div>
+                        <div class="form-group layui-row">
+                            <div class="form-group-label"><h2>联系人信息</h2></div>
 							<div class="layui-item nav-btns">
 								<a class="nav-btn nav-btn-add"
 								   onclick="addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"
 								   title="新增"><i class="fa fa-plus"></i> 新增</a>
 							</div>
-							<div class="layui-item layui-col-xs12 form-table-container">
-								<table id="contentTable" class="table table-bordered table-condensed can-edit">
-									<thead>
-									<tr>
-										<th class="hide"></th>
-										<th width="100px"><font color="red">*</font>联系人姓名</th>
-										<th width="100px">部门</th>
-										<th width="100px">职务</th>
-										<th width="100px">QQ</th>
-										<th width="100px">联系方式1</th>
-										<th width="100px">联系方式2</th>
-										<th width="150px">E-mail</th>
-										<th width="100px">操作</th>
-									</tr>
-									</thead>
-									<tbody id="workClientLinkmanList">
-										<%--<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
+                            <div class="layui-item layui-col-xs12 form-table-container">
+                                <table id="contentTable" class="table table-bordered table-condensed can-edit">
+                                    <thead>
+                                    <tr>
+                                        <th class="hide"></th>
+                                        <th width="100px"><font color="red">*</font>联系人姓名</th>
+                                        <th width="100px">部门</th>
+                                        <th width="100px">职务</th>
+                                        <th width="100px">QQ</th>
+                                        <th width="100px">联系方式1</th>
+                                        <th width="100px">联系方式2</th>
+                                        <th width="150px">E-mail</th>
+                                        <th width="100px">操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody id="workClientLinkmanList">
+                                       <c:forEach items="${workContractInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
                                             <tr>
                                                    <td class="hide">
                                                        <input id="workClientLinkmanList${status.index + 1}_id"
@@ -947,31 +944,31 @@
                                                               value="${workClientLinkman.id}"/>
                                                        <input id="workClientLinkmanList${status.index + 1}_delFlag"
                                                               name="workClientLinkmanList[${status.index + 1}].delFlag" type="hidden"
-                                                              value="0" readonly/>
+                                                              value="0" />
                                                    </td>
                                                    <td><input id="workClientLinkmanList${status.index + 1}_name"
                                                               name="workClientLinkmanList[${status.index + 1}].name" type="text"
-                                                              value="${workClientLinkman.name}" readonly class="form-control required"/></td>
+                                                              value="${workClientLinkman.name}"  class="form-control required"/></td>
                                                    <td><input id="workClientLinkmanList${status.index + 1}_office"
                                                               name="workClientLinkmanList[${status.index + 1}].office" type="text"
-                                                              value="${workClientLinkman.office}" readonly class="form-control "/></td>
+                                                              value="${workClientLinkman.office}"  class="form-control "/></td>
                                                    <td><input  id="workClientLinkmanList${status.index + 1}_position"
                                                               name="workClientLinkmanList[${status.index + 1}].position" type="text"
-                                                              value="${workClientLinkman.position}" readonly class="form-control "/></td>
+                                                              value="${workClientLinkman.position}"  class="form-control "/></td>
                                                    <td><input id="workClientLinkmanList${status.index + 1}_qq"
                                                               name="workClientLinkmanList[${status.index + 1}].qq"
-                                                              type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
+                                                              type="text" value="${workClientLinkman.qq}"  class="form-control digits"/>
                                                    </td>
                                                    <td><input  id="workClientLinkmanList${status.index + 1}_linkMobile"
                                                               name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
-                                                              value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
+                                                              value="${workClientLinkman.linkMobile}"  class="form-control isPhone"/></td>
                                                    <td><input placeholder="请输入联系方式2" id="workClientLinkmanList${status.index + 1}_linkPhone"
                                                               name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
-                                                              value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
+                                                              value="${workClientLinkman.linkPhone}"  class="form-control isTel"/></td>
                                                    <td><input  id="workClientLinkmanList{{idx}}_email"
                                                               name="workClientLinkmanList[${status.index + 1}].email" type="text"
                                                               value="${workClientLinkman.email}"
-                                                              class="form-control email" readonly/></td>
+                                                              class="form-control email" /></td>
                                                    <td class="text-center op-td">
                                                     <span class="op-btn op-btn-delete"
                                                           onclick="delRow(this, '#workClientLinkmanList${status.index + 1}')"
@@ -979,10 +976,10 @@
                                                             class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
                                                    </td>
                                             </tr>
-                                        </c:forEach>--%>
-									</tbody>
-								</table>
-								<script type="text/template" id="workClientLinkmanTpl">//<!--
+                                        </c:forEach>
+                                    </tbody>
+                                </table>
+                                <script type="text/template" id="workClientLinkmanTpl">//<!--
             <tr id="workClientLinkmanList{{idx}}">
                 <td class="hide">
                     <input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -1042,9 +1039,9 @@
 										}
 									});
 
-								</script>
-							</div>
-						</div>
+                                </script>
+                            </div>
+                        </div>
 						<div class="form-group layui-row">
 							<div class="form-group-label"><h2>合同附件信息</h2></div>
 							<div class="layui-item nav-btns">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -143,12 +143,6 @@
 			}
         });
 
-        function addRow(list, idx, tpl, row){
-            var idx1 = $("#workClientInfoList tr").length;
-            if(list == '#workClientInfoList' && idx1 < 100){
-                bornTemplete(list, idx, tpl, row, idx1);
-            }
-        }
         function bornTemplete(list, idx, tpl, row, idx1){
             $(list).append(Mustache.render(tpl, {
                 idx: idx, delBtn: true, row: row,
@@ -194,8 +188,7 @@
                 $("#workClientInfoList tr").eq(i).find("td").eq(1).html(i + 1);
             }*/
         }
-
-        function getRandom(){
+		function getRandom(){
             var GetRandomn = 1;
             //js生成时间戳
             var timestamp=new Date().getTime();
@@ -275,6 +268,16 @@
                 }
             });
         }
+		function addRow(list, idx, tpl, row){
+			var idx1 = $("#workClientBankList tr").length;
+			if(list == '#workClientBankList'){
+				bornTemplete(list, idx, tpl, row, idx1);
+			}
+			var idx2 = $("#workClientLinkmanList tr").length;
+			if(list == '#workClientLinkmanList'){
+				bornTemplete(list, idx, tpl, row, idx2);
+			}
+		}
         function openBill2(title,url,width,height,target,formId){
             var frameIndex = parent.layer.getFrameIndex(window.name);
             var urls = url+"&index="+frameIndex;
@@ -339,29 +342,29 @@
                     }
                 }
             });
-            if(validateForm.form()){
-                $($document.getElementById(inputForm)).ajaxSubmit({
-                    success:function(data) {
-                        var d = data;
-                        if(d.msg == "false"){
-                            parent.layer.msg("保存客户信息异常!",{icon:2});
-                            return false;
-                        }
-                        $("#clientId").val(d.id);
-                        $("#clientName").val(d.name);
-                        addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
-                        var row = workClientInfoListRowIdx - 1 ;
-                        $("#"+"workClientInfoList"+row+"_id").val(d.id);
-                        $("#"+"workClientInfoList"+row+"_name").val(d.name);
-                        $("#"+"workClientInfoList"+row+"_companyType").val(d.companyType);
-                        $("#"+"workClientInfoList"+row+"_companyIndustry").val(d.companyIndustry);
-                        $("#"+"workClientInfoList"+row+"_area").val(d.areaName);
-                        //$("#"+"workClientInfoList"+row+"_td").hide();
-                        parent.layer.msg(d.str,{icon:1});
-                        top.layer.close(index)
-                    }
-                });
-            }
+			if(validateForm.form()){
+				$($document.getElementById(inputForm)).ajaxSubmit({
+					success:function(data) {
+						var d = data;
+						if(d.msg == "false"){
+							parent.layer.msg("保存客户信息异常!",{icon:2});
+							return false;
+						}
+						$("#clientId").val(d.id);
+						$("#clientName").val(d.name);
+						addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
+						var row = workClientInfoListRowIdx - 1 ;
+						$("#"+"workClientInfoList"+row+"_id").val(d.id);
+						$("#"+"workClientInfoList"+row+"_name").val(d.name);
+						$("#"+"workClientInfoList"+row+"_companyType").val(d.companyType);
+						$("#"+"workClientInfoList"+row+"_companyIndustry").val(d.companyIndustry);
+						$("#"+"workClientInfoList"+row+"_area").val(d.areaName);
+						//$("#"+"workClientInfoList"+row+"_td").hide();
+						parent.layer.msg(d.str,{icon:1});
+						top.layer.close(index)
+					}
+				});
+			}
         }
         function formSubmit2($document,inputForm,index){
             var validateForm = $($document.getElementById(inputForm)).validate({
@@ -591,6 +594,47 @@
 				<div class="tab-content">
 					<div id="tab-11" class="tab-pane active">
 						<div class="form-group layui-row first lw9">
+							<div class="form-group-label"><h2>客户基础信息</h2>
+								<div class="layui-item layui-col-sm6 lw7" id="">
+									<br>
+									<label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
+									<div class="layui-input-block">
+										<form:input path="clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control required layui-input"/>
+										<span id="ph" style="color:#cc5965"></span>
+									</div>
+									<div id="fuzzyQuerySelect"
+										 style="z-index:1;display:none;background-color:white; position: absolute; width:333px;left:120px; border: 1px solid gray;">
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
+									<div class="layui-input-block">
+										<form:input path="telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control required layui-input"/>
+
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6 lw7">
+									<label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
+									<div class="layui-input-block">&nbsp;&nbsp;
+										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="1" label="是" checked="true" />
+										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="2" label="否" />
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
+									<br>
+									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
+									<div class="layui-input-block">
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+										<input type="hidden" id="oldUscCode" value=""/>
+										<span id="uscPh" style="color:#cc5965"></span>
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group layui-row first lw9">
 							<div class="form-group-label"><h2>合同基础信息</h2></div>
 							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同来源：</label>
@@ -601,15 +645,15 @@
 									<label for="ext1">非投标项目</label>
 								</div>
 							</div>--%>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
-								<div class="layui-input-block with-icon" style="margin-right:95px;">
-									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
-
-								</div>
-								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
-							</div>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>--%>
+<%--								<div class="layui-input-block with-icon" style="margin-right:95px;">--%>
+<%--&lt;%&ndash;									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${clientName}"  title="选择客户" labelName="client.name"&ndash;%&gt;--%>
+<%--&lt;%&ndash;														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>&ndash;%&gt;--%>
+<%--										<form:input path="clientName" placeholder="${workContractInfo.clientName}" htmlEscape="false" id="clientName"   class="form-control required isUscCode layui-input"/>--%>
+<%--								</div>--%>
+<%--&lt;%&ndash;								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>&ndash;%&gt;--%>
+<%--							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block readOnlyFFF">
@@ -617,6 +661,12 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+								<div class="layui-input-block">
+									<form:input path="contractNum" htmlEscape="false" class="form-control layui-input"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block readOnlyFFF">
 									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
@@ -648,6 +698,12 @@
 								<div class="layui-input-block">
 									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
 									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+<%--								<br>--%>
+<%--									<label class="layui-form-label double-line"><span class="require-item">*</span>单位：</label>--%>
+<%--									<div class="layui-input-block">--%>
+<%--										<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>--%>
+<%--										<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >--%>
+<%--									</div>--%>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -998,6 +1054,13 @@
 			})
 		});
 	</script>
+	<script type="text/javascript">
+		var workClientInfoListRowIdx = 0,
+				workClientInfoListTpl = $("#workClientInfoListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+		if ($("#id").val() || $("#aId").val()) {
+			workClientInfoListRowIdx = ${fn:length(workContractInfo.workClientInfoList)};
+		}
+	</script>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -550,7 +550,7 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">客户名称：</label>
 						<div class="layui-input-block with-icon">
-							<form:input path="client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							<form:input path="clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item query athird">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -148,6 +148,12 @@
 							</div>
 						</div>
 						<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.contractNum}"/>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label "><span class="require-item">*</span>签订日期：</label>
 							<div class="layui-input-block">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>