|
@@ -39,6 +39,7 @@ import com.jeeplus.modules.workcalendar.entity.WorkCalendar;
|
|
import com.jeeplus.modules.workcalendar.service.WorkCalendarService;
|
|
import com.jeeplus.modules.workcalendar.service.WorkCalendarService;
|
|
import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
|
|
import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
|
|
import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
|
|
import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
|
|
|
|
+import net.sf.json.JSONArray;
|
|
import net.sf.json.JSONObject;
|
|
import net.sf.json.JSONObject;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.authz.UnauthorizedException;
|
|
import org.apache.shiro.authz.UnauthorizedException;
|
|
@@ -58,6 +59,7 @@ import javax.servlet.http.Cookie;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -423,15 +425,19 @@ public class LoginController extends BaseController{
|
|
oaNotify.setPage(new Page());
|
|
oaNotify.setPage(new Page());
|
|
List<OaNotify> list = oaNotifyService.findAll(oaNotify);
|
|
List<OaNotify> list = oaNotifyService.findAll(oaNotify);
|
|
List<Map<String,Object>> mapList = Lists.newArrayList();
|
|
List<Map<String,Object>> mapList = Lists.newArrayList();
|
|
|
|
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
|
|
for (OaNotify info: list) {
|
|
for (OaNotify info: list) {
|
|
Map map = new HashMap();
|
|
Map map = new HashMap();
|
|
|
|
+ map.put("id",info.getId());
|
|
map.put("title",info.getTitle());
|
|
map.put("title",info.getTitle());
|
|
map.put("type",info.getType());
|
|
map.put("type",info.getType());
|
|
map.put("readFlagStr",info.getReadFlagStr());
|
|
map.put("readFlagStr",info.getReadFlagStr());
|
|
- map.put("updateDate",info.getUpdateDate());
|
|
|
|
|
|
+ map.put("updateDate",formatter.format(info.getUpdateDate()));
|
|
mapList.add(map);
|
|
mapList.add(map);
|
|
}
|
|
}
|
|
- model.addAttribute("oaNotifyList", mapList);
|
|
|
|
|
|
+ //List转json格式
|
|
|
|
+ JSONArray json = JSONArray.fromObject(mapList);
|
|
|
|
+ model.addAttribute("oaNotifyList", json);
|
|
//待办事项
|
|
//待办事项
|
|
WorkProjectNotify workProjectNotify = new WorkProjectNotify();
|
|
WorkProjectNotify workProjectNotify = new WorkProjectNotify();
|
|
workProjectNotify.setUser(user);
|
|
workProjectNotify.setUser(user);
|