Skip to content

N
njzsb
Commit 10ad2e72 authored by 徐州's avatar 徐州
Browse files
Options

修改问题

parent 92048b75
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 57 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @ 10ad2e72
......@@ -385,8 +385,8 @@ function updateZslxdbh(){
<div id='f30' draggable='true' class='f30'>规划许可证号：${xmxxb.xkzh}</div>
<div id='f31' draggable='true' class='f31'>规划项目编号：${xmxxb.xmbh}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}">
<div id='32' draggable='true' class='f32'>${zslxdbh}</div>
<div id='33' draggable='true' class='f33'>${zslxdbh}</div>
<div id='32' draggable='true' class='f32'>${paymentItemHis.zslxdbh}</div>
<div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}</br>${rfxm.jbr}</div>
<div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
......
WebRoot/WEB-INF/pages/account/paymentVoucher/Wwsqys_Edit4.jsp
View file @ 10ad2e72
......@@ -84,7 +84,7 @@
<tr>
<td colspan="5" height="100px" style="text-align:center">
<a href="#" class="btn_01" type="submit" onclick="showUpload()" id="huancun">缓存<b></b></a>&nbsp;
<a href="#" class="btn_01" type="submit" onclick="syncpz('${xmxxb.xxylb}')" id="jfpz">同步凭证<b></b></a>&nbsp;
<%-- <a href="#" class="btn_01" type="submit" onclick="syncpz('${xmxxb.xxylb}')" id="jfpz">同步凭证<b></b></a>&nbsp;--%>
<a href="#" class="btn_01" onclick="parent.close_win('win_paymentItemHis');">关闭<b></b></a>
</td>
</tr>
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 10ad2e72
......@@ -620,7 +620,7 @@
}
},
{ field: 'slbh', title: '缴款通知书编号', width: 186, align: 'center' },
{ field: 'jktzsbh', title: '缴款通知书编号', width: 186, align: 'center' },
{ field: 'zslxdbh', title: '缴款凭证编号', width: 186, align: 'center' },
]]
......
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
View file @ 10ad2e72
......@@ -486,9 +486,9 @@
<div id='f10' draggable='true' class='f10'></div>
<div id='f11' draggable='true' class='f11'></div>
<div id='f12' draggable='true' class='f12'>${paymentItemHis.ECN}</div>
<div id='f13' draggable='true' class='f13'>${fn:substring(rfxm.jfpzTime,0,4)}</div>
<div id='f14' draggable='true' class='f14'>${fn:substring(rfxm.jfpzTime,5,7)}</div>
<div id='f15' draggable='true' class='f15'>${fn:substring(rfxm.jfpzTime,8,10)}</div>
<div id='f13' draggable='true' class='f13'>${fn:substring(paymentItemHis.jfpzTime,0,4)}</div>
<div id='f14' draggable='true' class='f14'>${fn:substring(paymentItemHis.jfpzTime,5,7)}</div>
<div id='f15' draggable='true' class='f15'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div>
<div id='f16' draggable='true' class='f16'>${paymentItemHis.ECN}</div>
<div id='f17' draggable='true' class='f17'>${rfxm.xxylbbh}</div>
<div id='f18' draggable='true' class='f18'>${rfxm.slbh}</div>
......@@ -500,9 +500,9 @@
<div id='f24' draggable='true' class='f24'>汤静</div>
<div id='f25' draggable='true' class='f25'>83321375</div>
<div id='f26' draggable='true' class='f26'>83377920</div>
<div id='f27' draggable='true' class='f27'>${fn:substring(rfxm.jfpzTime,0,4)}</div>
<div id='f28' draggable='true' class='f28'>${fn:substring(rfxm.jfpzTime,5,7)}</div>
<div id='f29' draggable='true' class='f29'>${fn:substring(rfxm.jfpzTime,8,10)}</div>
<div id='f27' draggable='true' class='f27'>${fn:substring(paymentItemHis.jfpzTime,0,4)}</div>
<div id='f28' draggable='true' class='f28'>${fn:substring(paymentItemHis.jfpzTime,5,7)}</div>
<div id='f29' draggable='true' class='f29'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div>
<div id='f30' draggable='true' class='f30'>规划许可证号：${xmxxb.xkzh}</div>
<div id='f31' draggable='true' class='f31'>规划项目编号：${xmxxb.xmbh}</div>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ 10ad2e72
......@@ -236,7 +236,7 @@
}
},
{ field: 'slbh', title: '缴款通知书编号', width: 150, align: 'center' },
{ field: 'jktzsbh', title: '缴款通知书编号', width: 150, align: 'center' },
{ field: 'zslxdbh', title: '缴款凭证编号', width: 150, align: 'center' },
{ field: 'sfxmlxdbh', title: '人防联系单号', width: 150, align: 'center' },
{ field: 'xxylbbh', title: '信息一览表编号', width: 150, align: 'center' }
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ 10ad2e72
......@@ -181,7 +181,7 @@
var btnTag = "";
if(rec.id.length > 0) {
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
if (rec.tqjn == 1) {//延后缴纳并且已通过核验，显示补录
if (rec.status == 1) {//延后缴纳并且已通过核验，显示补录
btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>"
}
} else {
......@@ -199,7 +199,7 @@
{field:'cnjfhj',title:'承诺缴费环节',width:160},
{field:'zslxdbh',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'sfxxjbr',title:'信息录入人',width:160},
{field:'createTime',title:'录入时间',width:fixWidth(0.16)},
{field:'updateTime',title:'录入时间',width:fixWidth(0.16)},
{field:'statusJBFH',title:'是否复核',width:160,formatter:function (value, rec) {
if (rec.statusJBFH==0) {
return "待复核";
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ 10ad2e72
......@@ -411,10 +411,10 @@
<tr>
<th width="15">复核意见</th>
<td width="85%">
<c:if test="${rfxmsfxx.statusJBFH==2}">
<c:if test="${rfxmsfxx.status==3}">
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%" readonly>${rfxmsfxx.sfxxfhyj}</textarea>
</c:if>
<c:if test="${rfxmsfxx.statusJBFH!=2}">
<c:if test="${rfxmsfxx.status!=3}">
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%">${rfxmsfxx.sfxxfhyj}</textarea>
</c:if>
</td>
......@@ -424,15 +424,11 @@
<table width="100%" border="0">
<tr>
<td colspan="4" height="100px" style="text-align:center">
<c:if test="${rfxmsfxx.statusJBFH==1}">
<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">退回中</i><b></b></a>&nbsp;
<%--<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">退回中</i><b></b></a>&nbsp;--%>
</c:if>
<c:if test="${rfxmsfxx.statusJBFH==2}">
<c:if test="${rfxmsfxx.status != 0}">
<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">已通过</i><b></b></a>&nbsp;
<%--<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">退回中</i><b></b></a>&nbsp;--%>
</c:if>
<c:if test="${rfxmsfxx.statusJBFH==0 || rfxmsfxx.statusJBFH==3}">
<c:if test="${rfxmsfxx.status == 0 || rfxmsfxx.status == 1}">
<a href="#" class="btn_01" type="button" onclick="review(this, 2)">通过<b></b></a>&nbsp;
<a href="#" class="btn_01" type="button" onclick="review(this, 1)">退回<b></b></a>&nbsp;
</c:if>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 10ad2e72
......@@ -9,6 +9,8 @@ import com.jshx.core.json.DateJsonValueProcessor;
import com.jshx.core.utils.StringUtil;
import com.jshx.core.utils.Struts2Util;
import com.jshx.core.utils.SysPropertiesUtil;
import com.jshx.jktzs.entity.Jktzs;
import com.jshx.jktzs.service.JktzsService;
import com.jshx.paymentItemHis.entity.PaymentItemHis;
import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.rfxm.entity.Rfxm;
......@@ -45,6 +47,7 @@ public class JfzmAction extends BaseAction {
@Autowired
PaymentItemHisService paymentItemHisService;
@Autowired
private ZsdwService zsdwService;
......@@ -148,7 +151,7 @@ public class JfzmAction extends BaseAction {
if(r.getIsRfyz() != null && r.getIsRfyz() == 1) {//人防用章后可以同步
r.setEnableTb(1);
} else if(sfxx != null && sfxx.getTqjn() != null && sfxx.getTqjn() == 1 && sfxx.getStatusJBFH() != null && sfxx.getStatusJBFH() == 2) {//显示补录时可以同步
} else if(sfxx != null && sfxx.getTqjn() != null && sfxx.getTqjn() == 1 && sfxx.getStatus() == 1) {//显示补录时可以同步
r.setEnableTb(1);
} else {
r.setEnableTb(0);
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ 10ad2e72
......@@ -9,6 +9,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.jshx.jktzs.entity.Jktzs;
import com.jshx.jktzs.service.JktzsService;
import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.service.RfxmService;
import com.jshx.wwjdclinfo.entity.Wwjdclinfo;
......@@ -99,6 +101,8 @@ public class PaymentItemHisAction extends BaseAction
private FawenAttachService fawenAttachService;
@Autowired
private DxpzService dxpzService;
@Autowired
JktzsService jktzsService;
/**
* 修改新增标记，add为新增、mod为修改
*/
......@@ -277,6 +281,13 @@ public class PaymentItemHisAction extends BaseAction
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) {
rfxm.setJktzsbh(jklist.get(0).getDzbh());
}
rfxmService.save(rfxm);
}
}
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 10ad2e72
......@@ -291,6 +291,11 @@ public class Rfxm extends BaseModel
Integer enableTb;//同步按钮是否可以点击（false置灰）
Integer enableDy;//打印按钮是否可以点击(false置灰)
/**
* 缴款通知书编号
*/
private String jktzsbh;
/**
* 收费项目联系单编号
*/
......@@ -771,4 +776,12 @@ public class Rfxm extends BaseModel
public void setEnableDy(Integer enableDy) {
this.enableDy = enableDy;
}
public String getJktzsbh() {
return jktzsbh;
}
public void setJktzsbh(String jktzsbh) {
this.jktzsbh = jktzsbh;
}
}
src/com/jshx/rfxm/entity/RfxmSfxx.java
View file @ 10ad2e72
......@@ -208,12 +208,11 @@ public class RfxmSfxx extends BaseModel {
/**
* 经办复核状态
* 0 待复核 可修改
* 1 已退回 可修改
* 2 已复核 不可修改
* 3 已修改 可修改
* 0 待审核
* 1 已通过可补录
* 2，已通过，不可以补录
*/
private Integer statusJBFH;
private Integer status;
//----- 2019-6-27 end -----------------------------------
......@@ -281,7 +280,7 @@ public class RfxmSfxx extends BaseModel {
public RfxmSfxx() {}
// 2019-6-27 v4
public RfxmSfxx(String gcxmmc,String jfdwmc,String deptId, Integer delFlag, String rfxmid, String sfxmmc, String shbm, String sfxmlxdbh, String yjjemx, String cnjfhj, Integer typeCnjfhj, Integer statusCnjfhj, String urldz, String showName, String attachname, String filePath, String attachType, String xmType, String jfdmwybh, String fsxmbm, String kpje, String kpsj, String ybjksbh, String fsxtjxsj, String beizhu, String ssdwmc, String qhm, String zsdwbm, String skrqc, String skrzh, String yzsqy, String dsdw, String khyh, String sfxxjbr, String sfxxfhr, String sfxxjbyj, String sfxxfhyj, Date jbTime, Date fhTime, Integer statusJBFH) {
public RfxmSfxx(String gcxmmc,String jfdwmc,String deptId, Integer delFlag, String rfxmid, String sfxmmc, String shbm, String sfxmlxdbh, String yjjemx, String cnjfhj, Integer typeCnjfhj, Integer statusCnjfhj, String urldz, String showName, String attachname, String filePath, String attachType, String xmType, String jfdmwybh, String fsxmbm, String kpje, String kpsj, String ybjksbh, String fsxtjxsj, String beizhu, String ssdwmc, String qhm, String zsdwbm, String skrqc, String skrzh, String yzsqy, String dsdw, String khyh, String sfxxjbr, String sfxxfhr, String sfxxjbyj, String sfxxfhyj, Date jbTime, Date fhTime, Integer status) {
this.deptId = deptId;
this.gcxmmc = gcxmmc;
this.jfdwmc = jfdwmc;
......@@ -321,7 +320,7 @@ public class RfxmSfxx extends BaseModel {
this.sfxxfhyj = sfxxfhyj;
this.jbTime = jbTime;
this.fhTime = fhTime;
this.statusJBFH = statusJBFH;
this.status = status;
}
......@@ -747,13 +746,13 @@ public class RfxmSfxx extends BaseModel {
this.fhTime = fhTime;
}
@Column(name = "statusJBFH")
public Integer getStatusJBFH() {
return statusJBFH;
@Column(name = "status")
public Integer getStatus() {
return status;
}
public void setStatusJBFH(Integer statusJBFH) {
this.statusJBFH = statusJBFH;
public void setStatus(Integer status) {
this.status = status;
}
public String getZzh() {
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ 10ad2e72
......@@ -384,8 +384,8 @@ public class RfxmAction extends BaseAction
sfxx.setYjjemx(paymentItemHis.getZyjje());
sfxx.setShbm(paymentItemHis.getZsdw());
sfxx.setZslxdbh(paymentItemHis.getZslxdbh());
sfxx.setCreateTime(paymentItemHis.getUpdateTime());
sfxx.setStatusJBFH(2);
sfxx.setUpdateTime(paymentItemHis.getUpdateTime());
sfxx.setStatus(2);
sfxx.setSfxxjbr(paymentItemHis.getJbr());
sfxx.setPaymentHisId(paymentItemHis.getId());
pagination.list.add(0,sfxx);
......@@ -491,6 +491,7 @@ public class RfxmAction extends BaseAction
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);
......@@ -541,18 +542,7 @@ public class RfxmAction extends BaseAction
rfxmsfxx.setYjjemx(paymentItemHis.getZyjje());
rfxmsfxx.setShbm("南京市城市建设费用征收服务中心");
rfxmsfxx.setZslxdbh(paymentItemHis.getZslxdbh());
Map<String, Object> par2 = new HashMap<>();
par2.put("xxylbbh",paymentItemHis.getXmxxb().getXxylb());
List<Zzhxm> zzhxm = zzhxmService.findZzhxm(par2);
if(zzhxm != null && zzhxm.size() > 0) {
Map<String, Object> par3 = new HashMap<>();
par3.put("zzhxmid",zzhxm.get(0).getId());
List<ZzhxmJktzs> zzhxmJktzs = zzhxmJktzsService.findZzhxmJktzs(par3);
if (zzhxmJktzs != null && zzhxmJktzs.size()> 0) {
rfxmsfxx.setSfxmlxdbh(zzhxmJktzs.get(0).getJktzsbh());
}
}
rfxmsfxx.setSfxmlxdbh(rfxm.getJktzsbh());
return VIEW;
}else {
this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"获取当前收费信息失败,请稍后再试."+"\"}");
......@@ -617,9 +607,20 @@ public class RfxmAction extends BaseAction
*/
public String rfxmSfxxReview() throws IOException {
if (StringUtils.isNotBlank(flag) && null != rfxmsfxx) {
//退回时，清空收费项目的联系单编号
RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId());
Rfxm rfxm = rfxmService.getById(sfxx.getRfxmid());
if ("2".equalsIgnoreCase(flag)) {
sfxx.setStatusJBFH(2);
if(rfxm.getPaymentLink() != 3) {//提前缴纳选未选是
sfxx.setStatus(2);
} else if(sfxx.getTqjn() != 1) {
sfxx.setStatus(2);
} else if(sfxx.getStatus() == 2) {//提前选是，并且复核过1次，页面显示补录
sfxx.setStatus(2);
} else {//提前选是，1次未复核
sfxx.setStatus(1);
}
sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
......@@ -629,8 +630,7 @@ public class RfxmAction extends BaseAction
} else {
//退回
rfxmSfxxService.deleteWithFlag(sfxx.getId());
//退回时，清空收费项目的联系单编号
Rfxm rfxm = rfxmService.getById(sfxx.getRfxmid());
rfxm.setSfxmlxdbh(null);
rfxmService.update(rfxm);
}
......@@ -826,6 +826,7 @@ public class RfxmAction extends BaseAction
rfxm.setDelFlag(0);
//新建项目标记为0待复核
rfxm.setStatus("0");
rfxm.setStatus("0");
//设置三种缴费环节状态为0,在生成缴费通知单时再修改为1;
rfxm.setStatusConstract(0);
rfxm.setStatusComplete(0);
......@@ -981,7 +982,7 @@ public class RfxmAction extends BaseAction
}
rfxmsfxx.setSfxxjbr(this.getLoginUser().getDisplayName());
rfxmsfxx.setJbTime(new Date());
rfxmsfxx.setStatusJBFH(0);
rfxmsfxx.setStatus(0);
if(rfxm.getPaymentLink() == null && rfxmsfxx.getCnjfhj() != null) {//如果项目没有缴费环节，则收费处可以补充
rfxm.setPaymentLink(rfxmsfxx.getCnjfhj().contains("30") ? 3 : 1);
......@@ -1163,13 +1164,13 @@ public class RfxmAction extends BaseAction
if(rfxm.getIsRfyz() == 1) {
result = false;//人防已经用章
message = "人防已经用章";
} else if(rfxm.getIsSbj() != 1 && "004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
} else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
result = false;//非市本级
message = "项目来源为房改办，不需要人防用章";
} else if(rfxmSfxx == null || rfxmSfxx.size() == 0) {
result = false;//未添加人防费
message = "请先添加人防费";
} else if(rfxmSfxx.get(0).getStatusJBFH() != 2) {
} else if(rfxmSfxx.get(0).getStatus() != 2) {
result = false;//收费信息未复核，不允许用章
message = "人防费未复核";
}
......@@ -1291,7 +1292,8 @@ public class RfxmAction extends BaseAction
rfxm.setSfxmlxdbh(rfxmsfxx.getSfxmlxdbh());
rfxmService.update(rfxm);
sfxx.setStatusJBFH(3);
sfxx.setStatus(2);
sfxx.setUpdateTime(new Date());
rfxmSfxxService.update(sfxx);
}
}
......
src/com/jshx/sdjd/web/SdjdAction.java
View file @ 10ad2e72
......@@ -935,7 +935,8 @@ public class SdjdAction extends BaseAction
// daima=listzsdw.get(0).getZsdm();
// }
//项目流水号
String lsh=genericManager.getSN("lsh");
// String lsh=genericManager.getSN("lsh");//TODO arvin1122
String lsh = System.currentTimeMillis() + "";
xmb.setXmlsh(lsh);
//项目受理编号
// String sli=genericManager.getSN(daima);
......@@ -954,7 +955,8 @@ public class SdjdAction extends BaseAction
}
if("001".equals(s.getMjyj())||"005".equals(s.getMjyj()))
{
String result = CommonAction.send2wwSGXK(xmb,null,dwdm,null);
String result = "OK";
// String result = CommonAction.send2wwSGXK(xmb,null,dwdm,null);//TODO arvin1122
if("false".equals(result) || StringUtil.isEmpty(result))
{
return Boolean.FALSE;
......
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