|
@@ -97,12 +97,16 @@ public class Visualization_Event_Controller extends AppBaseController {
|
|
|
@RequestMapping("/getVisualizationFrame")
|
|
|
public String getVisualizationFrame(ModelMap map, HttpServletRequest request) {
|
|
|
logger.info("getVisualizationFrame");
|
|
|
+ //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ SimpleDateFormat sdfStart = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
|
|
Calendar start_time = Calendar.getInstance();
|
|
|
Calendar end_time = Calendar.getInstance();
|
|
|
- start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH)-1);
|
|
|
+ //start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH)-1);
|
|
|
+ start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH) ,start_time.get(Calendar.HOUR_OF_DAY),start_time.get(Calendar.MINUTE)-30);
|
|
|
end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH));
|
|
|
- String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdf.format(start_time.getTime()) : request.getParameter("STARTTIME");
|
|
|
+ String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdfStart.format(start_time.getTime()) : request.getParameter("STARTTIME");
|
|
|
+ System.out.println("STARTTIME====="+STARTTIME);
|
|
|
String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
|
|
|
String EVENTNAME = request.getParameter("EVENTNAME");
|
|
|
String DEPTID = request.getParameter("DEPTID");
|
|
@@ -503,11 +507,13 @@ public class Visualization_Event_Controller extends AppBaseController {
|
|
|
@ResponseBody
|
|
|
public List<Visualization_Event> getAllPendingList(HttpServletRequest request){
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ SimpleDateFormat sdfStart = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
|
|
Calendar start_time = Calendar.getInstance();
|
|
|
Calendar end_time = Calendar.getInstance();
|
|
|
- start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH)-1);
|
|
|
+ //start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH)-1);
|
|
|
+ start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH),start_time.get(Calendar.HOUR_OF_DAY),start_time.get(Calendar.MINUTE)-30);
|
|
|
end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH));
|
|
|
- String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdf.format(start_time.getTime()) : request.getParameter("STARTTIME");
|
|
|
+ String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdfStart.format(start_time.getTime()) : request.getParameter("STARTTIME");
|
|
|
String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
|
|
|
String EVENTNAME = request.getParameter("EVENTNAME");
|
|
|
String DEPTID = request.getParameter("DEPTID");
|