流程重复单据处理及请假单更新数据保存不上bug的处理

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7470 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -135,8 +135,7 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 				applog.setProcessid(approvalFlowService
 						.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName, i).getId());
 				applog = approvalLogDao.save(applog);
-				node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName,
-						nodelevel + 1);
+				node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName, i);
 				if (applog.getId() != null) {
 					if (id != null) {
 						feePlease = feePleaseDao.findOne(id);

src/main/java/com/uas/platform/b2b/mobile/service/impl/VacationServiceImpl.java

@@ -93,6 +93,7 @@ public class VacationServiceImpl implements VacationService {
 			va = vacationDao.findOne(vacation.getVa_id());
 			va.setVa_statuscode(MobileStatus.ENTERING.name());
 			va.setVa_status(MobileStatus.ENTERING.getPhrase());
+			va.setVa_vacationtype(vacation.getVa_vacationtype());
 			va.setVa_date(new Date());
 			va.setOrderdate(new Date());
 			va.setVa_startime(vacation.getVa_startime());
@@ -136,8 +137,7 @@ public class VacationServiceImpl implements VacationService {
 				applog.setProcessid(approvalFlowService
 						.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName, i).getId());
 				applog = approvalLogDao.save(applog);
-				node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName,
-						nodelevel + 1);
+				node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName, i);
 				if (applog.getId() != null) {
 					// 新增待审批
 					AppFlowOperation operation = new AppFlowOperation();

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDailyServiceImpl.java

@@ -110,8 +110,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 					applog.setProcessid(approvalFlowService
 							.getNodeInfoByEnuuAndAppNameAndNodelev(workDaily.getEnuu(), appName, i).getId());
 					applog = approvalLogDao.save(applog);
-					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(workDaily.getEnuu(), appName,
-							nodelevel + 1);
+					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(workDaily.getEnuu(), appName, i);
 					if (applog.getId() != null) {
 						workDaily = workDailyDao.findOne(workDaily.getWd_id());
 						workDaily.setWd_status(MobileStatus.COMMITED.getPhrase());

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkOvertimeServiceImpl.java

@@ -145,8 +145,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 				applog.setProcessid(approvalFlowService
 						.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName, i).getId());
 				applog = approvalLogDao.save(applog);
-				node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName,
-						nodelevel + 1);
+				node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName, i);
 				if (applog.getId() != null) {
 					workOvertime = workOvertimeDao.findOne(id);
 					workOvertime.setWo_status(MobileStatus.COMMITED.getPhrase());