Skip to content

N
njzsb
Commit 1b844310 authored by 徐州's avatar 徐州
Browse files
Options

修改问题

parent 7e23e946
Show whitespace changes
Inline Side-by-side
Showing with 184 additions and 30 deletions
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ 1b844310
......@@ -278,7 +278,7 @@
<select name="paymentLink" id="paymentLink">
<option value="">请选择</option>
<option value="1">施工许可前</option>
<option value="3">30日</option>
<option value="3">30日内</option>
</select>
</td>
<th width="15%">人防费是否用章</th>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ 1b844310
......@@ -69,7 +69,13 @@
<%-- 查看收费信息 --%>
function view(row_id) {
var dt = new Date();
createSimpleWindow("win_rfxmsfxxview","查看收费信息","${ctx}/jsp/rfxm/rfxmSfxxView.action?ids="+row_id+"&dt="+dt.getTime(),900,600);
createSimpleWindow("win_rfxmsfxxview","查看收费信息","${ctx}/jsp/rfxm/rfxmSfxxView.action?ids="+row_id+"&dt="+dt.getTime(),900,660);
}
<%-- 查看收费信息 --%>
function view2(row_id) {
var dt = new Date();
createSimpleWindow("win_rfxmsfxxview","查看收费信息","${ctx}/jsp/rfxm/rfxmSfxxView2.action?ids="+row_id+"&dt="+dt.getTime(),900,500);
}
<%-- 下载缴费信息附件 --%>
......@@ -178,6 +184,8 @@
if (rec.tqjn == 1 && rec.statusJBFH == 2) {//延后缴纳并且已通过核验，显示补录
btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>"
}
} else {
btnTag += "<a class='btn_01_mini' onclick=view2('"+rec.paymentHisId+"') >查看<b></b></a>";
}
return btnTag;
}},
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ 1b844310
......@@ -233,7 +233,6 @@
<th width="15%">项目代码</th>
<td width="35%">
<input id="xmdm" name="rfxm.xmdm" style="width:90%" value="${rfxm.xmdm}" disabled/>
<font style='color:red'>*</font>
</td>
<th width="15">信息一览表编号</th>
<td width="35%">
......@@ -264,31 +263,26 @@
<th width="15">工程项目名称</th>
<td width="35%">
<input id="gcxmmc" name="rfxm.gcxmmc" style="width:90%" value="${rfxm.gcxmmc}" disabled/>
<font style='color:red'>*</font>
</td>
<th width="15">工程项目地点</th>
<td width="35%">
<input id="gcxmdd" name="rfxm.gcxmdd" style="width:90%" value="${rfxm.gcxmdd}" disabled/>
<font style='color:red'>*</font>
</td>
</tr>
<tr>
<th width="15">地上建筑面积</th>
<td width="35%">
<input id="dsjzmj" name="rfxm.dsjzmj" style="width:90%" value="${rfxm.dsjzmj}" disabled/>
<font style='color:red'>*</font>
</td>
<th width="15">地下建筑面积</th>
<td width="35%">
<input id="dxjzmj" name="rfxm.dxjzmj" style="width:90%" value="${rfxm.dxjzmj}" disabled/>
<font style='color:red'>*</font>
</td>
</tr>
<tr>
<th width="15">建设单位联系人</th>
<td width="35%">
<input id="jsdwlxr" name="rfxm.jsdwlxr" style="width:90%" value="${rfxm.jsdwlxr}" disabled/>
<font style='color:red'>*</font>
</td>
<th width="15">联系电话</th>
<td width="35%">
......@@ -296,6 +290,66 @@
</td>
</tr>
</table>
<c:if test="${rfxmsfxx.id == null}">
<form name="myform2" method="post" enctype="multipart/form-data">
<s:token />
<input type="hidden" name="flag" value="${flag}" id="flag">
<input type="hidden" name="rfxm.id" value="${rfxm.id}">
<input id="sfxxid" type="hidden" name="rfxmsfxx.id" value="${rfxmsfxx.id}">
<input type="hidden" name="allFileName" id="allFileName"/>
<input type="hidden" name="originFileName" id="originFileName"/>
<div id="payDiv" class="easyui-accordion" style="">
<div id="showTitle" class="" title="查看收费信息" data-options="iconCls:'icon-ok'" style="overflow:auto;padding:10px;">
<table width="100%" border="0" id="sfTable">
<tr>
<th width="15">收费项目名称</th>
<td width="35%">
<input id="sfxmmc" name="rfxmsfxx.sfxmmc" style="width:90%" value="${rfxmsfxx.sfxmmc}" readonly/>
</td>
<th width="15">审核部门</th>
<td width="35%">
<input id="shbm" name="rfxmsfxx.shbm" style="width:90%" value="${rfxmsfxx.shbm}" readonly/>
</td>
</tr>
<tr>
<th width="15">缴款通知书编号</th>
<td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" readonly/>
</td>
<th width="15">应缴金额</th>
<td width="35%">
<input id="yjjemx" name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}" style="width:90%" readonly/>
</td>
</tr>
<tr>
<th width="15">承诺缴费环节</th>
<td width="35%">
<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
</td>
</tr>
<tr>
<th width="15">缴费凭证编号</th>
<td width="35%">
<input id="zslxdbh" name="rfxmsfxx.zslxdbh" style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
</td>
</tr>
</table>
</div>
</div>
<table width="100%" border="0">
<tr>
<td colspan="4" height="100px" style="text-align:center">
<a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxxview');">关闭<b></b></a>
</td>
</tr>
</table>
</form>
</c:if>
<c:if test="${rfxmsfxx.id != null}">
<form name="myform1" method="post" enctype="multipart/form-data">
<s:token />
<input type="hidden" name="flag" value="${flag}" id="flag">
......@@ -321,12 +375,10 @@
<th width="15">缴款通知书编号</th>
<td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" readonly/>
<font style='color:red'>*</font>
</td>
<th width="15">应缴金额</th>
<td width="35%">
<input id="yjjemx" name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}" style="width:90%" readonly/>
<font style='color:red'>*</font>
</td>
</tr>
<tr>
......@@ -359,7 +411,12 @@
<tr>
<th width="15">复核意见</th>
<td width="85%">
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%"></textarea>
<c:if test="${rfxmsfxx.statusJBFH==2}">
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%" readonly>${rfxmsfxx.sfxxfhyj}</textarea>
</c:if>
<c:if test="${rfxmsfxx.statusJBFH!=2}">
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%">${rfxmsfxx.sfxxfhyj}</textarea>
</c:if>
</td>
</tr>
</table>
......@@ -384,6 +441,10 @@
</tr>
</table>
</form>
</c:if>
</div>
</div>
</div>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 1b844310
......@@ -12,7 +12,9 @@ import com.jshx.core.utils.SysPropertiesUtil;
import com.jshx.paymentItemHis.entity.PaymentItemHis;
import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.entity.RfxmSfxx;
import com.jshx.rfxm.service.RfxmService;
import com.jshx.rfxm.service.RfxmSfxxService;
import com.jshx.wwjdclinfo.entity.Wwjdclinfo;
import com.jshx.wwsqys.entity.Wwsqys;
import com.jshx.xmxxb.entity.Xmxxb;
......@@ -37,6 +39,8 @@ public class JfzmAction extends BaseAction {
@Autowired
RfxmService rfxmService;
@Autowired
RfxmSfxxService rfxmSfxxService;
@Autowired
XmxxbService xmxxbService;
@Autowired
PaymentItemHisService paymentItemHisService;
......@@ -125,15 +129,30 @@ public class JfzmAction extends BaseAction {
pagination = rfxmService.findByPage(pagination, paraMap);
for (int i = 0; i < pagination.list.size(); i++) {
Rfxm r = (Rfxm) pagination.list.get(i);
PaymentItemHis pih = paymentItemHisService.getById(r.getPaymentHisId());
Map<String, Object> pm = new HashMap<>();
pm.put("rfxmid", id);
List<RfxmSfxx> rfxmSfxxList = rfxmSfxxService.findRfxmSfxx(pm);
RfxmSfxx sfxx = rfxmSfxxList == null || rfxmSfxxList.size() == 0 ? null : rfxmSfxxList.get(0);
//TODO 1,判断是否显示同步按钮 2，判断是否置灰
r.setShowTb(r.getIsSl() != 1);//房改办,竖联,不显示施工许可
try {
r.setShowTb(Double.parseDouble(pih.getPtyjje()) != 0);//配套费=0,不显示一般缴费证明
} catch (Exception e) {
boolean showTb;
boolean showDy;
boolean showYb;
}
r.setEnableDy(r.getIsRfyz() == 1 || r.getIsSl() == 1);//人防用章后，才可以打印
if(r.getIsRfyz() == 1) {//人防用章后可以同步
r.setEnableTb(true);
} else if(sfxx != null && sfxx.getTqjn() == 1 && sfxx.getStatusJBFH() == 2) {//显示补录时可以同步
r.setEnableTb(true);
} else {
r.setEnableTb(false);
}
boolean enableTb;
boolean enableDy;
boolean enableYb;
}
convObjectToJson(pagination, config);
......
src/com/jshx/rfxm/conf/struts-rfxm.xml
View file @ 1b844310
......@@ -136,6 +136,10 @@
<action name="rfxmSfxxView" class="com.jshx.rfxm.web.RfxmAction" method="sfxxView">
<result name="view">/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp</result>
</action>
<!-- 跳转收费信息列表页面 -->
<action name="rfxmSfxxView2" class="com.jshx.rfxm.web.RfxmAction" method="sfxxView2">
<result name="view">/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp</result>
</action>
<!-- 跳转缴款通知书列表页面 -->
<action name="rfxmJktzsDetail" class="com.jshx.rfxm.web.RfxmAction" method="view">
<result name="view">/WEB-INF/pages/rfxm/Rfxm_Jktzs_Detail.jsp</result>
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 1b844310
......@@ -5,6 +5,7 @@ import com.jshx.core.base.entity.BaseModel;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
......@@ -283,20 +284,17 @@ public class Rfxm extends BaseModel
*/
public String jbr;
/**
* 同步次数
* 可以补录的，可以同步2次
* 不能补录的，只能通过一次
*/
public String tongbu;
public String getTongbu() {
return tongbu;
}
@Transient
boolean showTb;//是否显示同步按钮
@Transient
boolean showYb;//是否显示一般缴费按钮
@Transient
boolean enableTb;//同步按钮是否可以点击（false置灰）
@Transient
boolean enableDy;//打印按钮是否可以点击(false置灰)
public void setTongbu(String tongbu) {
this.tongbu = tongbu;
}
/**
* 收费项目联系单编号
*/
......@@ -745,4 +743,36 @@ public class Rfxm extends BaseModel
public void setPaymentHisId(String paymentHisId) {
this.paymentHisId = paymentHisId;
}
public boolean isShowTb() {
return showTb;
}
public void setShowTb(boolean showTb) {
this.showTb = showTb;
}
public boolean isShowYb() {
return showYb;
}
public void setShowYb(boolean showYb) {
this.showYb = showYb;
}
public boolean isEnableTb() {
return enableTb;
}
public void setEnableTb(boolean enableTb) {
this.enableTb = enableTb;
}
public boolean isEnableDy() {
return enableDy;
}
public void setEnableDy(boolean enableDy) {
this.enableDy = enableDy;
}
}
src/com/jshx/rfxm/entity/RfxmSfxx.java
View file @ 1b844310
......@@ -276,6 +276,8 @@ public class RfxmSfxx extends BaseModel {
private String zslxdbh;
private String paymentHisId;
public RfxmSfxx() {}
// 2019-6-27 v4
......@@ -409,6 +411,14 @@ public class RfxmSfxx extends BaseModel {
}
*/
public String getPaymentHisId() {
return paymentHisId;
}
public void setPaymentHisId(String paymentHisId) {
this.paymentHisId = paymentHisId;
}
@Column
public String getDeptId()
{
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ 1b844310
package com.jshx.rfxm.web;
import com.jshx.account.paymentVoucher.service.PaymentVoucherService;
import com.jshx.account.paymentVoucherHis.entity.PaymentVoucherHis;
import com.jshx.account.paymentVoucherHis.service.PaymentVoucherHisService;
import com.jshx.billManager.entity.Indeticur;
import com.jshx.billManager.service.BillManagerService;
......@@ -387,6 +386,7 @@ public class RfxmAction extends BaseAction
sfxx.setCreateTime(paymentItemHis.getUpdateTime());
sfxx.setStatusJBFH(2);
sfxx.setSfxxjbr(paymentItemHis.getJbr());
sfxx.setPaymentHisId(paymentItemHis.getId());
pagination.list.add(0,sfxx);
pagination.totalCount ++;
}
......@@ -526,6 +526,28 @@ public class RfxmAction extends BaseAction
}
}
public String sfxxView2() throws IOException {
if (null != ids) {
PaymentItemHis paymentItemHis = paymentItemHisService.getById(ids);
Map<String, Object> paraMap =new HashMap<>();
paraMap.put("paymentHisId", ids);
List<Rfxm> rfxmList = rfxmService.findRfxm(paraMap);
if(rfxmList != null && rfxmList.size() > 0) {
rfxm = rfxmList.get(0);
}
rfxmsfxx = new RfxmSfxx();
rfxmsfxx.setSfxmmc("城市基础设施配套费");
rfxmsfxx.setSfxmlxdbh(paymentItemHis.getSlbh());
rfxmsfxx.setYjjemx(paymentItemHis.getZyjje());
rfxmsfxx.setShbm(paymentItemHis.getZsdw());
rfxmsfxx.setZslxdbh(paymentItemHis.getZslxdbh());
return VIEW;
}else {
this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"获取当前收费信息失败,请稍后再试."+"\"}");
return null;
}
}
/**
* 复核项目信息
*/
......
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