添加核销成功

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

@@ -39,8 +39,8 @@
     <form id="myFormId" method="POST"
           action="${ctx}/monthAssessment/updateData.do" target="back">
         <input type="hidden" name="orgId" id="orgId" value="${org.orgId!''}" />
-        <input type="hidden" name="assessmentId" id="assessmentId"
-               value="${assessmentId!''}" />
+        <input type="hidden" name="assessmentMonId" id="assessmentMonId"
+               value="${assessmentMonId!''}" />
         <table class="tableStyle" formMode="line">
             <tr>
                 <td><span class="star"></span>单位编号:</td>
@@ -51,24 +51,27 @@
                            value="${org.orgName!''}" readonly="readonly" /></td>
             </tr>
             <tr>
-                <td><span class="star"></span>${assessmentMonth!''}月应收金额:</td>
+                <td><span class="star"></span>${assessmentMonth!''}月实用金额:</td>
                 <td><input type="text" id="amountReceivable"
                            name="amountReceivable" value="${amountReceivable!''}"
-                           readonly="readonly" /></td>
-                <td><span class="star"></span>${assessmentMonth!''}月付款方式:</td>
-                <td><select selectedValue="${modeOfPayment!''}"
-                            id="modeOfPayment" name="modeOfPayment"
-                            data='{"list":[{"value":"1","key":"现金"},{"value":"2","key":"转账"}]}'></select>
+                           readonly="readonly" disabled="true" /></td>
+                <td></span>${assessmentMonth!''}月超标比例:</td>
+                <td><input type="text" id="exceedRatio"
+                           name="exceedRatio" value="${exceedRatio!''}%"
+                           readonly="readonly" disabled="true" />
                 </td>
+
             </tr>
             <tr>
-                <td><span class="star"></span>开户银行:</td>
-                <td><input type="text" id="bank" name="bank" value=""
-                           disabled="true" /></td>
-                <td><span class="star"></span>银行帐号:</td>
-                <td><input type="text" id="bankAccount" name="bankAccount"
-                           disabled="true" /></td>
+                <td></span>${assessmentMonth!''}月应用金额:</td>
+                <td><input type="text" id="baseWaterAmount"
+                           name="baseWaterAmount" value="${baseWaterAmount!''}"
+                           readonly="readonly" disabled="true" /></td>
+                <td><span class="star"></span>${assessmentMonth!''}月实收金额:</td>
+                <td><input type="text" id="paidInAmount" name="paidInAmount"
+                           value="${paidInAmount!''}" readonly="true" disabled="true"/></td>
             </tr>
+
             <tr>
                 <td><span class="star"></span>是否销帐:</td>
                 <td><select selectedValue="${isWriteOff!''}" name="isWriteOff"
@@ -79,24 +82,31 @@
                            value="${writeOffDate!''}" dateFmt="yyyy-MM-dd" datatype="*" /></td>
             </tr>
             <tr>
-                <td><span class="star"></span>${assessmentMonth!''}月实收金额:</td>
-                <td><input type="text" id="paidInAmount" name="paidInAmount"
-                           value="${paidInAmount!''}" /></td>
+                <td><span class="star"></span>${assessmentMonth!''}月付款方式:</td>
+                <td><select selectedValue="${modeOfPayment!''}"
+                            id="modeOfPayment" name="modeOfPayment"
+                            data='{"list":[{"value":"1","key":"现金"},{"value":"2","key":"转账"}]}'></select>
+                </td>
+
                 <td><span class="star"></span>发票编号:</td>
                 <td><input type="text" id="invoiceNo" name="invoiceNo"
                            value="${invoiceNo!''}" /></td>
                 <!-- 				<td colspan="2"></td> -->
             </tr>
             <tr>
+                <td><span class="star"></span>开户银行:</td>
+                <td><input type="text" id="bank" name="bank" value=""
+                           disabled="true" /></td>
+                <td><span class="star"></span>银行帐号:</td>
+                <td><input type="text" id="bankAccount" name="bankAccount"
+                           disabled="true" /></td>
+            </tr>
+            <tr>
                 <td>备注</td>
                 <td colspan="3"><textarea rows="" cols="" id="remark"
                                           name="remark" style="width: 300px;">${remark!''}</textarea></td>
             </tr>
             <tr>
-                <td>是否开发票</td>
-                <td colspan="3"><input type="checkbox" name="isCheckFp"/></td>
-            </tr>
-            <tr>
                 <td colspan="4"><input type="submit" value="保存" /> <input
                         type="button" value="取消" onclick="top.Dialog.close()" /></td>
             </tr>

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

@@ -244,23 +244,25 @@ public class BusMonthAssessmentController extends BaseController {
     public String monthAssessmentWriteOff(Long entity_id,ModelMap model){
         BusMonthAssessment entity = busMonthAssessmentService.get(entity_id);
         BusOrg org = entity.getOrg();
-        List<Object[]> list = busMonthAssessmentService.getMonthAssessmentListPage
-                (1, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, entity_id,null,null);
+       // List<Object[]> list = busMonthAssessmentService.getMonthAssessmentListPage
+        //        (1, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, entity_id,null,null);
 
 
 
 
-        Object[] obj = list.get(0);
+        //Object[] obj = list.get(0);
         model.addAttribute("assessmentMonId",entity_id);
-        model.addAttribute("assessmentMonth", obj[8]);
-        model.addAttribute("amountReceivable", String.format("%.2f", obj[18]));
-        model.addAttribute("isWriteOff", obj[10]);
-        model.addAttribute("writeOffDate", obj[11]);
-        model.addAttribute("writeType", obj[19]);
-        model.addAttribute("modeOfPayment", obj[12]);
-        model.addAttribute("paidInAmount", obj[17]);
-        model.addAttribute("invoiceNo", obj[22]);
-        model.addAttribute("remark", obj[20]);
+        model.addAttribute("assessmentMonth", entity.getAssessmentMonth());
+        model.addAttribute("amountReceivable", String.format("%.2f", entity.getAmountReceivable()));
+        model.addAttribute("baseWaterAmount", String.format("%.2f", entity.getBaseWaterAmount()));
+        model.addAttribute("exceedRatio", String.format("%.2f", entity.getExceedRatio()));
+        model.addAttribute("isWriteOff", entity.getIsWriteOff());
+        model.addAttribute("writeOffDate", entity.getWriteOffDate());
+//        model.addAttribute("writeType", entity.getwr);
+        model.addAttribute("modeOfPayment", entity.getModeOfPayment());
+        model.addAttribute("paidInAmount",entity.getPaidInAmount());
+        model.addAttribute("invoiceNo",entity.getInvoiceNo());
+        model.addAttribute("remark", entity.getRemark());
         model.addAttribute("org", org);
         model.addAttribute("busMonthAssessment", entity);
         return "bus/month-assessment-write-off";