Skip to content

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

需求开发中提交

parent eb57de67
Show whitespace changes
Inline Side-by-side
Showing with 215 additions and 152 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Dsc.jsp
View file @ b7a5e526
......@@ -87,9 +87,7 @@
</table>
</div>
<div id="pagination" >
</div>
</div>
<div id="pagination" ></div>
</div>
</div>
</body>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp
View file @ b7a5e526
......@@ -6,7 +6,7 @@
<%@include file="/common/jsLib.jsp"%>
<script>
function addNew(){
function zuofei(){
var dt=new Date();
createSimpleWindow("win_fsjktb","添加非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbInitEdit.action?flag=add&dt="+dt.getTime(),700,300);
......@@ -23,7 +23,7 @@
}
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fsjktb();
search_fstzs();
}
function yijiantb(){
alert(11);
......@@ -69,7 +69,7 @@
success: function(data){
if(data.result){
$.messager.alert('提示','删除成功！');
search_fsjktb();
search_fstzs();
}else{
$.messager.alert('错误','删除时出错！');
}
......@@ -79,10 +79,14 @@
});
}
}
function search_fsjktb(){
function search_fstzs(){
var queryParams = {
"queryTbrqStart" :$("#queryTbrqStart").val(),
"queryTbrqEnd" :$("#queryTbrqEnd").val()
"fstzs.slbh": $("#slbh").val(),
"fstzs.dwmc": $("#dwmc").val(),
"fstzs.xmmc": $("#xmmc").val(),
"fstzs.yjje": $("#yjje").val(),
"fstzs.jkm": $("#jkm").val(),
"fstzs.status": $("#status").val(),
};
$('#pagination').datagrid('options').queryParams = queryParams;
$('#pagination').datagrid('clearSelections');
......@@ -91,32 +95,50 @@
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp,{
title:'非税借口同步信息列表',
url:'fsjktbQuery.action',
title:'已激活非税通知书列表',
url:'${ctx}/jsp/fstzs/fstzsList.action',
queryParams:{
"queryTbrqStart" :$("#queryTbrqStart").val(),
"queryTbrqEnd" :$("#queryTbrqEnd").val()
"fstzs.slbh": $("#slbh").val(),
"fstzs.dwmc": $("#dwmc").val(),
"fstzs.xmmc": $("#xmmc").val(),
"fstzs.yjje": $("#yjje").val(),
"fstzs.jkm": $("#jkm").val(),
"fstzs.status": $("#status").val(),
},
frozenColumns:[[
// {field:'id',checkbox:true}
{field:'id',checkbox:true}
]],
columns:[[
{field:'createTime',title:'同步日期',width:100},
// {field:'tbzsdw',title:'执收单位状态',width:100},
// {field:'tbsrxm',title:'收入项目状态',width:100},
// {field:'tbdsyh',title:'代收银行状态',width:100},
{field:'zsdw',title:'征收单位',width:100},
{field:'zsdwbm',title:'征收单位编码',width:100},
{field:'qhm',title:'区划码',width:100},
{field:'skrqc',title:'收款人全称',width:100},
{field:'skrzh',title:'收款人账户',width:100},
{field:'skrkhh',title:'收款人开户行',width:100},
{field:'xmbm',title:'项目编码',width:100},
{field:'srxmmc',title:'收款人项目名称',width:100},
{field:'sfbz',title:'收费标准',width:100},
{field:'op',title:'查看',width:100,formatter:function(value,rec){return "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>&nbsp;";}}
{field:'op',title:'操作',width:80,align:'center',formatter:function(value,rec){
var result = "";
if(rec.status == 0) {//复核不通过、退回时
result += "<a class='btn_01_mini' onclick=zuofei('"+rec.id+"') >作废<b></b></a>";
}
return result;
}},
{field:'jkm',title:'缴款码',width:100},
{field:'bzrq',title:'编制日期',width:100},
{field:'slbh',title:'受理编号',width:100},
{field:'jsdwmc',title:'建设单位名称',width:100},
{field:'gcxmmc',title:'工程项目名称',width:100},
{field:'jkr',title:'缴款人',width:100},
{field:'yjje',title:'金额',width:100},
{field:'pjdm',title:'票据代码',width:100},
{field:'jksh',title:'缴款书号',width:100},
{field:'status',title:'非税通知书状态',width:100,formatter: function (value, row, index){
if (value == 0) return "正常";
return "已作废";
}}
]],
toolbar:[]
toolbar:[{
id:'btnrefresh',
text:'刷新缴费状态',
iconCls:'icon-ok',
handler:function(){
addNew();
}
}
]
}));
});
......@@ -131,16 +153,22 @@
<div class="cell boxBmargin12">
<table width="100%">
<tr>
<!-- <th width="15%">同步日期</th> -->
<%-- <td width="35%"><input name="queryTbrqStart" id="queryTbrqStart" value="<fmt:formatDate type='both' value='${queryTbrqStart}' />" type="text" class="Wdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'queryTbrqEnd\')}'})" > --%>
<%-- -<input name="queryTbrqEnd" id="queryTbrqEnd" value="<fmt:formatDate type='both' value='${queryTbrqEnd}' />" type="text" class="Wdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'queryTbrqStart\')}'})" ></td> --%>
<!-- </tr> -->
<!-- <tr> -->
<!-- <td colspan="4" align="center"> -->
<%-- <a href="${ctx}/jsp/fsjktb/yijiantb.action" class="btn_01" >手动同步<b></b></a>&nbsp; --%>
<a href="###" class="btn_01" onclick="yijiantb();" >手动同步<b></b></a>&nbsp;
<!-- </td> -->
<th width="15%">受理编号</th>
<td width="35%"><input name="fstzsXm.slbh" id="slbh" value="" type="text"></td>
<th width="15%">应缴金领</th>
<td width="35%"><input name="fstzsXm.yjje" id="yjje" value="" type="text"></td>
</tr>
<tr>
<th width="15%">工程项目名称</th>
<td width="35%"><input name="fstzsXm.gcxmmc" id="gcxmmc" value="" type="text"></td>
<th width="15%">建设单位名称</th>
<td width="35%"><input name="fstzsXm.jsdwmc" id="jsdwmc" value="" type="text"></td>
</tr>
<tr>
<td colspan="4" align="center">
<a href="###" class="btn_01" onclick="search_fstzs()" >查询<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="clear_form(document.myform);" >清空<b></b></a>&nbsp;
</td>
</tr>
</table>
</div>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ b7a5e526
......@@ -6,83 +6,36 @@
<%@include file="/common/jsLib.jsp"%>
<script>
function addNew(){
function view(id){
var dt=new Date();
createSimpleWindow("win_fsjktb","添加非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbInitEdit.action?flag=add&dt="+dt.getTime(),700,300);
createSimpleWindow("win_fstzs","查看非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
}
function edit(row_Id){
function edit(id){
var dt=new Date();
createSimpleWindow("win_fsjktb","修改非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbInitEdit.action?flag=mod&fsjktb.id="+row_Id+"&dt="+dt.getTime(),700,300);
createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
}
function view(row_Id){
function edit(id){
var dt=new Date();
createSimpleWindow("win_fsjktb","查看非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbView.action?fsjktb.id="+row_Id+"&dt="+dt.getTime(),700,300);
createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
}
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fsjktb();
}
function yijiantb(){
alert(11);
$.ajax({
url : "${ctx}/jsp/fsjktb/yijiantb.action",
type: 'post',
dataType: 'json',
async : false,
error: function(){
$.messager.alert('错误','删除时出错！');
},
success: function(data){
if(data.result){
}else{
}
}
});
function jihuo(id){
var dt=new Date();
createSimpleWindow("win_fstzs","查看非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
}
function del(){
var rows = $('#pagination').datagrid('getSelections');
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 : "fsjktbDel.action",
type: 'post',
dataType: 'json',
async : false,
data:{
ids : ids
},
error: function(){
$.messager.alert('错误','删除时出错！');
},
success: function(data){
if(data.result){
$.messager.alert('提示','删除成功！');
search_fsjktb();
}else{
$.messager.alert('错误','删除时出错！');
}
}
});
}
});
}
}
function search_fsjktb(){
function search_fstzsXm(){
var queryParams = {
"queryTbrqStart" :$("#queryTbrqStart").val(),
"queryTbrqEnd" :$("#queryTbrqEnd").val()
"fstzsXm.slbh": $("#slbh").val(),
"fstzsXm.jsdwmc": $("#dwmc").val(),
"fstzsXm.gcxmmc": $("#xmmc").val(),
"fstzsXm.yjje": $("#yjje").val()
};
$('#pagination').datagrid('options').queryParams = queryParams;
$('#pagination').datagrid('clearSelections');
......@@ -90,64 +43,90 @@
}
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp,{
title:'非税借口同步信息列表',
url:'fsjktbQuery.action',
$('#pagination').datagrid($.extend(window.dg_cm_pp_2,{
title:'已生成非税通知书列表',
url:'${ctx}/jsp/fstzs/fstzsXmList.action',
queryParams:{
"queryTbrqStart" :$("#queryTbrqStart").val(),
"queryTbrqEnd" :$("#queryTbrqEnd").val()
"fstzsXm.slbh": $("#slbh").val(),
"fstzsXm.dwmc": $("#dwmc").val(),
"fstzsXm.xmmc": $("#xmmc").val(),
"fstzsXm.yjje": $("#yjje").val(),
},
frozenColumns:[[
// {field:'id',checkbox:true}
]],
columns:[[
{field:'createTime',title:'同步日期',width:100},
// {field:'tbzsdw',title:'执收单位状态',width:100},
// {field:'tbsrxm',title:'收入项目状态',width:100},
// {field:'tbdsyh',title:'代收银行状态',width:100},
{field:'zsdw',title:'征收单位',width:100},
{field:'zsdwbm',title:'征收单位编码',width:100},
{field:'qhm',title:'区划码',width:100},
{field:'skrqc',title:'收款人全称',width:100},
{field:'skrzh',title:'收款人账户',width:100},
{field:'skrkhh',title:'收款人开户行',width:100},
{field:'xmbm',title:'项目编码',width:100},
{field:'srxmmc',title:'收款人项目名称',width:100},
{field:'sfbz',title:'收费标准',width:100},
{field:'op',title:'查看',width:100,formatter:function(value,rec){return "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>&nbsp;";}}
]],
toolbar:[]
{field:'op',title:'操作',width:120,align:'center',formatter:function(value,rec){
var result = "";
if(rec.status == 3 || rec.status == 4) {//复核不通过、退回时
result += "<a class='btn_01_mini' onclick=edit('"+rec.id+"') >修改<b></b></a>";
} else {
result += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
}
if(rec.status == 2) {//复核通过
result += "<a class='btn_01_mini' onclick=jihuo('"+rec.id+"') >激活<b></b></a>";
} else if(rec.status == 4) {//退回时
result += "<a class='btn_01_mini' onclick=del('"+rec.id+"') >删除<b></b></a>";
} else {
result += "<a class='btn_01_mini' style='opacity: 0.5' >激活<b></b></a>";
}
return result;
}},
{field:'slbh',title:'受理编号',width:150},
{field:'jsdwmc',title:'建设单位名称',width:300},
{field:'gcxmmc',title:'工程项目名称',width:300},
{field:'yjje',title:'配套费应缴金额',width:150,formatter: function (value, row, index){
if (row != null && ""!=value) {
return (parseFloat(value).toFixed(2) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
}
}},
{field:'zyjje',title:'项目总应缴金额',width:150,formatter: function (value, row, index){
return (parseFloat(row.paymentItemPending.zyjje).toFixed(2) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
}},
{field:'jzmj',title:'总建筑面积',width:150,formatter: function (value, row, index){
return row.paymentItemPending.csmj;
}},
{field:'status',title:'是否复核',width:150,formatter: function (value, row, index){
if (value == 1) return "待复核";
if (value == 2) return "复核通过";
if (value == 3) return "待复不通过";
if (value == 4) return "作废退回";
return "待生成";
}}
]]
}));
});
</script>
</head>
<body>
<div class="page_content">
<div class="box_01 submitdata">
<div class="inner12px">
<div class="cell boxBmargin12">
<table width="100%">
<tr>
<!-- <th width="15%">同步日期</th> -->
<%-- <td width="35%"><input name="queryTbrqStart" id="queryTbrqStart" value="<fmt:formatDate type='both' value='${queryTbrqStart}' />" type="text" class="Wdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'queryTbrqEnd\')}'})" > --%>
<%-- -<input name="queryTbrqEnd" id="queryTbrqEnd" value="<fmt:formatDate type='both' value='${queryTbrqEnd}' />" type="text" class="Wdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'queryTbrqStart\')}'})" ></td> --%>
<!-- </tr> -->
<!-- <tr> -->
<!-- <td colspan="4" align="center"> -->
<%-- <a href="${ctx}/jsp/fsjktb/yijiantb.action" class="btn_01" >手动同步<b></b></a>&nbsp; --%>
<a href="###" class="btn_01" onclick="yijiantb();" >手动同步<b></b></a>&nbsp;
<!-- </td> -->
<th width="15%">受理编号</th>
<td width="35%"><input name="fstzsXm.slbh" id="slbh" value="" type="text"></td>
<th width="15%">应缴金领</th>
<td width="35%"><input name="fstzsXm.yjje" id="yjje" value="" type="text"></td>
</tr>
<tr>
<th width="15%">工程项目名称</th>
<td width="35%"><input name="fstzsXm.gcxmmc" id="gcxmmc" value="" type="text"></td>
<th width="15%">建设单位名称</th>
<td width="35%"><input name="fstzsXm.jsdwmc" id="jsdwmc" value="" type="text"></td>
</tr>
<tr>
<td colspan="4" align="center">
<a href="###" class="btn_01" onclick="search_fstzsXm()" >查询<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;
</td>
</tr>
</table>
</div>
<div id="pagination" >
</div>
</div>
<div id="pagination" ></div>
</div>
</div>
</body>
......
src/com/jshx/fstzs/conf/sql-map-fstzs-xm.xml
View file @ b7a5e526
......@@ -8,7 +8,7 @@
<![CDATA[and t.id in (:ids)]]>
</isNotEmpty>
<isNotEmpty property="status">
<![CDATA[and t.status = :status]]>
<![CDATA[and t.status in (:status)]]>
</isNotEmpty>
<isNotEmpty property="slbh">
......
src/com/jshx/fstzs/conf/struts-fstzs.xml
View file @ b7a5e526
......@@ -22,11 +22,19 @@
</action>
<!--生成非税通知书-->
<action name="addFstzs" class="com.jshx.fstzs.web.FstzsAction" method="addFstzs">
<!--生成非税通知书窗口-->
<action name="winAddFstzs" class="com.jshx.fstzs.web.FstzsAction" method="winAddFstzs">
<result name="view">/WEB-INF/pages/fstzs/Fstzs_Add.jsp</result>
</action>
<!--生成非税通知书操作-->
<action name="addFstzs" class="com.jshx.fstzs.web.FstzsAction" method="addFstzs">
<interceptor-ref name="tokenInterceptor" />
<interceptor-ref name="coreStack" />
<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_fstzs</result>
<result name="invalid.token">/invalid.jsp</result>
</action>
<!-- 列表查询，返回Json数据 -->
<action name="fstzsList" class="com.jshx.fstzs.web.FstzsAction" method="list">
......@@ -35,5 +43,6 @@
<action name="fstzsXmList" class="com.jshx.fstzs.web.FstzsAction" method="listXm">
</action>
</package>
</struts>
src/com/jshx/fstzs/web/FstzsAction.java
View file @ b7a5e526
......@@ -31,8 +31,12 @@ public class FstzsAction extends BaseAction {
/**
* 非税通知书项目列表状态入参
*/
int status;
Integer status;
String id;
/**
* 非税通知书项目生成通知书的时候，上传的列表
*/
List<Fstzs> fstzsList = new ArrayList<>();
/**
......@@ -46,7 +50,10 @@ public class FstzsAction extends BaseAction {
if(null != fstzs){
//状态
paraMap.put("status", fstzs.getStatus() == null ? 0 : fstzs.getStatus());
if(fstzs.getStatus() != null) {
paraMap.put("status",fstzs.getStatus());
}
if (!TextUtils.isEmpty(fstzs.getSlbh())){
paraMap.put("slbh", "%" + fstzs.getSlbh().trim() + "%");
......@@ -90,7 +97,16 @@ public class FstzsAction extends BaseAction {
Map<String, Object> paraMap = new HashMap<String, Object>();
if(pagination==null)
pagination = new Pagination(this.getRequest());
paraMap.put("status", status);
List<Integer> statusList = new ArrayList<>();
if(status != null) {
statusList.add(status);
} else {
statusList.add(1);
statusList.add(2);
statusList.add(3);
statusList.add(4);
}
paraMap.put("status",statusList);
if(null != fstzsXm){
//状态
if (!TextUtils.isEmpty(fstzsXm.getSlbh())){
......@@ -119,12 +135,45 @@ public class FstzsAction extends BaseAction {
convObjectToJson(pagination, config);
}
public String addFstzs() {
/**
* 生成非税通知书窗口
* @return
*/
public String winAddFstzs() {
fstzsXm = fstzsXmService.getById(id);
return VIEW;
}
/**
* 生成非税通知书操作
* @return
*/
public String addFstzs() {
FstzsXm dbXm = fstzsXmService.getById(id);
//更新数据库项目状态
dbXm.setStatus(1);//状态改为已生成、待复核
dbXm.setJbr(this.getLoginUser().getDisplayName());
dbXm.setBeizhu(fstzsXm.getBeizhu());
dbXm.setKhh(fstzsXm.getKhh());
dbXm.setMobile(fstzsXm.getMobile());
dbXm.setZhanghao(fstzsXm.getZhanghao());
//TODO 添加多条记录到fstzs表
if(fstzsList.size() > 0) {
fstzsList.stream().map(i -> {
i.setDelFlag(0);
i.setStatus(0);
i.setFstzsXm(fstzsXm);
i.setGcxmmc(fstzsXm.getGcxmmc());
i.setJsdwmc(fstzsXm.getJsdwmc());
i.setSlbh(fstzsXm.getSlbh());
return i;
}).forEach(i-> fstzsService.save(i));
fstzsXmService.update(dbXm);
return RELOAD;
}
return ERROR;
}
public Pagination getPagination() {
return pagination;
}
......@@ -149,11 +198,11 @@ public class FstzsAction extends BaseAction {
this.fstzsXm = fstzsXm;
}
public int getStatus() {
public Integer getStatus() {
return status;
}
public void setStatus(int status) {
public void setStatus(Integer status) {
this.status = status;
}
......
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