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