增加审批流排序；单据节点提交过滤自己审批节点

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

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

@@ -110,7 +110,7 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 		String appName = "出差单";
 		FlowNode node = approvalFlowService.getNodeInfoByEnuuAndEmcodeAndAppName(feePlease.getEnuu(),
 				feePlease.getEmcode(), appName);
-		Integer nodelevel = 0;
+		Integer nodelevel = -1;
 		if (node != null) {
 			nodelevel = node.getNodelev();
 		}
@@ -124,7 +124,7 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 			log.setCaller("出差单");
 			log.setEmcode(feePlease.getEmcode());
 			log.setEnuu(feePlease.getEnuu());
-			for (int i = nodelevel; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(feePlease.getEnuu(),
+			for (int i = nodelevel + 1; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(feePlease.getEnuu(),
 					appName); i++) {
 				ApprovalLog applog = new ApprovalLog(log);
 				applog.setNodedealman(approvalFlowService

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

@@ -182,6 +182,7 @@ public class MobileFlowServiceImpl implements MobileFlowService {
 				mbd.setJp_nodename(log.getNodename());
 				mbd.setJp_keyvalue(log.getKeyvalue());
 				mbds.add(mbd);
+				Collections.sort(mbds);
 			}
 			List<AppFlowOperation> operations = appFlowOperationDao.findBySourceid(id);
 			if (!CollectionUtils.isEmpty(operations)) {
@@ -196,6 +197,7 @@ public class MobileFlowServiceImpl implements MobileFlowService {
 						mdp.setJn_nodeDescription(op.getDescription());
 						mdp.setJn_result(op.getResult());
 						mdps.add(mdp);
+						Collections.sort(mdps);
 					}
 				}
 			}

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

@@ -108,7 +108,7 @@ public class VacationServiceImpl implements VacationService {
 		String appName = "请假单";
 		FlowNode node = approvalFlowService.getNodeInfoByEnuuAndEmcodeAndAppName(vacation.getEnuu(),
 				vacation.getEmcode(), appName);
-		Integer nodelevel = 0;
+		Integer nodelevel = -1;
 		if (node != null) {
 			nodelevel = node.getNodelev();
 		}
@@ -122,7 +122,7 @@ public class VacationServiceImpl implements VacationService {
 			log.setCaller("请假单");
 			log.setEmcode(vacation.getEmcode());
 			log.setEnuu(vacation.getEnuu());
-			for (int i = nodelevel; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(vacation.getEnuu(),
+			for (int i = nodelevel + 1; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(vacation.getEnuu(),
 					appName); i++) {
 				ApprovalLog applog = new ApprovalLog(log);
 				applog.setNodedealman(approvalFlowService

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

@@ -84,7 +84,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 		ApprovalFlow flow = approvalFlowDao.findByEnuuAndAppname(workDaily.getEnuu(), appName);
 		FlowNode node = approvalFlowService.getNodeInfoByEnuuAndEmcodeAndAppName(workDaily.getEnuu(),
 				workDaily.getEmcode(), appName);
-		Integer nodelevel = 0;
+		Integer nodelevel = -1;
 		if (node != null) {
 			nodelevel = node.getNodelev();
 		}
@@ -99,7 +99,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 				log.setCaller("工作日报");
 				log.setEmcode(workDaily.getEmcode());
 				log.setEnuu(workDaily.getEnuu());
-				for (int i = nodelevel; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(workDaily.getEnuu(),
+				for (int i = nodelevel + 1; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(workDaily.getEnuu(),
 						appName); i++) {
 					ApprovalLog applog = new ApprovalLog(log);
 					applog.setNodedealman(approvalFlowService

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

@@ -120,7 +120,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 		String appName = "加班单";
 		FlowNode node = approvalFlowService.getNodeInfoByEnuuAndEmcodeAndAppName(workOvertime.getEnuu(),
 				workOvertime.getEmcode(), appName);
-		Integer nodelevel = 0;
+		Integer nodelevel = -1;
 		if (node != null) {
 			nodelevel = node.getNodelev();
 		}
@@ -135,7 +135,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 				log.setCaller("加班单");
 				log.setEmcode(workOvertime.getEmcode());
 				log.setEnuu(workOvertime.getEnuu());
-				for (int i = nodelevel; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(workOvertime.getEnuu(),
+				for (int i = nodelevel + 1; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(workOvertime.getEnuu(),
 						appName); i++) {
 					ApprovalLog applog = new ApprovalLog(log);
 					applog.setNodedealman(approvalFlowService

src/main/java/com/uas/platform/b2b/temporary/model/MobileDocumentsProcess.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
  * @author hejq
  * @time 创建时间：2017年3月18日
  */
-public class MobileDocumentsProcess implements Serializable {
+public class MobileDocumentsProcess implements Serializable, Comparable<MobileDocumentsProcess> {
 
 	/**
 	 * 
@@ -79,4 +79,9 @@ public class MobileDocumentsProcess implements Serializable {
 		this.jn_nodeDescription = jn_nodeDescription;
 	}
 
+	@Override
+	public int compareTo(MobileDocumentsProcess o) {
+		return o.jn_id.compareTo(this.jn_id);
+	}
+
 }

src/main/java/com/uas/platform/b2b/temporary/model/MobileNodes.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
  * @author hejq
  * @time 创建时间：2017年3月18日
  */
-public class MobileNodes implements Serializable {
+public class MobileNodes implements Serializable, Comparable<MobileNodes> {
 
 	/**
 	 * 
@@ -78,4 +78,9 @@ public class MobileNodes implements Serializable {
 		this.jp_processdefid = jp_processdefid;
 	}
 
+	@Override
+	public int compareTo(MobileNodes o) {
+		return o.jp_id.compareTo(this.jp_id);
+	}
+
 }