Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r25418 -r25511 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 25418) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 25511) @@ -24,134 +24,143 @@ background-color: #80ff80; } - - -<% - request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName()); - //设置日期定义 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Calendar cal = Calendar.getInstance(); - String today = sdf.format(cal.getTime());//今天 - pageContext.setAttribute("today", today + ";" + today); + <% + request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName()); + + //设置日期定义 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar cal = Calendar.getInstance(); + String today = sdf.format(cal.getTime());//今天 + pageContext.setAttribute("today", today + ";" + today); + + cal.add(Calendar.DATE, -1); + String yesterday = sdf.format(cal.getTime());//昨天 + pageContext.setAttribute("yesterday", yesterday + ";" + yesterday); + + cal.add(Calendar.DATE, -1); + String threeDaysAgo = sdf.format(cal.getTime());//前天(近三天的起始日) + pageContext.setAttribute("lastThreeDays", threeDaysAgo + ";" + today); + + cal.add(Calendar.DATE, -4); + String sixDaysAgo = sdf.format(cal.getTime());//6天前(近一周的起始日) + pageContext.setAttribute("lastSixDays", sixDaysAgo + ";" + today); + + SterilisationManager sterilisationManager = (SterilisationManager)SpringBeanManger.getBean("sterilisationManager"); + List allSterilisationList = sterilisationManager.getAllSterilisation(); + + JSONArray allSterilisationJSONArray = new JSONArray(); + if(allSterilisationList != null){ + Collections.sort(allSterilisationList,Sterilisation.NAME_COMPARATOR); + for(Sterilisation sterilisation : allSterilisationList){ + JSONArray sterilisationJSONArray = new JSONArray(); + sterilisationJSONArray.add(sterilisation.getSterilisation()); + sterilisationJSONArray.add(sterilisation.getSterilisation()); + + allSterilisationJSONArray.add(sterilisationJSONArray); + } + JSONArray sterilisationJSONArray = new JSONArray(); + sterilisationJSONArray.add("无"); + sterilisationJSONArray.add("无"); + allSterilisationJSONArray.add(sterilisationJSONArray); + } + pageContext.setAttribute("allSterilisationStr", allSterilisationJSONArray.toString()); + %> + + + + + + + + + + + + + + + + + + + + + + + + + + + - cal.add(Calendar.DATE, -1); - String yesterday = sdf.format(cal.getTime());//昨天 - pageContext.setAttribute("yesterday", yesterday + ";" + yesterday); + + + + - cal.add(Calendar.DATE, -1); - String threeDaysAgo = sdf.format(cal.getTime());//前天(近三天的起始日) - pageContext.setAttribute("lastThreeDays", threeDaysAgo + ";" + today); + + - cal.add(Calendar.DATE, -4); - String sixDaysAgo = sdf.format(cal.getTime());//6天前(近一周的起始日) - pageContext.setAttribute("lastSixDays", sixDaysAgo + ";" + today); + + + - SterilisationManager sterilisationManager = (SterilisationManager)SpringBeanManger.getBean("sterilisationManager"); - List allSterilisationList = sterilisationManager.getAllSterilisation(); + + - JSONArray allSterilisationJSONArray = new JSONArray(); - if(allSterilisationList != null){ - Collections.sort(allSterilisationList,Sterilisation.NAME_COMPARATOR); - for(Sterilisation sterilisation : allSterilisationList){ - JSONArray sterilisationJSONArray = new JSONArray(); - sterilisationJSONArray.add(sterilisation.getSterilisation()); - sterilisationJSONArray.add(sterilisation.getSterilisation()); - - allSterilisationJSONArray.add(sterilisationJSONArray); - } - JSONArray sterilisationJSONArray = new JSONArray(); - sterilisationJSONArray.add("无"); - sterilisationJSONArray.add("无"); - allSterilisationJSONArray.add(sterilisationJSONArray); - } - pageContext.setAttribute("allSterilisationStr", allSterilisationJSONArray.toString()); -%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +

@@ -165,5 +174,9 @@ + + + + \ No newline at end of file