Commit 7492f0fd authored by 徐州's avatar 徐州

修改went

parent 3023d760
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">缴费承诺环节${rfxmsfxx.tqjn}</th> <th width="15">缴费承诺环节</th>
<c:if test="${rfxm.paymentLink ==1}"> <c:if test="${rfxm.paymentLink ==1}">
<td width="35%"> <td width="35%">
施工许可前 施工许可前
......
...@@ -190,6 +190,10 @@ public class JfzmAction extends BaseAction { ...@@ -190,6 +190,10 @@ public class JfzmAction extends BaseAction {
public String fujian() { public String fujian() {
xmxxb = xmxxbService.getBySlbh(xmxxb.getSlbh()); xmxxb = xmxxbService.getBySlbh(xmxxb.getSlbh());
Map map = new HashMap();
map.put("xxylb",xmxxb.getXxylb());
Pagination pagination1 = wwjdclinfoService.findByPage(new Pagination(1,0),map);
wwjdclinfos = pagination1.getListOfObject();
return EDIT; return EDIT;
} }
...@@ -298,4 +302,12 @@ public class JfzmAction extends BaseAction { ...@@ -298,4 +302,12 @@ public class JfzmAction extends BaseAction {
public void setPaymentItemHis(PaymentItemHis paymentItemHis) { public void setPaymentItemHis(PaymentItemHis paymentItemHis) {
this.paymentItemHis = paymentItemHis; this.paymentItemHis = paymentItemHis;
} }
public List<Wwjdclinfo> getWwjdclinfos() {
return wwjdclinfos;
}
public void setWwjdclinfos(List<Wwjdclinfo> wwjdclinfos) {
this.wwjdclinfos = wwjdclinfos;
}
} }
...@@ -1226,19 +1226,19 @@ public class RfxmAction extends BaseAction ...@@ -1226,19 +1226,19 @@ public class RfxmAction extends BaseAction
rfxmSfxx = rfxmSfxxService.findRfxmSfxx(paraMap); rfxmSfxx = rfxmSfxxService.findRfxmSfxx(paraMap);
boolean result = true; boolean result = true;
String message = ""; String message = "";
if(rfxm.getIsRfyz() == 1) { // if(rfxm.getIsRfyz() == 1) {
result = false;//人防已经用章 // result = false;//人防已经用章
message = "人防已经用章"; // message = "人防已经用章";
} else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目 // } else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
result = false;//非市本级 // result = false;//非市本级
message = "项目来源为房改办,不需要人防用章"; // message = "项目来源为房改办,不需要人防用章";
} else if(rfxmSfxx == null || rfxmSfxx.size() == 0) { // } else if(rfxmSfxx == null || rfxmSfxx.size() == 0) {
result = false;//未添加人防费 // result = false;//未添加人防费
message = "请先添加人防费"; // message = "请先添加人防费";
} else if(rfxmSfxx.get(0).getStatus() != 2) { // } else if(rfxmSfxx.get(0).getStatus() != 2) {
result = false;//收费信息未复核,不允许用章 // result = false;//收费信息未复核,不允许用章
message = "人防费未复核"; // message = "人防费未复核";
} // }
this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\""+message+"\"}"); this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\""+message+"\"}");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment