修改月考核打印功能

WebContent/WEB-INF/view/bus/month-assessment-view.jsp

@@ -32,10 +32,10 @@
         <td>月份</td>
         <td>用水计划指标</td>
         <td>实际用水量</td>
-        <td>实际收水量</td>
-        <td>超用率</td>
+        <td>超标水量</td>
+        <td>超用率(%)</td>
         <td>应收金额</td>
-        <td>实收金额</td>
+        <td>超标金额</td>
         <td>是否销帐</td>
         <td>销帐日期</td>
         <td>付款方式</td>
@@ -51,7 +51,7 @@
         <td>${p.waterPlanningIndex!'' }</td>
         <td>${p.actualUseWater!'0' }</td>
         <td>${p.actualClosingWater!'0' }</td>
-        <td>${p.overWaterPercent!'0' }%</td>
+        <td>${p.exceedRatio!'0' }%</td>
         <td>${p.amountReceivable!'0' }</td>
         <td>${p.paidInAmount!'0' }</td>
         <td>${p.isWriteOff!'' }</td>

src/java/com/bus/model/temp/BusMonthAssessmentTemp2.java

@@ -344,10 +344,6 @@ public class BusMonthAssessmentTemp2 {
                 BusMonthAssessmentRule item =this.getBusMonthAssessmentRule().get(i);
                 str+="第"+item.getSectionNum()+"阶段，"+item.getAmount()+"元;";
             }
-
-
-
-
 //
 //            for (BusMonthAssessmentRule item:this.getBusMonthAssessmentRule()){
 //                str+="第"+item.getSectionNum()+"阶段，"+item.getAmount()+"元;";

src/java/com/bus/web/BusMonthAssessmentController.java

@@ -450,7 +450,46 @@ public class BusMonthAssessmentController extends BaseController {
      * @throws UnsupportedEncodingException
      */
     @RequestMapping("print.do")
-    public String print(Integer pageNo, Integer pageSize, Integer orgNumber, Integer customerNumber, Integer meterNumber,
+    public String print(Integer orgNumber, Integer customerNumber, Integer meterNumber,
+                        String orgName, String year, String address, String isPlanUser,
+                        String userType, String month, Integer overWaterBegin, Integer overWaterEnd, Integer amountReceivableBegin, Integer amountReceivableEnd,
+                        String flag, String ids, String exportType, String isWriteOff, Model model, HttpServletRequest request) throws UnsupportedEncodingException {
+        if(orgName!=null&&orgName!=""){
+            orgName = URLDecoder.decode(orgName,"utf-8");
+        }
+        if(address!=null&&address!=""){
+            address = URLDecoder.decode(address,"utf-8");
+        }
+        List<BusMonthAssessmentTemp2> list=null;
+        if(flag!=null&&flag.equals("selected")){
+            String[] assessmentId=ids.split(",");
+            list = busMonthAssessmentService.getMonthAssessmentForExcel2( orgNumber, customerNumber,
+                    meterNumber, orgName, year, address, isPlanUser, userType, month, overWaterBegin, overWaterEnd, amountReceivableBegin, amountReceivableEnd,assessmentId,isWriteOff);
+
+        }else
+        if(flag!=null&&flag.equals("query")){
+            list = busMonthAssessmentService.getMonthAssessmentForExcel2( orgNumber, customerNumber,
+                    meterNumber, orgName, year, address, isPlanUser, userType, month, overWaterBegin, overWaterEnd, amountReceivableBegin, amountReceivableEnd,null,isWriteOff);
+        }
+        model.addAttribute("list", list);
+        String view = "";
+        if("list".equals(exportType)){
+            view = "bus/month-assessment-view";
+        }else if("writeOff".equals(exportType)){
+            view = "bus/month-overwater-charge-collect-view";
+        }
+        return view;
+    }
+
+
+    /**
+     * 打印
+     * @param model
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    @RequestMapping("print2.do")
+    public String print2(Integer pageNo, Integer pageSize, Integer orgNumber, Integer customerNumber, Integer meterNumber,
                         String orgName, String year, String address, String isPlanUser,
                         String userType, String month, Integer overWaterBegin, Integer overWaterEnd, Integer amountReceivableBegin, Integer amountReceivableEnd,
                         String flag, String ids, String exportType, String isWriteOff, Model model, HttpServletRequest request) throws UnsupportedEncodingException {