生成待审批任务时更新节点名称

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

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

@@ -122,7 +122,7 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 						+ emcode + "' and t.ta_uu = " + enuu + " order by t.ta_id desc ) where rownum < 2",
 				OfficeTask.class);
 		List<AppFlowOperation> lastProcess = commonDao.query(
-				"select * from ( select t.fop_nodename nodename from mobile$flowoperation t where t.fop_statuscode = 'UNAUDIT' and t.fop_nodedealuu = "
+				"select * from ( select t.fop_caller caller, t.fop_dealname dealname from mobile$flowoperation t where t.fop_statuscode = 'UNAUDIT' and t.fop_nodedealuu = "
 						+ emcode + " and t.fop_nodeenuu = " + enuu + " order by t.fop_id desc ) where rownum < 2",
 				AppFlowOperation.class);
 
@@ -134,7 +134,7 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 			map.put("lasttask", null);
 		}
 		if (!CollectionUtils.isEmpty(lastProcess)) {
-			map.put("lastProcess", lastProcess.get(0).getNodename());
+			map.put("lastProcess", lastProcess.get(0).getDealname() + lastProcess.get(0).getCaller());
 		} else {
 			map.put("lastProcess", null);
 		}
@@ -142,7 +142,7 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 	}
 
 	@Override
-	public ModelMap getMyTasks(Long emuu, Long enuu, Integer pageNumber, Integer pageSize, String status) {
+	public ModelMap getMyTasks(Long emuu, Long enuu, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
 		PageParams params = new PageParams();
 		params.setCount(pageSize);
@@ -150,7 +150,6 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("uu", enuu);
 		pageInfo.filter("recordercode", emuu);
-		pageInfo.filter("status", status);
 		Page<OfficeTask> officeTask = officeTaskDao.findAll(new Specification<OfficeTask>() {
 			public Predicate toPredicate(Root<OfficeTask> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();