Prechádzať zdrojové kódy

苏州分公司数据同步调整

sangwenwei 7 mesiacov pred
rodič
commit
adb6c2fd7d

+ 9 - 9
src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -590,15 +590,15 @@ public class ProjectReportRecordController extends BaseController {
 			addMessage(redirectAttributes, "报告归档流程审批失败");
 		}
 		//根据项目id获取苏州分公司人员发起的线上归档信息
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(projectReportRecord.getOfficeId())){
-				ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
-				//将该数据保存到ccpm cloud项目中
-				sendProjectInfoDataToCloud(reportRecord);
-			}
-		}
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(projectReportRecord.getOfficeId())){
+//				ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
+//				//将该数据保存到ccpm cloud项目中
+//				sendProjectInfoDataToCloud(reportRecord);
+//			}
+//		}
 
 		if (StringUtils.isNotBlank(projectReportRecord.getHome()) && projectReportRecord.getHome().equals("home")){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";

+ 18 - 18
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/ProjectPaperFilingController.java

@@ -169,15 +169,15 @@ public class ProjectPaperFilingController extends BaseController {
             addMessage(redirectAttributes, "纸质归档流程创建异常:"+e.getMessage());
         }
         //根据项目id获取苏州分公司人员发起的线上归档信息
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(paperFiling.getOfficeId())){
-                ProjectPaperFiling projectPaperFiling = service.findByProjectId(paperFiling.getProjectId());//从数据库取出记录的值
-                //将该数据保存到ccpm cloud项目中
-                sendProjectInfoDataToCloud(projectPaperFiling);
-            }
-        }
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(paperFiling.getOfficeId())){
+//                ProjectPaperFiling projectPaperFiling = service.findByProjectId(paperFiling.getProjectId());//从数据库取出记录的值
+//                //将该数据保存到ccpm cloud项目中
+//                sendProjectInfoDataToCloud(projectPaperFiling);
+//            }
+//        }
 
         if (StringUtils.isNotBlank(paperFiling.getView()) && paperFiling.getView().equals("filing")){
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
@@ -270,15 +270,15 @@ public class ProjectPaperFilingController extends BaseController {
             logger.error("Exception e:"+e);
         }
         //根据项目id获取苏州分公司人员发起的线上归档信息
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(t.getOfficeId())){
-                ProjectPaperFiling projectPaperFiling = service.findByProjectId(t.getProjectId());//从数据库取出记录的值
-                //将该数据保存到ccpm cloud项目中
-                sendProjectInfoDataToCloud(projectPaperFiling);
-            }
-        }
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(t.getOfficeId())){
+//                ProjectPaperFiling projectPaperFiling = service.findByProjectId(t.getProjectId());//从数据库取出记录的值
+//                //将该数据保存到ccpm cloud项目中
+//                sendProjectInfoDataToCloud(projectPaperFiling);
+//            }
+//        }
         if (StringUtils.isNotBlank(home) && "home".equals(home)){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if(StringUtils.isNotBlank(home) && home.equals("filingAll")){

+ 9 - 9
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -775,15 +775,15 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 addMessage(redirectAttributes, "发起质量复核失败。失败原因:"+str);
             }
             //根据项目id获取苏州分公司人员发起的质量复核信息
-            Office info = officeDao.getByName("苏州分公司");
-            List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-            for (Office office1 : officeList) {
-                if (office1.getId().equals(projectcontentinfo.getProjectOnRural().getOffice().getId())){
-                    ProjectReportData reportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectcontentinfo.getProjectOnRural().getId());
-                    //将该数据保存到ccpm cloud项目中
-                    sendProjectInfoDataToCloud(reportDateByProjectId);
-                }
-            }
+//            Office info = officeDao.getByName("苏州分公司");
+//            List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//            for (Office office1 : officeList) {
+//                if (office1.getId().equals(projectcontentinfo.getProjectOnRural().getOffice().getId())){
+//                    ProjectReportData reportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectcontentinfo.getProjectOnRural().getId());
+//                    //将该数据保存到ccpm cloud项目中
+//                    sendProjectInfoDataToCloud(reportDateByProjectId);
+//                }
+//            }
 
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){

+ 9 - 9
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewTwoController.java

@@ -882,15 +882,15 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
             logger.error("保存报告归档失败",e);
         }
         //根据项目id获取苏州分公司人员发起的线上归档信息
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(ruralProjectRecords.getOffice().getId())){
-                ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
-                //将该数据保存到ccpm cloud项目中
-                sendProjectInfoDataToCloud(reportRecord);
-            }
-        }
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(ruralProjectRecords.getOffice().getId())){
+//                ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
+//                //将该数据保存到ccpm cloud项目中
+//                sendProjectInfoDataToCloud(reportRecord);
+//            }
+//        }
         if("1".equals(ruralProjectRecords.getProjectType())){
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
         }else if("2".equals(ruralProjectRecords.getProjectType())){

+ 20 - 20
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -499,16 +499,16 @@ public class RuralCostProjectRecordsController extends BaseController {
             addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
         }
 		//判断项目创建人所属部门是否是苏州分公司
-		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
-		projectRecordsService.queryLinkmanInfos(records);
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(records.getOffice().getId())){
-				//将该数据保存到ccpm cloud项目中
-				sendProjectInfoDataToCloud(records);
-			}
-		}
+//		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
+//		projectRecordsService.queryLinkmanInfos(records);
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(records.getOffice().getId())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendProjectInfoDataToCloud(records);
+//			}
+//		}
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
 	}
 
@@ -536,16 +536,16 @@ public class RuralCostProjectRecordsController extends BaseController {
             addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
         }
 		//判断项目创建人所属部门是否是苏州分公司
-		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
-		projectRecordsService.queryLinkmanInfos(records);
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(records.getOffice().getId())){
-				//将该数据保存到ccpm cloud项目中
-				sendProjectInfoDataToCloud(records);
-			}
-		}
+//		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
+//		projectRecordsService.queryLinkmanInfos(records);
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(records.getOffice().getId())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendProjectInfoDataToCloud(records);
+//			}
+//		}
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
 	}
 

+ 18 - 18
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -749,15 +749,15 @@ public class RuralProjectMessageNewController extends BaseController {
                 addMessage(redirectAttributes, str);
             }
             //根据项目id获取苏州分公司人员发起的质量复核信息
-            Office info = officeDao.getByName("苏州分公司");
-            List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-            for (Office office1 : officeList) {
-                if (office1.getId().equals(projectcontentinfo1.getOfficeId())){
-                    ProjectReportData reportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectcontentinfo.getProject().getId());
-                    //将该数据保存到ccpm cloud项目中
-                    sendProjectInfoDataToCloud(reportDateByProjectId);
-                }
-            }
+//            Office info = officeDao.getByName("苏州分公司");
+//            List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//            for (Office office1 : officeList) {
+//                if (office1.getId().equals(projectcontentinfo1.getOfficeId())){
+//                    ProjectReportData reportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectcontentinfo.getProject().getId());
+//                    //将该数据保存到ccpm cloud项目中
+//                    sendProjectInfoDataToCloud(reportDateByProjectId);
+//                }
+//            }
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
@@ -1021,15 +1021,15 @@ public class RuralProjectMessageNewController extends BaseController {
         }
 
         //根据项目id获取苏州分公司人员发起的质量复核信息
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(records.getOffice().getId())){
-                ProjectReportData reportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(records.getId());
-                //将该数据保存到ccpm cloud项目中
-                sendProjectInfoDataToCloud(reportDateByProjectId);
-            }
-        }
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(records.getOffice().getId())){
+//                ProjectReportData reportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(records.getId());
+//                //将该数据保存到ccpm cloud项目中
+//                sendProjectInfoDataToCloud(reportDateByProjectId);
+//            }
+//        }
 
         if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && projectcontentinfo.getHome().equals("home")){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";

+ 18 - 18
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewTwoController.java

@@ -410,15 +410,15 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
                 addMessage(redirectAttributes, str);
             }
             //根据项目id获取苏州分公司人员发起的报告签发信息
-            Office info = officeDao.getByName("苏州分公司");
-            List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-            for (Office office1 : officeList) {
-                if (office1.getId().equals(projectcontentinfo.getProjectOnRural().getOffice().getId())){
-                    ProjectReportDataTwo reportData1 =projectReportDataService.findTwoByProjectId(projectcontentinfo.getProject().getId());
-                    //将该数据保存到ccpm cloud项目中
-                    sendProjectInfoDataToCloud1(reportData1);
-                }
-            }
+//            Office info = officeDao.getByName("苏州分公司");
+//            List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//            for (Office office1 : officeList) {
+//                if (office1.getId().equals(projectcontentinfo.getProjectOnRural().getOffice().getId())){
+//                    ProjectReportDataTwo reportData1 =projectReportDataService.findTwoByProjectId(projectcontentinfo.getProject().getId());
+//                    //将该数据保存到ccpm cloud项目中
+//                    sendProjectInfoDataToCloud1(reportData1);
+//                }
+//            }
             ProjectReportDataTwo projectReportData = projectcontentinfo.getProjectReportDataTwo();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
@@ -623,15 +623,15 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
             addMessage(redirectAttributes, str);
         }
         //根据项目id获取苏州分公司人员发起的报告签发信息
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(projectRecord.getOffice().getId())){
-                ProjectReportDataTwo reportData1 =projectReportDataService.findTwoByProjectId(projectRecord.getId());
-                //将该数据保存到ccpm cloud项目中
-                sendProjectInfoDataToCloud1(reportData1);
-            }
-        }
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(projectRecord.getOffice().getId())){
+//                ProjectReportDataTwo reportData1 =projectReportDataService.findTwoByProjectId(projectRecord.getId());
+//                //将该数据保存到ccpm cloud项目中
+//                sendProjectInfoDataToCloud1(reportData1);
+//            }
+//        }
         if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && projectcontentinfo.getHome().equals("home")){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && "notifyList".equals(projectcontentinfo.getHome())){

+ 20 - 20
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -389,16 +389,16 @@ public class RuralProjectRecordsController extends BaseController {
             addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
         }
 		//判断项目创建人所属部门是否是苏州分公司
-		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
-		projectRecordsService.queryLinkmanInfos(records);
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(records.getOffice().getId())){
-				//将该数据保存到ccpm cloud项目中
-				sendProjectInfoDataToCloud(records);
-			}
-		}
+//		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
+//		projectRecordsService.queryLinkmanInfos(records);
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(records.getOffice().getId())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendProjectInfoDataToCloud(records);
+//			}
+//		}
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 	}
 
@@ -482,16 +482,16 @@ public class RuralProjectRecordsController extends BaseController {
 			addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
 		}
 		//判断项目创建人所属部门是否是苏州分公司
-		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
-		projectRecordsService.queryLinkmanInfos(records);
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(records.getOffice().getId())){
-				//将该数据保存到ccpm cloud项目中
-				sendProjectInfoDataToCloud(records);
-			}
-		}
+//		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
+//		projectRecordsService.queryLinkmanInfos(records);
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(records.getOffice().getId())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendProjectInfoDataToCloud(records);
+//			}
+//		}
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 	}
 

+ 2 - 2
src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoAllController.java

@@ -225,8 +225,8 @@ public class WorkClientInfoAllController extends BaseController {
 			workClientInfoService.save(workClientInfo);//保存
 		}
 		//将新增的这条数据发送到cloud项目中,实现数据同步
-		WorkClientInfo clientInfo = workClientInfoService.getByName(workClientInfo.getName());
-		sendDataToCloud(clientInfo);
+//		WorkClientInfo clientInfo = workClientInfoService.getByName(workClientInfo.getName());
+//		sendDataToCloud(clientInfo);
 		addMessage(redirectAttributes, "保存客户管理成功");
 		return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfoAll/?repage";
 	}

+ 2 - 2
src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -247,8 +247,8 @@ public class WorkClientInfoController extends BaseController {
 		}
 		addMessage(redirectAttributes, "保存客户管理成功");
         //将新增的这条数据发送到cloud项目中,实现数据同步
-		WorkClientInfo clientInfo = workClientInfoService.getByName(workClientInfo.getName());
-		sendDataToCloud(clientInfo);
+//		WorkClientInfo clientInfo = workClientInfoService.getByName(workClientInfo.getName());
+//		sendDataToCloud(clientInfo);
 
 		return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfo/?repage";
 	}

+ 27 - 27
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1178,15 +1178,15 @@ public class WorkContractInfoController extends BaseController {
             e.printStackTrace();
         }
         //判断当前登录人所属部门是否是苏州分公司
-        WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(contractInfo.getChargeCompany())){
-                //将该数据保存到ccpm cloud项目中
-                sendContractInfoDataToCloud(contractInfo);
-            }
-        }
+//        WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(contractInfo.getChargeCompany())){
+//                //将该数据保存到ccpm cloud项目中
+//                sendContractInfoDataToCloud(contractInfo);
+//            }
+//        }
 
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }
@@ -1876,15 +1876,15 @@ public class WorkContractInfoController extends BaseController {
             addMessage(redirectAttributes, "审批失败");
         }
         //判断合同创建人所属部门是否是苏州分公司
-        WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(contractInfo.getChargeCompany())){
-                //将该数据保存到ccpm cloud项目中
-                sendContractInfoDataToCloud(contractInfo);
-            }
-        }
+//        WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(contractInfo.getChargeCompany())){
+//                //将该数据保存到ccpm cloud项目中
+//                sendContractInfoDataToCloud(contractInfo);
+//            }
+//        }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){
@@ -1941,15 +1941,15 @@ public class WorkContractInfoController extends BaseController {
             addMessage(redirectAttributes, "审批失败");
         }
         //判断合同创建人所属部门是否是苏州分公司
-        WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
-        Office info = officeDao.getByName("苏州分公司");
-        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-        for (Office office1 : officeList) {
-            if (office1.getId().equals(contractInfo.getChargeCompany())){
-                //将该数据保存到ccpm cloud项目中
-                sendContractInfoDataToCloud(contractInfo);
-            }
-        }
+//        WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractInfo.getContractNum());
+//        Office info = officeDao.getByName("苏州分公司");
+//        List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//        for (Office office1 : officeList) {
+//            if (office1.getId().equals(contractInfo.getChargeCompany())){
+//                //将该数据保存到ccpm cloud项目中
+//                sendContractInfoDataToCloud(contractInfo);
+//            }
+//        }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(workContractInfo.getHome()) && "notifyList".equals(workContractInfo.getHome())){

+ 27 - 27
src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -308,15 +308,15 @@ public class WorkContractRecordController extends BaseController {
 			addMessage(redirectAttributes, "系统内部错误");
 		}
 		//判断合同创建人所属部门是否是苏州分公司
-		WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractRecord.getWorkContractInfo().getContractNum());
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(contractInfo.getChargeCompany())){
-				//将该数据保存到ccpm cloud项目中
-				sendContractInfoDataToCloud(contractInfo);
-			}
-		}
+//		WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractRecord.getWorkContractInfo().getContractNum());
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(contractInfo.getChargeCompany())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendContractInfoDataToCloud(contractInfo);
+//			}
+//		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 	}
 	/**
@@ -358,15 +358,15 @@ public class WorkContractRecordController extends BaseController {
 			addMessage(redirectAttributes, "审批失败");
 		}
 		//判断合同创建人所属部门是否是苏州分公司
-		WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractRecord.getWorkContractInfo().getContractNum());
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(contractInfo.getChargeCompany())){
-				//将该数据保存到ccpm cloud项目中
-				sendContractInfoDataToCloud(contractInfo);
-			}
-		}
+//		WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractRecord.getWorkContractInfo().getContractNum());
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(contractInfo.getChargeCompany())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendContractInfoDataToCloud(contractInfo);
+//			}
+//		}
 		if (StringUtils.isNotBlank(workContractRecord.getHome()) && "home".equals(workContractRecord.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else if (StringUtils.isNotBlank(workContractRecord.getHome()) && "notifyList".equals(workContractRecord.getHome())){
@@ -508,15 +508,15 @@ public class WorkContractRecordController extends BaseController {
 			addMessage(redirectAttributes, "该合同归档不是送审状态,无法撤回");
 		}
 		//判断合同创建人所属部门是否是苏州分公司
-		WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractRecord.getWorkContractInfo().getContractNum());
-		Office info = officeDao.getByName("苏州分公司");
-		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
-		for (Office office1 : officeList) {
-			if (office1.getId().equals(contractInfo.getChargeCompany())){
-				//将该数据保存到ccpm cloud项目中
-				sendContractInfoDataToCloud(contractInfo);
-			}
-		}
+//		WorkContractInfo contractInfo = workContractInfoService.getByContractNum(workContractRecord.getWorkContractInfo().getContractNum());
+//		Office info = officeDao.getByName("苏州分公司");
+//		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+//		for (Office office1 : officeList) {
+//			if (office1.getId().equals(contractInfo.getChargeCompany())){
+//				//将该数据保存到ccpm cloud项目中
+//				sendContractInfoDataToCloud(contractInfo);
+//			}
+//		}
 		return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
 	}
 	/**