1

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp

@@ -225,7 +225,7 @@
                 }]
             }));
 
-			if("${rfxm.isSbj}" != 1) {//非市本级不显示添加按钮
+			if("${rfxm.isSbj}" != 1 || "${rfxm.mjyj}" == '004') {//非市本级不显示添加按钮
 				$('div.datagrid-toolbar a').eq(0).hide();
 			}
 		});
@@ -290,17 +290,7 @@
 						<table width="100%" border="0">
 							<tr>
 								<td colspan="4" height="100px" style="text-align:center">
-									<c:if test="${rfxm.isRfyz == 1}">
-										<c:if test="${rfxm.isSbj==1}">
-											<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费已用章（市本级）<b></b></a>
-										</c:if>
-										<c:if test="${rfxm.isSbj!=1}">
-											<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费已用章（非市本级）<b></b></a>
-										</c:if>
-
-									</c:if>
-
-									<c:if test="${rfxm.isRfyz != 1}">
+									<c:if test="${rfxm.enableRfyz == 1}">
 										<c:if test="${rfxm.isSbj==1}">
 											<a id="noticeBtn0" href="#" class="btn_01"
 											   onclick="generateNotice('${rfxm.id}');">人防费用章（市本级）<b></b></a>
@@ -309,9 +299,31 @@
 											<a id="noticeBtn0" href="#" class="btn_01"
 											   onclick="generateNotice('${rfxm.id}');">人防费用章（非市本级）<b></b></a>
 										</c:if>
+									</c:if>
+
+									<c:if test="${rfxm.enableRfyz != 1}">
+										<c:if test="${rfxm.isRfyz == 1}">
+											<c:if test="${rfxm.isSbj==1}">
+												<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费已用章（市本级）<b></b></a>
+											</c:if>
+											<c:if test="${rfxm.isSbj!=1}">
+												<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费已用章（非市本级）<b></b></a>
+											</c:if>
+
+										</c:if>
 
+										<c:if test="${rfxm.isRfyz != 1}">
+											<c:if test="${rfxm.isSbj==1}">
+												<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费用章（市本级）<b></b></a>
+											</c:if>
+											<c:if test="${rfxm.isSbj!=1}">
+												<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费用章（非市本级）<b></b></a>
+											</c:if>
+
+										</c:if>
 									</c:if>
 
+
 								</td>
 							</tr>
 						</table>

src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java

@@ -266,23 +266,22 @@ public class PaymentItemHisAction extends BaseAction
 			rfxm.setLxdh(model.getXmxxb().getPhone());//联系电话
 			rfxm.setJsdd(model.getXmxxb().getJsdd());
 			rfxm.setXkzh(model.getXmxxb().getXkzh());
-			rfxm.setPaymentLink(model.getXmxxb().getPaymentLink());
+
+			rfxm.setPaymentLink(model.getXmxxb().getPaymentLink() != null && model.getXmxxb().getPaymentLink() == 1 ? 1 : 3);
 			rfxm.setZsfw(model.getXmxxb().getZsfw());
 			rfxm.setSlbh(model.getXmxxb().getSlbh());
 			rfxm.setZslxdbh(model.getZslxdbh());
-			rfxm.setPaymentLink(model.getXmxxb().getPaymentLink());
 			rfxm.setXmdm(model.getXmxxb().getLxpw());
 			rfxm.setXmbh(model.getXmxxb().getXmbh());
 			rfxm.setMjyj(model.getXmxxb().getMjyj());
 			rfxm.setIsSl("002".equals(model.getXmxxb().getMjyj()) || "004".equals(model.getXmxxb().getMjyj()) ? 1 : 0);
-			rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
+			rfxm.setIsSbj(model.getXmxxb().getZsfw() != null && !model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
 			rfxm.setIsRfyz(0);
 			rfxm.setIsTqdy(0);
 			rfxm.setIsSl(0);
 			rfxm.setXmxxbId(model.getXmxxb().getId());
 			rfxm.setPaymentHisId(model.getId());
 			Map<String, Object> jktzmap1 = new HashMap<String, Object>();
-
 			jktzmap1.put("slbh", rfxm.getSlbh());
 			List<Jktzs> jklist=jktzsService.findByAll(jktzmap1);
 			if(jklist != null && jklist.size() > 0) {

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

@@ -290,6 +290,7 @@ public class Rfxm extends BaseModel
 
 	Integer enableTb;//同步按钮是否可以点击（false置灰）
 	Integer enableDy;//打印按钮是否可以点击(false置灰)
+	Integer enableRfyz;//人防用章置灰
 
 	/**
 	 * 缴款通知书编号
@@ -784,4 +785,12 @@ public class Rfxm extends BaseModel
 	public void setJktzsbh(String jktzsbh) {
 		this.jktzsbh = jktzsbh;
 	}
+
+	public Integer getEnableRfyz() {
+		return enableRfyz;
+	}
+
+	public void setEnableRfyz(Integer enableRfyz) {
+		this.enableRfyz = enableRfyz;
+	}
 }

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

@@ -380,11 +380,12 @@ public class RfxmAction extends BaseAction
 			PaymentItemHis paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
 			RfxmSfxx sfxx = new RfxmSfxx();
 			sfxx.setSfxmmc("城市基础设施配套费");
-			sfxx.setSfxmlxdbh(paymentItemHis.getZslxdbh());
+			sfxx.setSfxmlxdbh(rfxm.getJktzsbh());
 			sfxx.setYjjemx(paymentItemHis.getZyjje());
 			sfxx.setShbm(paymentItemHis.getZsdw());
 			sfxx.setZslxdbh(paymentItemHis.getZslxdbh());
 			sfxx.setUpdateTime(paymentItemHis.getUpdateTime());
+			sfxx.setCnjfhj(rfxm.getPaymentLink() != null && rfxm.getPaymentLink() == 3 ? "30日内" : "施工许可前");
 			sfxx.setStatus(2);
 			sfxx.setSfxxjbr(paymentItemHis.getJbr());
 			sfxx.setPaymentHisId(paymentItemHis.getId());
@@ -488,11 +489,25 @@ public class RfxmAction extends BaseAction
 				id = rfxm.getId();
 			}
 			rfxm = rfxmService.getById(id);
+			if(rfxm.getIsRfyz() == 1) {
+				rfxm.setEnableRfyz(0);
+			} else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
+				rfxm.setEnableRfyz(0);
+			} else if(rfxmSfxx == null || rfxmSfxx.size() == 0) {
+				rfxm.setEnableRfyz(0);
+			} else if(rfxmSfxx.get(0).getStatus() != 2) {
+				rfxm.setEnableRfyz(0);
+			} else {
+				rfxm.setEnableRfyz(1);
+			}
+
+
 			paraMap.put("rfxmid", id);
 			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap);
 			paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
 			paymentItemHis.setSlbh(rfxm.getJktzsbh());
 
+
 			Map<String, Object> paramMap = new HashMap<>();
 			List<String> remarks = yzssfglService.getJktzsRemarks(paramMap);
 			String remark = StringUtils.isBlank(remarks.get(0))?"此轮不涉及":remarks.get(0);
@@ -543,6 +558,7 @@ public class RfxmAction extends BaseAction
 			rfxmsfxx.setShbm("南京市城市建设费用征收服务中心");
 			rfxmsfxx.setZslxdbh(paymentItemHis.getZslxdbh());
 			rfxmsfxx.setSfxmlxdbh(rfxm.getJktzsbh());
+			rfxmsfxx.setCnjfhj(rfxm.getPaymentLink() ==1 ? "施工许可前" : "30日内");
 			return VIEW;
 		}else {
 			this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"获取当前收费信息失败,请稍后再试."+"\"}");
@@ -993,6 +1009,7 @@ public class RfxmAction extends BaseAction
 			rfxmService.update(rfxm);
 		}
 		rfxmsfxx.setZslxdbh(rfxm.getZslxdbh());
+		rfxmsfxx.setUpdateTime(new Date());
 		rfxmSfxxService.save(rfxmsfxx);
 //		}
 		return RELOAD;