更新平台审批流及返回移动端测试

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

src/main/java/com/uas/platform/b2b/mobile/controller/MobileFlowController.java

@@ -60,8 +60,8 @@ public class MobileFlowController {
 	 */
 	@RequestMapping(value = "/getNodesAndLog", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getNodesAndLog(Long id) {
-		return mobileFlowService.getNodesAndLog(id);
+	private ModelMap getNodesAndLog(Long id, String caller) {
+		return mobileFlowService.getNodesAndLog(id, caller);
 	}
 	
 	/**

src/main/java/com/uas/platform/b2b/mobile/dao/ApprovalLogDao.java

@@ -17,7 +17,7 @@ public interface ApprovalLogDao extends JpaRepository<ApprovalLog, Long>, JpaSpe
 	 * @param keyvalue
 	 * @return
 	 */
-	public List<ApprovalLog> getByKeyvalue(Long keyvalue);
+	public List<ApprovalLog> getByKeyvalueAndCaller(Long keyvalue, String caller);
 
 	/**
 	 * 通过来源id查询记录

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

@@ -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; 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

@@ -165,9 +165,9 @@ public class MobileFlowServiceImpl implements MobileFlowService {
 	}
 
 	@Override
-	public ModelMap getNodesAndLog(Long id) {
+	public ModelMap getNodesAndLog(Long id, String caller) {
 		ModelMap map = new ModelMap();
-		List<ApprovalLog> logs = approvalLogDao.getByKeyvalue(id);
+		List<ApprovalLog> logs = approvalLogDao.getByKeyvalueAndCaller(id, caller);
 		List<MobileNodes> mbds = new ArrayList<MobileNodes>();
 		List<MobileDocumentsProcess> mdps = new ArrayList<MobileDocumentsProcess>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

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

@@ -68,7 +68,20 @@ public class PublicInterForDetailServiceImpl implements PublicInterForDetailServ
 	@Override
 	public ModelMap deleteDocuments(Long id, Integer whichpage) {
 		ModelMap map = new ModelMap();
-		List<ApprovalLog> logs = approvalLogDao.getByKeyvalue(id);
+		String caller = null;
+		if (whichpage.equals(MobileStatus.FEEPLEASE.getValue())) {
+			caller = MobileStatus.FEEPLEASE.getPhrase();
+		}
+		if (whichpage.equals(MobileStatus.VACATION.getValue())) {
+			caller = MobileStatus.VACATION.getPhrase();
+		}
+		if (whichpage.equals(MobileStatus.WORKDAILY.getValue())) {
+			caller = MobileStatus.WORKDAILY.getPhrase();
+		}
+		if (whichpage.equals(MobileStatus.WORKOVERTIME.getValue())) {
+			caller = MobileStatus.WORKOVERTIME.getPhrase();
+		}
+		List<ApprovalLog> logs = approvalLogDao.getByKeyvalueAndCaller(id, caller);
 		if (!CollectionUtils.isEmpty(logs)) {// 先删除单据产生的审批相关记录
 			for (ApprovalLog log : logs) {
 				approvalLogDao.delete(log.getId());

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

@@ -112,7 +112,7 @@ public class VacationServiceImpl implements VacationService {
 		if (node != null) {
 			nodelevel = node.getNodelev();
 		}
-		if (nodelevel <= approvalFlowService.getMaxNodeByEnuuAndAppName(vacation.getEnuu(), appName)) {
+		if (nodelevel < approvalFlowService.getMaxNodeByEnuuAndAppName(vacation.getEnuu(), appName)) {
 			AppLog log = new AppLog();
 			log.setStatus(MobileStatus.ENTERING.getPhrase());
 			log.setStatusCode(MobileStatus.ENTERING.name());
@@ -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; 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

@@ -89,7 +89,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 			nodelevel = node.getNodelev();
 		}
 		if (flow != null) { // 该企业的该单据的审批流存在
-			if (nodelevel <= approvalFlowService.getMaxNodeByEnuuAndAppName(workDaily.getEnuu(), appName)) {
+			if (nodelevel < approvalFlowService.getMaxNodeByEnuuAndAppName(workDaily.getEnuu(), appName)) {
 				AppLog log = new AppLog();
 				log.setStatus(MobileStatus.ENTERING.getPhrase());
 				log.setStatusCode(MobileStatus.ENTERING.name());
@@ -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; 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

@@ -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; i <= approvalFlowService.getMaxNodeByEnuuAndAppName(workOvertime.getEnuu(),
 						appName); i++) {
 					ApprovalLog applog = new ApprovalLog(log);
 					applog.setNodedealman(approvalFlowService