合同登记

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

@@ -567,6 +567,13 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 
 		super.save(workContractInfo);
+		List<WorkClientLinkman> linkmanList = workContractInfo.getWorkClientLinkmanList();
+		for (WorkClientLinkman clientLinkman : linkmanList) {
+			clientLinkman.setContractNum(workContractInfo.getContractNum());
+			clientLinkman.preInsert();
+			workClientLinkmanDao.insertLinkman(clientLinkman);
+
+		}
 		for (WorkClientAttachment workClientAttachment : workContractInfo.getWorkAttachments()){
 			if (workClientAttachment.getId() == null){
 				continue;
@@ -584,6 +591,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			}else{
 				workClientAttachmentDao.delete(workClientAttachment);
 			}
+
 		}
 	}
 	@Transactional(readOnly = false)
@@ -3333,69 +3341,60 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		String contractId = workContractInfo.getId();
 		WorkClientInfo client = workContractInfo.getClient();
 //			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();
-		//联系人
-//		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);
-//				}
-//			}
+
+//根据客户信息查询委托方联系人信息
+//		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);
 //		}
+		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);
+				}
+			}
+		}
 	}
 	@Transactional(readOnly = false)
 	public void auditInvalidate(WorkContractInfo workContractInfo) throws Exception {

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

@@ -570,8 +570,10 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
+        //获得联系人集合
+        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getContractNum()));
+//        System.out.println(workContractInfoService.getClientList(workContractInfo.getContractNum()));
         model.addAttribute("workContractInfo", workContractInfo);
-//        model.addAttribute("clientLinkmanList",clientLinkmanList);
         return "modules/workcontractinfo/workContractInfoAdminForm";
     }
 
@@ -1116,7 +1118,7 @@ public class WorkContractInfoController extends BaseController {
 //                workContractReview.setContractName(workContractInfo.getName());
 //                workContractReviewService.save(workContractReview);
                 Map<String, Object> variables = new HashMap<String, Object>();
-                t.setContractState("2");
+                t.setContractState("5");
                 String str=workContractInfoService.newSave(workClientLinkman,t, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
@@ -1160,7 +1162,7 @@ public class WorkContractInfoController extends BaseController {
                 workContractReview.setContractName(workContractInfo.getName());
                 workContractReviewService.save(workContractReview);*/
 
-                workContractInfo.setContractState("2");
+                workContractInfo.setContractState("5");
                 Map<String, Object> variables = new HashMap<String, Object>();
 //                workClientLinkman.setContractId(workContractInfo.getId());
                String str= workContractInfoService.newSave(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
@@ -1203,211 +1205,96 @@ public class WorkContractInfoController extends BaseController {
      * 暂存合同管理
      */
     @RequestMapping(value = "store")
-    public String store(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
-                       RedirectAttributes redirectAttributes) throws Exception {
-        if (!beanValidator(model, workContractInfo)) {
+    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();
-        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);
+        //判断是否有总合同
+        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 {
-                    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);
-                    }
+                    list2.add(workClientAttachment);
                 }
-                workContractInfo.setWorkAttachments(list1);
-                workContractInfo.setContractState("1");
-                workContractInfo.setRecordState("1");
-                workContractInfo.setSignatureStatus("1");
-//                workContractInfoService.save(workContractInfo);//暂存
-//                workContractInfoService.updateWorkContractInfo(workContractInfo);
+            }
+            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());
+            }*/
 
-                /* 合同评价信息
-                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
-                String id = workContractInfo.getId();
-                workContractReview.setContractId(id);
+            workContractInfoService.save(t);//保存
+//            workContractInfoService.updateWorkContractInfo(workContractInfo);
+            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+            if(workContractReview != null){
                 workContractReview.setWorkAttachments(list2);
                 workContractReview.setContractName(workContractInfo.getName());
-                workContractReviewService.save(workContractReview);*/
+                workContractReviewService.save(workContractReview);
+            }
+            addMessage(redirectAttributes, "暂存合同管理成功");
+            return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+        }else{//新增表单保存
+            //第一次创建都只能给部门负责人审核
+            String comId = UserUtils.getUser().getComId();
+            String name = UserUtils.getUser().getName();
 
-                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);
+            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 {
-                    addMessage(redirectAttributes, "保存合同管理成功");
+                    list2.add(workClientAttachment);
                 }
             }
-        }catch (Exception e){
-            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);
 
-            logger.error("Exception e:"+e);
-            e.printStackTrace();
+            addMessage(redirectAttributes, "暂存合同管理成功");
         }
         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";
-//    }
 
 
 
@@ -1415,121 +1302,6 @@ 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);
@@ -1555,8 +1327,9 @@ public class WorkContractInfoController extends BaseController {
         WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
         //将编辑表单中的非NULL值覆盖数据库记录中的值
         MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
+
         workContractInfoService.save(t);//保存
-        workContractInfoService.updateWorkContractInfo(workContractInfo);
+//        workContractInfoService.updateWorkContractInfo(workContractInfo);
         //admin修改合同归档案卷号
         //如果案卷号不为空 则进行修改，否则不修改
 //        if(StringUtils.isNotBlank(workContractInfo.getFileNum()) && StringUtils.isNotBlank(workContractInfo.getFileNumTow())){