修改部分问题

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

@@ -186,6 +186,10 @@
                     }
                 }]
             }));
+
+			if("${rfxm.isSbj}" != 1) {//非市本级不显示添加按钮
+				$('div.datagrid-toolbar a').eq(0).hide();
+			}
 		});
 	</script>
 </head>
@@ -248,7 +252,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="${!canRfyz}">
 										<c:if test="${rfxm.isSbj==1}">
 											<a id="noticeBtn0" href="#" class="btn_01" disabled="true"
 											   >人防费用章（市本级）<b></b></a>
@@ -258,7 +262,7 @@
 											   >人防费用章（非市本级）<b></b></a>
 										</c:if>
 									</c:if>
-									<c:if test="${rfxm.isRfyz!=1}">
+									<c:if test="${canRfyz}">
 										<c:if test="${rfxm.isSbj==1}">
 											<a id="noticeBtn0" href="#" class="btn_01"
 											   onclick="generateNotice('${rfxm.id}');">人防费用章（市本级）<b></b></a>

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

@@ -253,6 +253,11 @@ public class RfxmAction extends BaseAction
 	@Qualifier("sessionFactory")
 	private SessionFactory sessionFactory;
 
+	/**
+	 * 是否可以点击人防用章
+	 */
+	boolean canRfyz = true;
+
 
 	/**
 	 * 接口1：接收一站式信息并返回子账户
@@ -1415,7 +1420,17 @@ public class RfxmAction extends BaseAction
 			rfxm = rfxmService.getById(id);
 			paraMap.put("rfxmid", id);
 			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap);
-			//设置满7个缴费信息记录,没有数据的添加备注 start 2019-6-25
+			//TODO 判断是否可以点击人防用章
+			if(rfxm.getIsRfyz() == 1) {
+				canRfyz = false;//人防已经用章
+			} else if(rfxm.getIsSbj() != 1) {
+				canRfyz = false;//非市本级
+			} else if(rfxmSfxx == null || rfxmSfxx.size() == 0) {
+				canRfyz = false;//未添加人防费
+			} else if(rfxmSfxx.get(0).getStatusJBFH() != 2) {
+				canRfyz = false;//收费信息未复核，不允许用章
+			}
+
 			Map<String, Object> paramMap = new HashMap<>();
 			List<String> remarks = yzssfglService.getJktzsRemarks(paramMap);
 			String remark = StringUtils.isBlank(remarks.get(0))?"此轮不涉及":remarks.get(0);
@@ -3286,4 +3301,11 @@ public class RfxmAction extends BaseAction
 		return password;
 	}
 
+	public boolean isCanRfyz() {
+		return canRfyz;
+	}
+
+	public void setCanRfyz(boolean canRfyz) {
+		this.canRfyz = canRfyz;
+	}
 }