修改问题

WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp

@@ -417,7 +417,7 @@ function updateZslxdbh(){
 
 							<c:otherwise>  <!--否则 -->
 								<c:choose>
-									<c:when test="${paymentLink == 3 && tgjn =='1' && status !='0'}"> <!--如果 -->
+									<c:when test="${paymentLink == 3 && tqjn ==1 && sfxxStatus !=0}"> <!--如果 -->
 										<div id='40' draggable='true' class='f40'>人防费未缴，仅用于 <br> 办理施工许可</div>
 									</c:when>
 									<c:otherwise>  <!--否则 -->

WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp

@@ -545,7 +545,7 @@
 
                             <c:otherwise>  <!--否则 -->
                                 <c:choose>
-                                    <c:when test="${paymentLink == 3 && tgjn =='1' && status !='0'}"> <!--如果 -->
+                                    <c:when test="${paymentLink == 3 && tqjn ==1 && sfxxStatus !=0}"> <!--如果 -->
                                         <div id='40' draggable='true' class='f40'>人防费未缴，仅用于 <br> 办理施工许可</div>
                                     </c:when>
                                     <c:otherwise>  <!--否则 -->

src/com/jshx/rfxm/entity/Rfxm.java

@@ -306,6 +306,7 @@ public class Rfxm extends BaseModel
 	 * 提前缴纳配套费
 	 */
 	private Integer tqjn;
+	private Integer sfxxStatus;
 
 	public Integer getTqjn() {
 		return tqjn;
@@ -806,4 +807,12 @@ public class Rfxm extends BaseModel
 	public void setEnableRfyz(Integer enableRfyz) {
 		this.enableRfyz = enableRfyz;
 	}
+
+	public Integer getSfxxStatus() {
+		return sfxxStatus;
+	}
+
+	public void setSfxxStatus(Integer sfxxStatus) {
+		this.sfxxStatus = sfxxStatus;
+	}
 }

src/com/jshx/rfxm/web/RfxmAction.java

@@ -646,24 +646,27 @@ public class RfxmAction extends BaseAction
 				if(rfxm.getPaymentLink() != 3) {//提前缴纳选未选是
 					sfxx.setStatus(2);
 				} else if(sfxx.getTqjn() != 1) {
-					rfxm.setTqjn(sfxx.getTqjn());
 					sfxx.setStatus(2);
 				} else if(sfxx.getStatus() == 1) {//提前选是，并且复核过1次，页面显示补录
 					sfxx.setStatus(2);
 				} else {//提前选是，1次未复核
 					sfxx.setStatus(1);
 				}
+				rfxm.setTqjn(sfxx.getTqjn());
+				rfxm.setSfxxStatus(sfxx.getStatus());
 				sfxx.setFhTime(new Date());
 				sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
 				if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
 					sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj());
 				}
+				rfxmService.update(rfxm);
 				rfxmSfxxService.update(sfxx);
 			} else {
 				//退回
 				rfxmSfxxService.deleteWithFlag(sfxx.getId());
 
 				rfxm.setTqjn(null);
+				rfxm.setSfxxStatus(null);
 				rfxm.setSfxmlxdbh(null);
 				rfxmService.update(rfxm);
 			}
@@ -1116,8 +1119,11 @@ public class RfxmAction extends BaseAction
 				paraMap.put("sfxmlxdbh", rfxmsfxx.getSfxmlxdbh());
 				rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap);
 				if(rfxmSfxx != null && rfxmSfxx.size() > 0) {
-					status = false;
-					message = "收费项目联系单编号重复";
+					if(rfxmSfxx.get(0).getPaymentHisId() != rfxm.getPaymentHisId()) {
+						status = false;
+						message = "收费项目联系单编号重复";
+					}
+
 				}
 			}
 		}