Browse Source

OA首页增加录入人是自己而且是待确认的 任务

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

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

@@ -87,12 +87,21 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 					planInfos.add(info);
 				}
 			}
+			// 执行人是自己的所有任务
 			String taskSql = "select t.ta_id id, t.ta_code code, t.ta_detail detail, t.ta_recordercode recordercode, t.ta_recorder recorder, "
 					+ "t.ta_doman doman, t.ta_domancode domancode, t.ta_startdate startdate, t.ta_enddate enddate, t.ta_status status, "
 					+ "t.ta_statuscode statuscode, t.ta_recorddate recorddate, t.ta_uu uu, t.ta_taskname taskname  from office$task t where "
 					+ "ta_uu = " + enuu + " and ta_domancode = " + emcode
 					+ " and  to_char(ta_startdate,'yyyymm') = '" + date + "'";
+			// 录入人是自己而且是待确认的
+			String metaskSql = "select t.ta_id id, t.ta_code code, t.ta_detail detail, t.ta_recordercode recordercode, t.ta_recorder recorder, "
+					+ "t.ta_doman doman, t.ta_domancode domancode, t.ta_startdate startdate, t.ta_enddate enddate, t.ta_status status, "
+					+ "t.ta_statuscode statuscode, t.ta_recorddate recorddate, t.ta_uu uu, t.ta_taskname taskname  from office$task t where "
+					+ "ta_uu = " + enuu + " and ta_recordercode = " + emcode + " and ta_statuscode = 'unconfirmed'"
+					+ " and  to_char(ta_startdate,'yyyymm') = '" + date + "'";
 			List<OfficeTask> task = commonDao.query(taskSql, OfficeTask.class);
+			List<OfficeTask> meTask = commonDao.query(metaskSql, OfficeTask.class);
+			task.addAll(meTask);
 			List<VisitRecord> records = getRecordsInOneMonth(emcode, enuu, date);
 			workSchedule.setTask(task);
 			workSchedule.setOutPlan(planInfos);