Skip to content

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

修改问题

parent 0f2fd3b1
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 245 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucher_ZslxdList.jsp
View file @ afc2cb28
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
async : false, async : false,
success: function(data){ success: function(data){
if(data.result){ if(data.result){
$.messager.confirm("提示", "确认要生成凭证吗？", function(result) { $.messager.confirm("提示", "请核实费用到账是否正确", function(result) {
if(result){ if(result){
$.ajax({ $.ajax({
url : "${ctx}/jsp/paymentItemHis/scpz.action", url : "${ctx}/jsp/paymentItemHis/scpz.action",
...@@ -31,9 +31,13 @@ ...@@ -31,9 +31,13 @@
data:{ data:{
id : row_Id id : row_Id
}, },
async : false success:function (data) {
if(data.result) {
printZslxd(row_Id,data.zslxdbh,data.mjyj)
}
}
}); });
$.messager.alert("提示","操作成功")
search_paymentItemHis(); search_paymentItemHis();
} }
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ afc2cb28
...@@ -470,49 +470,18 @@ ...@@ -470,49 +470,18 @@
var dt = new Date(); var dt = new Date();
parent.addTab("jktzsTab", "缴款通知书", "/jsp/zzhxm/zzhxmJktzsDetail.action?zzhxm.id=" + row_Id + "&dt=" + dt.getTime(), 850, 700); parent.addTab("jktzsTab", "缴款通知书", "/jsp/zzhxm/zzhxmJktzsDetail.action?zzhxm.id=" + row_Id + "&dt=" + dt.getTime(), 850, 700);
} }
function del() {
var rows = $('#pagination').datagrid('getSelections'); function search_rfxm() {
var ids = "";
for (var i = 0; i < rows.length; i++) {
ids += rows[i].id + "|";
}
if (rows.length < 1) {
$.messager.alert('提示', '至少选择一项删除！');
} else {
$.messager.confirm("删除", "确定要删除吗?", function (result) {
if (result) {
$.ajax({
url: "sdjdDel.action",
type: 'post',
dataType: 'json',
async: false,
data: {
ids: ids
},
error: function () {
$.messager.alert('错误', '删除时出错！');
},
success: function (data) {
if (data.result) {
$.messager.alert('提示', '删除成功！');
search_sdjd();
} else {
$.messager.alert('错误', '删除时出错！');
}
}
});
}
});
}
}
function search_zzhxm() {
var queryParams = { var queryParams = {
"jfzm.xmdm": $("#xmdm").val(), "rfxm.xkzh": $("#xkzh").val(),
"jfzm.ghxkzbh": $("#ghxkzbh").val(), "rfxm.zslxdbh": $("#zslxdbh").val(),
"jfzm.ghxmbh": $("#ghxmbh").val(), "rfxm.xxylbbh": $("#xxylbbh").val(),
"jfzm.xxylbbh": $("#xxylbbh").val() "rfxm.xmbh": $("#xmbh").val(),
"rfxm.jsdwmc": $("#jsdwmc").val(),
"rfxm.gcxmmc": $("#gcxmmc").val(),
"rfxm.paymentLink": $("#paymentLink").val(),
"rfxm.isRfyz": $("#isRfyz").val(),
}; };
console.info(queryParams);
$('#pagination').datagrid('options').queryParams = queryParams; $('#pagination').datagrid('options').queryParams = queryParams;
$('#pagination').datagrid('clearSelections'); $('#pagination').datagrid('clearSelections');
$("#pagination").datagrid('load'); $("#pagination").datagrid('load');
...@@ -581,13 +550,18 @@ ...@@ -581,13 +550,18 @@
$(function () { $(function () {
$('#pagination').datagrid($.extend(window.dg_cm_pp_2, { $('#pagination').datagrid($.extend(window.dg_cm_pp_2, {
title: '项目管理列表', title: '缴费核查项目列表',
url: 'jflist.action', url: 'jflist.action',
queryParams: { queryParams:{
"jfzm.ghxmbh": $("#ghxmbh").val(), "rfxm.xkzh": $("#xkzh").val(),
"jfzm.xxylbbh": $("#xxylbbh").val(), "rfxm.zslxdbh": $("#zslxdbh").val(),
"jfzm.xmdm": $("#xmdm").val(), "rfxm.xxylbbh": $("#xxylbbh").val(),
"jfzm.ghxkzbh": $("#ghxkzbh").val(), "rfxm.xmbh": $("#xmbh").val(),
"rfxm.jsdwmc": $("#jsdwmc").val(),
"rfxm.gcxmmc": $("#gcxmmc").val(),
"rfxm.paymentLink": $("#paymentLink").val(),
"rfxm.isRfyz": $("#isRfyz").val(),
"rfxm.mjyj": $("#mjyj").val()
}, },
frozenColumns: [[ frozenColumns: [[
// {field:'id',checkbox:true} // {field:'id',checkbox:true}
...@@ -597,6 +571,24 @@ ...@@ -597,6 +571,24 @@
{ {
field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) { field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) {
var result = "";
if(rec.paymentLink == '3') {
result += "<a class='btn_01_mini' style='opacity: 0.5'>同步施工许可<b></b></a>\n";
} else {
result += "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n";
}
if(rec.paymentLink == '3') {
if(rec.isSl) {
return " <a class='btn_01_mini' style='opacity: 0.5' >打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini edit' onclick=one_book()>一般缴款书<b></b></a>";
} else {
return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" +
" <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
}
}
if(rec.isSl || rec.paymentLink != '3') { if(rec.isSl || rec.paymentLink != '3') {
return " <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" + return " <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini edit' style='opacity: 0.5' onclick=one_book()>一般缴款书<b></b></a>"; " <a class='btn_01_mini edit' style='opacity: 0.5' onclick=one_book()>一般缴款书<b></b></a>";
...@@ -614,9 +606,9 @@ ...@@ -614,9 +606,9 @@
{ field: 'xkzh', title: '规划许可证号', width: 186, align: 'center' }, { field: 'xkzh', title: '规划许可证号', width: 186, align: 'center' },
{ field: 'xmdm', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) { { field: 'xmdm', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) {
if(rec.payment_link == 1) { if(rec.paymentLink == 1) {
return "施工许可前"; return "施工许可前";
} else if(rec.payment_link == 3) { } else if(rec.paymentLink == 3) {
return "30日内"; return "30日内";
} else { } else {
return ""; return "";
...@@ -626,7 +618,7 @@ ...@@ -626,7 +618,7 @@
}, },
{ field: 'zsfw', title: '二级统计单位', width: 186, align: 'center' }, { field: 'zsfw', title: '二级统计单位', width: 186, align: 'center' },
{ field: 'is_rfyz', title: '人防是否用章', width: 150, align: 'center', formatter: function (value, rec) { { field: 'is_rfyz', title: '人防是否用章', width: 150, align: 'center', formatter: function (value, rec) {
if(rec.is_rfyz == 1) { if(rec.isRfyz == 1) {
return "是"; return "是";
} else { } else {
return "否"; return "否";
...@@ -660,35 +652,34 @@ ...@@ -660,35 +652,34 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<th width="15%">规划许可证编号</th> <th width="15%">规划许可证编号</th>
<td width="35%"><input name="jfzm.ghxkzbh" id="ghxkzbh" value="" type="text"></td> <td width="35%"><input name="rfxm.xkzh" id="xkzh" value="" type="text"></td>
<th width="15%">缴费凭证编号</th> <th width="15%">缴费凭证编号</th>
<td width="35%"><input name="jfzm.xmdm" id="xmdm" value="" type="text"></td> <td width="35%"><input name="rfxm.zslxdbh" id="zslxdbh" value="" type="text"></td>
</tr> </tr>
<tr> <tr>
<th width="15%">信息表编号</th> <th width="15%">信息一览表编号</th>
<td width="35%"><input name="jfzm.xxylbbh" id="xxylbbh" value="" type="text"></td> <td width="35%"><input name="rfxm.xxylbbh" id="xxylbbh" value="" type="text"></td>
<th width="15%">规划项目编号</th> <th width="15%">规划项目编号</th>
<td width="35%"><input name="jfzm.ghxmbh" id="ghxmbh" value="" type="text"></td> <td width="35%"><input name="rfxm.xmbh" id="xmbh" value="" type="text"></td>
</tr> </tr>
<tr> <tr>
<th width="15%">建设单位名称</th> <th width="15%">建设单位名称</th>
<td width="35%"><input name="jfzm.jsdwmc" id="jsdwmc" value="" type="text"></td> <td width="35%"><input name="rfxm.jsdwmc" id="jsdwmc" value="" type="text"></td>
<th width="15%">工程项目名称</th> <th width="15%">工程项目名称</th>
<td width="35%"><input name="jfzm.gcxmmc" id="gcxmmc" value="" type="text"></td> <td width="35%"><input name="rfxm.gcxmmc" id="gcxmmc" value="" type="text"></td>
</tr> </tr>
<tr> <tr>
<th width="15%">缴费环节</th> <th width="15%">缴费环节</th>
<td width="35%"> <td width="35%">
<select name="jfzm.accountStatus" id="accountStatus"> <select name="rfxm.paymentLink" id="paymentLink">
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">无</option>
<option value="1">施工许可前</option> <option value="1">施工许可前</option>
<option value="2">30日</option> <option value="2">30日</option>
</select> </select>
</td> </td>
<th width="15%">人防是否用章</th> <th width="15%">人防费是否用章</th>
<td width="35%"> <td width="35%">
<select name="jfzm.is_rfyz" id="accountStatus"> <select name="isRfyz" id="isRfyz">
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">否</option> <option value="0">否</option>
<option value="1">是</option> <option value="1">是</option>
...@@ -697,7 +688,7 @@ ...@@ -697,7 +688,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="4" align="center"> <td colspan="4" align="center">
<a href="###" class="btn_01" onclick="search_jfzm()">查询<b></b></a>&nbsp; <a href="###" class="btn_01" onclick="search_rfxm()">查询<b></b></a>&nbsp;
<!-- <a href="###" class="btn_01" onclick="search_sdjd(1)" >已复核项目<b></b></a>&nbsp; --> <!-- <a href="###" class="btn_01" onclick="search_sdjd(1)" >已复核项目<b></b></a>&nbsp; -->
<a href="###" class="btn_01" onclick="clear_form(document.myform);">清空<b></b></a>&nbsp; <a href="###" class="btn_01" onclick="clear_form(document.myform);">清空<b></b></a>&nbsp;
</td> </td>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ afc2cb28
...@@ -214,9 +214,9 @@ ...@@ -214,9 +214,9 @@
{ {
field: 'jfhj', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) { field: 'jfhj', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) {
if(rec.payment_link == 1) { if(rec.paymentLink == 1) {
return "施工许可前"; return "施工许可前";
} else if(rec.payment_link == 3) { } else if(rec.paymentLink == 3) {
return "30日内"; return "30日内";
} else { } else {
return ""; return "";
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ afc2cb28
...@@ -316,8 +316,8 @@ ...@@ -316,8 +316,8 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">缴费承诺环节</th> <th width="15">缴费承诺环节${rfxm.paymentLink == 1}</th>
<c:if test="${rxfm.paymentLink != 1 && rxfm.paymentLink != 3}"> <c:if test="${rxfm.paymentLink == null}">
<td width="35%"> <td width="35%">
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/> <input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
施工许可前 施工许可前
...@@ -330,12 +330,12 @@ ...@@ -330,12 +330,12 @@
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是 <input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
</td> </td>
</c:if> </c:if>
<c:if test="${rxfm.paymentLink =='1'}"> <c:if test="${rfxm.paymentLink == 1}">
<td width="35%"> <td width="35%">
施工许可前 施工许可前
</td> </td>
</c:if> </c:if>
<c:if test="${rxfm.paymentLink =='3'}"> <c:if test="${rfxm.paymentLink == 3}">
<td width="35%"> <td width="35%">
30日内 30日内
</td> </td>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ afc2cb28
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<%-- 查看收费信息 --%> <%-- 查看收费信息 --%>
function view(row_id) { function view(row_id) {
var dt = new Date(); var dt = new Date();
createSimpleWindow("win_rfxmsfxx","查看收费信息","${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,600);
} }
<%-- 下载缴费信息附件 --%> <%-- 下载缴费信息附件 --%>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ afc2cb28
...@@ -45,51 +45,31 @@ ...@@ -45,51 +45,31 @@
var beizhu = $("#sfxxfhyj").val(); var beizhu = $("#sfxxfhyj").val();
$("#flag").val(flag); $("#flag").val(flag);
// document.myform1.action="rfxmSfxxReview.action"; if(flag == '2') {//通过
// document.myform1.submit();
// parent.reloadDate();
// parent.close_win('win_rfxmsfxx');
$.ajax({ $.ajax({
async: false, async: false,
url: "${ctx}/jsp/rfxm/rfxmSfxxReview.action", url: "${ctx}/jsp/rfxm/rfxmSfxxReviewCheck.action",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
async: false, async: false,
data: {"rfxmsfxx.id":sfxxid, "rfxmsfxx.sfxxfhyj":beizhu, "flag":flag}, data: {"rfxmsfxx.id":sfxxid},
error: function () { error: function () {
$.messager.alert('错误', '提交出错！'); $.messager.alert('错误', '校验出错！');
}, },
success: function (data) { success: function (data) {
if (data.result) { if (!data.result) {
parent.reloadData();
$.messager.alert('提示', data.message,"info",function () {
parent.close_win('win_rfxmsfxx');
});
/!*return;*!/
} else {
abc="0";
$.messager.alert('提示', data.message); $.messager.alert('提示', data.message);
getTabWindow().reloadDate(); } else {
// $("#yzjg").html('添加失败!'+data.message); document.myform1.action="rfxmSfxxReview.action";
setTimeout(function () { parent.close_win('win_rfxmsfxx'); }, 2000); document.myform1.submit();
parent.close_win('win_rfxmsfxx');
return;
}
// window.location.reload();
var curTabWin = null;
var curTab = parent.$('#main-center').tabs('getSelected');
if (curTab && curTab.find('iframe').length > 0) {
curTabWin = curTab.find('iframe')[0].contentWindow;
} }
var childWin = document.getElementById('iframe_sfxxTab').contentWindow;
childWin.reloadDate();
// parent.close_win("win_rfxmsfxx");
// parent.document.frames["sfxxTab"].reloadDate();
// reloadDate();
// /!*setTimeout(parent.close_win('win_rfxmsfxx'),1000);*!/
} }
}); });
} else {
document.myform1.action="rfxmSfxxReview.action";
document.myform1.submit();
}
} }
//验证收费信息 //验证收费信息
...@@ -399,7 +379,7 @@ ...@@ -399,7 +379,7 @@
<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, 2)">通过<b></b></a>&nbsp;
<a href="#" class="btn_01" type="button" onclick="review(this, 1)">退回<b></b></a>&nbsp; <a href="#" class="btn_01" type="button" onclick="review(this, 1)">退回<b></b></a>&nbsp;
</c:if> </c:if>
<a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxx');">关闭<b></b></a> <a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxxview');">关闭<b></b></a>
</td> </td>
</tr> </tr>
</table> </table>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ afc2cb28
...@@ -49,20 +49,12 @@ public class JfzmAction extends BaseAction { ...@@ -49,20 +49,12 @@ public class JfzmAction extends BaseAction {
*/ */
private Pagination pagination; private Pagination pagination;
String ghxkzbh;
String jfpzbh;
String xxbbh;
String ghxmbh;
String jsdwmc;
String gcxmmc;
String jfhj;
String hczt;
String id;
Rfxm rfxm = new Rfxm(); Rfxm rfxm = new Rfxm();
Xmxxb xmxxb = new Xmxxb(); Xmxxb xmxxb = new Xmxxb();
PaymentItemHis paymentItemHis = new PaymentItemHis(); PaymentItemHis paymentItemHis = new PaymentItemHis();
String id;
/** /**
...@@ -75,32 +67,50 @@ public class JfzmAction extends BaseAction { ...@@ -75,32 +67,50 @@ public class JfzmAction extends BaseAction {
if(pagination==null) if(pagination==null)
pagination = new Pagination(this.getRequest()); pagination = new Pagination(this.getRequest());
if (!TextUtils.isEmpty(ghxkzbh)){ if(null != rfxm){
paraMap.put("xkzh", "%" + ghxkzbh + "%");
}
if(!TextUtils.isEmpty(jfpzbh)) { //设置查询条件，开发人员可以在此增加过滤条件
paraMap.put("zslxdbh", "%" + jfpzbh + "%"); /**
* "rfxm.xkzh": $("#xkzh").val(),
* "rfxm.zslxdbh": $("#zslxdbh").val(),
* "rfxm.xxylbbh": $("#xxylbbh").val(),
* "rfxm.xmbh": $("#xmbh").val(),
* "rfxm.jsdwmc": $("#jsdwmc").val(),
* "rfxm.gcxmmc": $("#gcxmmc").val(),
* "rfxm.paymentLink": $("#paymentLink").val(),
* "rfxm.isRfyz": $("#isRfyz").val(),
* "rfxm.mjyj": $("#mjyj").val()
*/
if (!TextUtils.isEmpty(rfxm.getXkzh())){
paraMap.put("xkzh", "%" + rfxm.getXkzh().trim() + "%");
} }
if (!TextUtils.isEmpty(rfxm.getZslxdbh())){
if (!TextUtils.isEmpty(xxbbh)){ paraMap.put("zslxdbh", "%" + rfxm.getZslxdbh().trim() + "%");
paraMap.put("xxbbh", "%" + xxbbh + "%");
} }
if (!TextUtils.isEmpty(rfxm.getXxylbbh())){
if (!TextUtils.isEmpty(ghxmbh)){ paraMap.put("xxylbbh", "%" + rfxm.getXxylbbh().trim() + "%");
paraMap.put("xmbh", "%" + ghxmbh + "%");
} }
if (!TextUtils.isEmpty(rfxm.getXmbh())){
if (!TextUtils.isEmpty(jsdwmc)){ paraMap.put("xmbh", "%" + rfxm.getXmbh().trim() + "%");
paraMap.put("jsdw", "%" + jsdwmc + "%");
} }
if (!TextUtils.isEmpty(rfxm.getJsdwmc())){
if (!TextUtils.isEmpty(gcxmmc)){ paraMap.put("jsdwmc", "%" + rfxm.getJsdwmc().trim() + "%");
paraMap.put("jsdd", "%" + gcxmmc + "%"); }
if (!TextUtils.isEmpty(rfxm.getGcxmmc())){
paraMap.put("gcxmmc", "%" + rfxm.getGcxmmc().trim() + "%");
} }
//TODO 缴费环节、核查状态筛选 if (rfxm.getPaymentLink() != null && rfxm.getPaymentLink() > 0){
paraMap.put("paymentLink", rfxm.getPaymentLink());
}
if (rfxm.getIsRfyz() != null){
paraMap.put("isRfyz", rfxm.getIsRfyz());
}
if (!TextUtils.isEmpty(rfxm.getMjyj())){
paraMap.put("mjyj", rfxm.getMjyj().trim());
}
}
if(!this.getLoginUser().getIsSuperAdmin()){ if(!this.getLoginUser().getIsSuperAdmin()){
String dwdm=zsdwService.getDwdm(this.getLoginUserDepartmentId()); String dwdm=zsdwService.getDwdm(this.getLoginUserDepartmentId());
paraMap.put("dwdm", dwdm); paraMap.put("dwdm", dwdm);
...@@ -112,18 +122,19 @@ public class JfzmAction extends BaseAction { ...@@ -112,18 +122,19 @@ public class JfzmAction extends BaseAction {
//此处添加需要转换的一维代码，key是一维代码在数据对象中的属性名，value是一维代码的codeId //此处添加需要转换的一维代码，key是一维代码在数据对象中的属性名，value是一维代码的codeId
config.registerJsonValueProcessor(String.class,new CodeJsonValueProcessor(codeMap)); config.registerJsonValueProcessor(String.class,new CodeJsonValueProcessor(codeMap));
// final String filter = "isCwyz|id|slbh|isfdx|dwmc|xmmc|mjyj|dkxmslh|zsdw|dkmj|csmj|ptyjmj|ptyjje|ptymje|ptymmj|rfyjmj|rfyjje|rfymmj|rfymje|xqyjje|xqymmj|xqymje|xqyjmj|byyjmj|byyjje|byymmj|byymje|zyjje|zymje|warnFlag|accountbankId|lockFlag|xmbzj|zslxdbh|ECN|xmxxb|xmxxb.xxylb|xmxxb.";
// if (filter != null && filter.length() > 1) {
// config.setJsonPropertyFilter(new PropertyFilter() {
// public boolean apply(Object source, String name, Object value) {
// if (filter.indexOf(name + "|") != -1)
// return false;
// else
// return true;
// }
// });
// }
pagination = rfxmService.findByPage(pagination, paraMap); pagination = rfxmService.findByPage(pagination, paraMap);
for (int i = 0; i < pagination.list.size(); i++) {
Rfxm r = (Rfxm) pagination.list.get(i);
//TODO 1,判断是否显示同步按钮 2，判断是否置灰
boolean showTb;
boolean showDy;
boolean showYb;
boolean enableTb;
boolean enableDy;
boolean enableYb;
}
convObjectToJson(pagination, config); convObjectToJson(pagination, config);
} }
...@@ -223,70 +234,6 @@ public class JfzmAction extends BaseAction { ...@@ -223,70 +234,6 @@ public class JfzmAction extends BaseAction {
this.pagination = pagination; this.pagination = pagination;
} }
public String getGhxkzbh() {
return ghxkzbh;
}
public void setGhxkzbh(String ghxkzbh) {
this.ghxkzbh = ghxkzbh;
}
public String getJfpzbh() {
return jfpzbh;
}
public void setJfpzbh(String jfpzbh) {
this.jfpzbh = jfpzbh;
}
public String getXxbbh() {
return xxbbh;
}
public void setXxbbh(String xxbbh) {
this.xxbbh = xxbbh;
}
public String getGhxmbh() {
return ghxmbh;
}
public void setGhxmbh(String ghxmbh) {
this.ghxmbh = ghxmbh;
}
public String getJsdwmc() {
return jsdwmc;
}
public void setJsdwmc(String jsdwmc) {
this.jsdwmc = jsdwmc;
}
public String getGcxmmc() {
return gcxmmc;
}
public void setGcxmmc(String gcxmmc) {
this.gcxmmc = gcxmmc;
}
public String getJfhj() {
return jfhj;
}
public void setJfhj(String jfhj) {
this.jfhj = jfhj;
}
public String getHczt() {
return hczt;
}
public void setHczt(String hczt) {
this.hczt = hczt;
}
public String getId() { public String getId() {
return id; return id;
} }
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ afc2cb28
...@@ -291,6 +291,7 @@ public class PaymentItemHisAction extends BaseAction ...@@ -291,6 +291,7 @@ public class PaymentItemHisAction extends BaseAction
model.setIsCwyz("0"); model.setIsCwyz("0");
model.setZslxdbh(paymentItemHisService.getPzbh() + 1 + "");//取出历史最大 + 1 model.setZslxdbh(paymentItemHisService.getPzbh() + 1 + "");//取出历史最大 + 1
paymentItemHisService.update(model); paymentItemHisService.update(model);
this.getResponse().getWriter().println("{\"result\":true,\"zslxdbh\":\"" + model.getZslxdbh() + "\",\"mjyj\":\"" + model.getMjyj() + "\"}");
} }
/** /**
......
src/com/jshx/rfxm/conf/struts-rfxm.xml
View file @ afc2cb28
...@@ -71,11 +71,13 @@ ...@@ -71,11 +71,13 @@
</action> </action>
<!-- 复核收费信息，返回Json数据 --> <!-- 复核收费信息，返回Json数据 -->
<action name="rfxmSfxxReview" class="com.jshx.rfxm.web.RfxmAction" method="rfxmSfxxReview"> <action name="rfxmSfxxReview" class="com.jshx.rfxm.web.RfxmAction" method="rfxmSfxxReview">
<!-- <interceptor-ref name="tokenInterceptor" />--> <interceptor-ref name="tokenInterceptor" />
<!-- <interceptor-ref name="coreStack" />--> <interceptor-ref name="coreStack" />
<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_rfxmsfxx2</result> <result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_rfxmsfxxview</result>
<!-- <result name="invalid.token">/invalid.jsp</result>--> <result name="invalid.token">/invalid.jsp</result>
</action> </action>
<action name="rfxmSfxxReviewCheck" class="com.jshx.rfxm.web.RfxmAction" method="rfxmSfxxReviewCheck"></action>
<!-- 收费列表查询，返回Json数据 --> <!-- 收费列表查询，返回Json数据 -->
<action name="rfxmSfView" class="com.jshx.rfxm.web.RfxmAction" method="sfView"> <action name="rfxmSfView" class="com.jshx.rfxm.web.RfxmAction" method="sfView">
</action> </action>
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ afc2cb28
...@@ -1508,54 +1508,39 @@ public class RfxmAction extends BaseAction ...@@ -1508,54 +1508,39 @@ public class RfxmAction extends BaseAction
this.getResponse().getWriter().println("{\"result\":"+reviewTag+",\"message\":\"" + message + "!"+"\"}"); this.getResponse().getWriter().println("{\"result\":"+reviewTag+",\"message\":\"" + message + "!"+"\"}");
} }
} }
public void rfxmSfxxReviewCheck() throws IOException {
RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId());
boolean result = false;
String message;
if(sfxx.getSfxxjbr().equals(this.getLoginUser().getDisplayName())) {
message = "不允许复核自己添加的费用";
} else {
result = true;
message = "OK";
}
this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
}
/** /**
* 复核收费信息 * 复核收费信息
*/ */
public void rfxmSfxxReview() throws IOException { public String rfxmSfxxReview() throws IOException {
String message = "";
boolean reviewFlag = false;
if (StringUtils.isNotBlank(flag) && null != rfxmsfxx) { if (StringUtils.isNotBlank(flag) && null != rfxmsfxx) {
RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId()); RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId());
//已生成缴款通知书的则允许复核,如有需要放开此段注释.
/*
Integer statusCnjfhj = sfxx.getStatusCnjfhj();
if (statusCnjfhj == 1) {
message = "已生成缴款通知书不允许修改!";
this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+message+"\"}");
return null;
}
*/
if ("2".equalsIgnoreCase(flag)) { if ("2".equalsIgnoreCase(flag)) {
//通过
if(sfxx.getSfxxjbr().equals(this.getLoginUser().getDisplayName())) {
message = "不允许复核自己添加的费用";
reviewFlag = false;
} else {
sfxx.setStatusJBFH(2); sfxx.setStatusJBFH(2);
sfxx.setFhTime(new Date()); sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName()); sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){ if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj()); sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj());
} }
message = "复核通过"; rfxmSfxxService.update(sfxx);
reviewFlag = true; } else {
}
}else if ("1".equalsIgnoreCase(flag)){
//退回 //退回
rfxmSfxxService.deleteWithFlag(sfxx.getId()); rfxmSfxxService.deleteWithFlag(sfxx.getId());
message = "退回成功";
reviewFlag = true;
}else {
message = "操作失败,请刷新页面再试";
}
try {
if(reviewFlag) rfxmSfxxService.update(sfxx);
}catch (Exception e) {
message = "操作失败,请稍后再试";
} }
this.getResponse().getWriter().println("{\"result\":"+reviewFlag+",\"message\":\"" + message + "!"+"\"}");
} }
// return RELOAD; return RELOAD;
} }
public String jktzsView() throws IOException { public String jktzsView() throws IOException {
...@@ -1971,6 +1956,10 @@ public class RfxmAction extends BaseAction ...@@ -1971,6 +1956,10 @@ public class RfxmAction extends BaseAction
rfxmsfxx.setJbTime(new Date()); rfxmsfxx.setJbTime(new Date());
rfxmsfxx.setStatusJBFH(0); rfxmsfxx.setStatusJBFH(0);
rfxm = rfxmService.getById(rfxm.getId()); rfxm = rfxmService.getById(rfxm.getId());
if(rfxm.getPaymentLink() == null && rfxmsfxx.getCnjfhj() != null) {//如果项目没有缴费环节，则收费处可以补充
rfxm.setPaymentLink(rfxmsfxx.getCnjfhj().contains("30") ? 3 : 1);
rfxmService.update(rfxm);
}
rfxmsfxx.setZslxdbh(rfxm.getZslxdbh()); rfxmsfxx.setZslxdbh(rfxm.getZslxdbh());
rfxmSfxxService.save(rfxmsfxx); rfxmSfxxService.save(rfxmsfxx);
// } // }
......
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