Browse Source

处理移动接口产生多条审批流问题

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7536 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
fc3a48adb8

+ 2 - 1
src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -140,7 +140,8 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 					applog.setProcessid(approvalFlowService
 					applog.setProcessid(approvalFlowService
 							.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName, i).getId());
 							.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName, i).getId());
 					applog = approvalLogDao.save(applog);
 					applog = approvalLogDao.save(applog);
-					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName, i);
+					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(feePlease.getEnuu(), appName,
+							nodelevel + 1);
 					if (applog.getId() != null) {
 					if (applog.getId() != null) {
 						// 新增待审批
 						// 新增待审批
 						AppFlowOperation operation = new AppFlowOperation();
 						AppFlowOperation operation = new AppFlowOperation();

+ 2 - 1
src/main/java/com/uas/platform/b2b/mobile/service/impl/VacationServiceImpl.java

@@ -137,7 +137,8 @@ public class VacationServiceImpl implements VacationService {
 					applog.setProcessid(approvalFlowService
 					applog.setProcessid(approvalFlowService
 							.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName, i).getId());
 							.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName, i).getId());
 					applog = approvalLogDao.save(applog);
 					applog = approvalLogDao.save(applog);
-					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName, i);
+					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(vacation.getEnuu(), appName,
+							nodelevel + 1);
 					if (applog.getId() != null) {
 					if (applog.getId() != null) {
 						// 新增待审批
 						// 新增待审批
 						AppFlowOperation operation = new AppFlowOperation();
 						AppFlowOperation operation = new AppFlowOperation();

+ 2 - 1
src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDailyServiceImpl.java

@@ -109,7 +109,8 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 					applog.setProcessid(approvalFlowService
 					applog.setProcessid(approvalFlowService
 							.getNodeInfoByEnuuAndAppNameAndNodelev(daily.getEnuu(), appName, i).getId());
 							.getNodeInfoByEnuuAndAppNameAndNodelev(daily.getEnuu(), appName, i).getId());
 					applog = approvalLogDao.save(applog);
 					applog = approvalLogDao.save(applog);
-					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(daily.getEnuu(), appName, i);
+					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(daily.getEnuu(), appName,
+							nodelevel + 1);
 					if (applog.getId() != null) {
 					if (applog.getId() != null) {
 						// 新增待审批
 						// 新增待审批
 						AppFlowOperation operation = new AppFlowOperation();
 						AppFlowOperation operation = new AppFlowOperation();

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

@@ -144,7 +144,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 							.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName, i).getId());
 							.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName, i).getId());
 					applog = approvalLogDao.save(applog);
 					applog = approvalLogDao.save(applog);
 					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName,
 					node = approvalFlowService.getNodeInfoByEnuuAndAppNameAndNodelev(workOvertime.getEnuu(), appName,
-							i);
+							nodelevel + 1);
 					if (applog.getId() != null) {
 					if (applog.getId() != null) {
 
 
 						// 新增待审批
 						// 新增待审批

+ 2 - 2
src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkScheduleServiceImpl.java

@@ -192,7 +192,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 
 
 	@Override
 	@Override
 	public List<VisitRecord> getRecordsInOneMonth(Long emuu, Long enuu, String date) {
 	public List<VisitRecord> getRecordsInOneMonth(Long emuu, Long enuu, String date) {
-		String sql = "select p.vr_detail vr_detail, p.vr_emname vr_emname, p.vr_id vr_id, p.vr_startdate vr_startdate, p.vr_cuaddress vr_ceaddress, "
+		String sql = "select p.vr_detail vr_detail, p.vr_emname vr_emname, p.vr_id vr_id, p.vr_startdate vr_startdate, p.vr_cuaddress vr_cuaddress, "
 				+ "p.vr_title vr_title, p.vr_enddate vr_enddate, p.vr_cucontact vr_cucontact, p.vr_cuname vr_cuname from mobile$visitrecord p where "
 				+ "p.vr_title vr_title, p.vr_enddate vr_enddate, p.vr_cucontact vr_cucontact, p.vr_cuname vr_cuname from mobile$visitrecord p where "
 				+ "vr_emuu = " + emuu + " and vr_enuu = " + enuu + " and to_char(vr_date,'yyyymm') = '" + date + "'";
 				+ "vr_emuu = " + emuu + " and vr_enuu = " + enuu + " and to_char(vr_date,'yyyymm') = '" + date + "'";
 		List<VisitRecord> records = commonDao.query(sql, VisitRecord.class);
 		List<VisitRecord> records = commonDao.query(sql, VisitRecord.class);
@@ -201,7 +201,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 
 
 	@Override
 	@Override
 	public List<VisitRecord> getRecordsInOneMonth(Long enuu, String date) {
 	public List<VisitRecord> getRecordsInOneMonth(Long enuu, String date) {
-		String sql = "select p.vr_detail vr_detail, p.vr_emname vr_emname, p.vr_id vr_id, p.vr_startdate vr_startdate, p.vr_cuaddress vr_ceaddress, "
+		String sql = "select p.vr_detail vr_detail, p.vr_emname vr_emname, p.vr_id vr_id, p.vr_startdate vr_startdate, p.vr_cuaddress vr_cuaddress, "
 				+ "p.vr_title vr_title, p.vr_enddate vr_enddate, p.vr_cucontact vr_cucontact, p.vr_cuname vr_cuname from mobile$visitrecord p where "
 				+ "p.vr_title vr_title, p.vr_enddate vr_enddate, p.vr_cucontact vr_cucontact, p.vr_cuname vr_cuname from mobile$visitrecord p where "
 				+ "vr_enuu = " + enuu + " and to_char(vr_date,'yyyymm') = '" + date + "'";
 				+ "vr_enuu = " + enuu + " and to_char(vr_date,'yyyymm') = '" + date + "'";
 		List<VisitRecord> records = commonDao.query(sql, VisitRecord.class);
 		List<VisitRecord> records = commonDao.query(sql, VisitRecord.class);