修改部分问题

WebRoot/WEB-INF/pages/fstzs/Fstzs_Print.jsp

@@ -132,7 +132,7 @@
 	<div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
 		<img class='screen-only' src="${ctx}/images/img/cw.jpg" style="position:absolute;width:100%;height:100%"/>
 		<div id='f1' draggable='true'
-			 class='f1'>${fstzsXm.jkr}
+			 class='f1'>${fstzsXm.jsdwmc}
 		</div>
 		<div id='f2' draggable='true'
 			 class='f2'>${fstzsXm.zhanghao}
@@ -153,7 +153,7 @@
 			 class='f7'>${fstzsXm.slbh}
 		</div>
 		<div id='f8' draggable='true'
-			 class='f8'>${fstzsXm.yjmj}
+			 class='f8'>${fstzsXm.paymentItemPending.csmj}
 		</div>
 		<div id='f9' draggable='true'
 			 class='f9'>${fstzsXm.yjje}

WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp

@@ -229,23 +229,25 @@
 					</tr>
 				</table>
 				</div>
-				<table width="100%" border="0" class="fu-advice">
+					<c:if test="${fstzsXm.status == 1}">
+						<table width="100%" border="0" class="fu-advice">
 
-					<tr >
-						<td width="0%" style="width: 0%"><div class="add-title">复核意见</div></td>
-						<td width="100%">
-							<textarea id="fhyj" name="fstzsXm.fhyj" style="width:96%;margin-top: 6px;" value="${fstzsXm.fhyj}"></textarea>
-						</td>
+							<tr >
+								<td width="0%" style="width: 0%"><div class="add-title">复核意见</div></td>
+								<td width="100%">
+									<textarea id="fhyj" name="fstzsXm.fhyj" style="width:96%;margin-top: 6px;" value="${fstzsXm.fhyj}"></textarea>
+								</td>
 
-					</tr>
-					<tr>
-						<td colspan="4" align="center" style="position: relative;top: 20px;">
-							<a href="###" class="btn_01" onclick="review(0);" >通过<b></b></a>&nbsp;
+							</tr>
+							<tr>
+								<td colspan="4" align="center" style="position: relative;top: 20px;">
+									<a href="###" class="btn_01" onclick="review(0);" >通过<b></b></a>&nbsp;
 
-							<a href="###" class="btn_01" onclick="review(1);" >退回<b></b></a>&nbsp;
-						</td>
-					</tr>
-				</table>
+									<a href="###" class="btn_01" onclick="review(1);" >退回<b></b></a>&nbsp;
+								</td>
+							</tr>
+						</table>
+					</c:if>
 			</div>
 			</form>
 		</div>

WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp

@@ -135,7 +135,7 @@
 					{field:'status',title:'是否复核',width:80,formatter: function (value, row, index){
 							if (value == 1) return "待复核";
 							if (value == 2 || value == 6) return "复核通过";
-							if (value == 3) return "待复不通过";
+							if (value == 3) return "复核不通过";
 							if (value == 4) return "作废退回";
 							return "待生成";
 

src/com/jshx/fstzs/web/FstzsAction.java

@@ -246,7 +246,12 @@ public class FstzsAction extends BaseAction {
         HashMap<String, Object> params = new HashMap<>();
         params.put("slbh",dbXm.getSlbh());
         fstzsList = fstzsService.findList(params);
-        dbXm.setBeizhu((TextUtils.isEmpty(dbXm.getBeizhu()) ? "" : dbXm.getBeizhu()) + "(" + dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票)");
+        String beizhuAppend = "(" + dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票)";
+        if(TextUtils.isEmpty(dbXm.getBeizhu())) {
+            dbXm.setBeizhu(beizhuAppend);
+        } else if(!dbXm.getBeizhu().contains(beizhuAppend)) {
+            dbXm.setBeizhu(dbXm.getBeizhu() + beizhuAppend);
+        }
         fstzsXmService.update(dbXm);
         return RELOAD;
     }
@@ -350,6 +355,7 @@ public class FstzsAction extends BaseAction {
         if("0".equals(flag)) {
             fstzsXm.setStatus(2);
         } else {
+            fstzsXm.setFhyj(this.fstzsXm.getFhyj());
             fstzsXm.setStatus(3);
         }
         fstzsXmService.update(fstzsXm);