|
|
@@ -97,8 +97,8 @@ public class task2 extends Controller {
|
|
|
QuerySQL taskquerySQL = SQLFactory.createQuerySQL(this, "sys_task", "t1.*").setTableAlias("t1");
|
|
|
taskquerySQL.setSiteid(siteid);
|
|
|
taskquerySQL.setWhere("createuserid", taskUserid);
|
|
|
- taskquerySQL.setWhere("year(createdate)=" + year);
|
|
|
- taskquerySQL.setWhere("month(createdate)=" + month);
|
|
|
+ taskquerySQL.setWhere("year(taskdate)=" + year);
|
|
|
+ taskquerySQL.setWhere("month(taskdate)=" + month);
|
|
|
taskquerySQL.setCondition("t1.title");
|
|
|
Rows taskrows = taskquerySQL.query();
|
|
|
RowsMap taskRowsMap = taskrows.toRowsMap("taskdate");
|
|
|
@@ -179,6 +179,7 @@ public class task2 extends Controller {
|
|
|
querySQL.setWhere("status=0 and userid>0");
|
|
|
querySQL.setWhere("t1.hrid", hrids);
|
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
|
+ querySQL.setCondition("t1.name");
|
|
|
Rows rows = querySQL.query();
|
|
|
|
|
|
return getSucReturnObject().setData(rows).toString();
|