Skip to content

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

新增部分需求

parent 1873e2cc
Show whitespace changes
Inline Side-by-side
Showing with 205 additions and 97 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ c108a122
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<td class=" line-input"><span class="db-num db-num-text">${result.jkr}</span><input class="db-input line-input-text" type="text" /></td> <td class=" line-input"><span class="db-num db-num-text">${result.jkr}</span><input class="db-input line-input-text" type="text" /></td>
<td class="line-one">元</td> <td class="line-one">元</td>
<td class="line-one">150</td> <td class="line-one">150</td>
<td class="line-one line-yjmj">${result.yjje}</td> <td class="line-one line-yjmj">${result.yjmj}</td>
<td class="line-input"><span class="db-num db-nums">${result.yjje}</span><input class="db-input db-money" <td class="line-input"><span class="db-num db-nums">${result.yjje}</span><input class="db-input db-money"
type="text" /></td> type="text" /></td>
<td><span class="delOneRow"><img src="${ctx}/images/img/edit_remove.png" alt=""></span></td> <td><span class="delOneRow"><img src="${ctx}/images/img/edit_remove.png" alt=""></span></td>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp
View file @ c108a122
...@@ -72,6 +72,9 @@ ...@@ -72,6 +72,9 @@
<body validform="true"> <body validform="true">
<div class="page_dialog"> <div class="page_dialog">
<div class="inner6px"> <div class="inner6px">
<form name="myform1" method="post" enctype="multipart/form-data">
<s:token />
<input class="hid" type="hidden" name="fstzsXm.id" value="${fstzsXm.id}">
<div class="cell" style="width: 100%"> <div class="cell" style="width: 100%">
<table width="100%" border="0" class="ta-tb"> <table width="100%" border="0" class="ta-tb">
...@@ -211,7 +214,7 @@ ...@@ -211,7 +214,7 @@
<td class=" line-input"><span class="db-num db-num-text">${result.jkr}</span></td> <td class=" line-input"><span class="db-num db-num-text">${result.jkr}</span></td>
<td class="line-one">元</td> <td class="line-one">元</td>
<td class="line-one">150</td> <td class="line-one">150</td>
<td class="line-one line-yjmj">${result.yjje}</td> <td class="line-one line-yjmj">${result.yjmj}</td>
<td class="line-input"><span class="db-num db-nums">${result.yjje}</span></td> <td class="line-input"><span class="db-num db-nums">${result.yjje}</span></td>
</tr> </tr>
</c:forEach> </c:forEach>
...@@ -237,13 +240,14 @@ ...@@ -237,13 +240,14 @@
</tr> </tr>
<tr> <tr>
<td colspan="4" align="center" style="position: relative;top: 20px;"> <td colspan="4" align="center" style="position: relative;top: 20px;">
<a href="###" class="btn_01" onclick="tjFstzs()" >通过<b></b></a>&nbsp; <a href="###" class="btn_01" onclick="review(0);" >通过<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="clear_form(document.myform);" >退回<b></b></a>&nbsp; <a href="###" class="btn_01" onclick="review(1);" >退回<b></b></a>&nbsp;
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</form>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
...@@ -263,8 +267,9 @@ ...@@ -263,8 +267,9 @@
} }
$('.yjmj-hj').append(mj) $('.yjmj-hj').append(mj)
}) })
function tjFstzs() { function review(flag) {
document.myform1.action = "reviewFstzs.action?flag=" + flag;
document.myform1.submit();
} }
</script> </script>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp
View file @ c108a122
...@@ -9,79 +9,34 @@ ...@@ -9,79 +9,34 @@
<%@include file="/common/jsLib.jsp"%> <%@include file="/common/jsLib.jsp"%>
<script> <script>
function zuofei(){ function zuofei(slbh,length,jkm){
var dt=new Date(); var msg = "作废缴款码" + jkm;
createSimpleWindow("win_fsjktb","添加非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbInitEdit.action?flag=add&dt="+dt.getTime(),700,300); if(length > 1) {
msg = msg + (",同一受理编号的其他" + length +"个缴款码也将一并作废，是否确认作废？")
}
function edit(row_Id){
var dt=new Date();
createSimpleWindow("win_fsjktb","修改非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbInitEdit.action?flag=mod&fsjktb.id="+row_Id+"&dt="+dt.getTime(),700,300);
}
function view(row_Id){
var dt=new Date();
createSimpleWindow("win_fsjktb","查看非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbView.action?fsjktb.id="+row_Id+"&dt="+dt.getTime(),700,300);
}
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fstzs();
}
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{
}
} }
}); $.messager.confirm("提示", msg, function(result) {
if(result) {
}
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({ $.ajax({
url : "fsjktbDel.action", url : "${ctx}/jsp/fstzs/zuofei.action",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
async : false,
data:{ data:{
ids : ids 'fstzs.slbh' : slbh
},
error: function(){
$.messager.alert('错误','删除时出错！');
}, },
success: function(data){ async : false
if(data.result){
$.messager.alert('提示','删除成功！');
search_fstzs();
}else{
$.messager.alert('错误','删除时出错！');
}
}
}); });
$.messager.alert("提示","操作成功")
reloadDate()
} }
}); });
} }
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fstzs();
} }
function search_fstzs(){ function search_fstzs(){
var queryParams = { var queryParams = {
"fstzs.slbh": $("#slbh").val(), "fstzs.slbh": $("#slbh").val(),
...@@ -114,8 +69,8 @@ ...@@ -114,8 +69,8 @@
columns:[[ columns:[[
{field:'op',title:'操作',width:80,align:'center',formatter:function(value,rec){ {field:'op',title:'操作',width:80,align:'center',formatter:function(value,rec){
var result = ""; var result = "";
if(rec.status == 0) {//复核不通过、退回时 if(rec.status == 1) {//未缴款的可作废
result += "<a class='btn_01_mini' onclick=zuofei('"+rec.id+"') >作废<b></b></a>"; result += "<a class='btn_01_mini' onclick=zuofei('"+rec.slbh+"','"+rec.length+"','"+rec.jkm+"') >作废<b></b></a>";
} }
return result; return result;
}}, }},
...@@ -129,7 +84,7 @@ ...@@ -129,7 +84,7 @@
{field:'pjdm',title:'票据代码',width:100}, {field:'pjdm',title:'票据代码',width:100},
{field:'jksh',title:'缴款书号',width:100}, {field:'jksh',title:'缴款书号',width:100},
{field:'status',title:'非税通知书状态',width:100,formatter: function (value, row, index){ {field:'status',title:'非税通知书状态',width:100,formatter: function (value, row, index){
if (value == 0) return "正常"; if (value == 1) return "正常";
return "已作废"; return "已作废";
}} }}
]], ]],
...@@ -165,9 +120,9 @@ ...@@ -165,9 +120,9 @@
<th width="15%">非税通知书状态</th> <th width="15%">非税通知书状态</th>
<td width="12%"><select name="rfxm.accountStatus" id="accountStatus" > <td width="12%"><select name="rfxm.accountStatus" id="accountStatus" >
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">正常</option> <option value="1">正常</option>
<option value="1">已缴款</option> <option value="2">已缴款</option>
<option value="2">已作废</option> <option value="3">已作废</option>
</select></td> </select></td>
</tr> </tr>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjk.jsp
View file @ c108a122
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
$(function(){ $(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp,{ $('#pagination').datagrid($.extend(window.dg_cm_pp,{
title:'已缴款非税通知书列表', title:'已缴款非税通知书列表',
url:'${ctx}/jsp/fstzs/fstzsList.action?status=2', url:'${ctx}/jsp/fstzs/fstzsList.action?status=3',
queryParams:{ queryParams:{
"fstzs.slbh": $("#slbh").val(), "fstzs.slbh": $("#slbh").val(),
"fstzs.dwmc": $("#dwmc").val(), "fstzs.dwmc": $("#dwmc").val(),
...@@ -97,9 +97,9 @@ ...@@ -97,9 +97,9 @@
<th width="15%">非税通知书状态</th> <th width="15%">非税通知书状态</th>
<td width="12%"><select name="rfxm.accountStatus" id="accountStatus" > <td width="12%"><select name="rfxm.accountStatus" id="accountStatus" >
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">正常</option> <option value="1">正常</option>
<option value="1">已缴款</option> <option value="2">已缴款</option>
<option value="2">已作废</option> <option value="3">已作废</option>
</select></td> </select></td>
</tr> </tr>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ c108a122
...@@ -19,9 +19,44 @@ ...@@ -19,9 +19,44 @@
} }
function jihuo(id){ function jihuo(id){
var dt=new Date(); $.messager.confirm("提示", "确认要激活该项目？", function(result) {
createSimpleWindow("win_fstzs","查看非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700); if(result) {
$.ajax({
url : "${ctx}/jsp/fstzs/jihuoXm.action",
type: 'post',
dataType: 'json',
data:{
id : id
},
async : false
});
$.messager.alert("提示","操作成功")
reloadDate()
}
});
}
function shanchu(id) {
$.messager.confirm("提示", "确认要删除该项目？", function(result) {
if(result) {
$.ajax({
url : "${ctx}/jsp/fstzs/shanchu.action",
type: 'post',
dataType: 'json',
data:{
id : id
},
async : false
});
$.messager.alert("提示","操作成功")
reloadDate()
}
});
}
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fstzsXm();
} }
function search_fstzsXm(){ function search_fstzsXm(){
...@@ -58,7 +93,7 @@ ...@@ -58,7 +93,7 @@
if(rec.status == 2) {//复核通过 if(rec.status == 2) {//复核通过
result += "<a class='btn_01_mini' onclick=jihuo('"+rec.id+"') >激活<b></b></a>"; result += "<a class='btn_01_mini' onclick=jihuo('"+rec.id+"') >激活<b></b></a>";
} else if(rec.status == 4) {//退回时 } else if(rec.status == 4) {//退回时
result += "<a class='btn_01_mini' onclick=del('"+rec.id+"') >删除<b></b></a>"; result += "<a class='btn_01_mini' onclick=shanchu('"+rec.id+"') >删除<b></b></a>";
} else { } else {
result += "<a class='btn_01_mini' style='opacity: 0.5' >激活<b></b></a>"; result += "<a class='btn_01_mini' style='opacity: 0.5' >激活<b></b></a>";
} }
......
src/com/jshx/fstzs/conf/struts-fstzs.xml
View file @ c108a122
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</action> </action>
<action name="fstzsYjkList"> <action name="fstzsYjkList">
<result name="success">/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp</result> <result name="success">/WEB-INF/pages/fstzs/Fstzs_Yjk.jsp</result>
</action> </action>
...@@ -41,6 +41,15 @@ ...@@ -41,6 +41,15 @@
</action> </action>
<!--生成非税通知书操作-->
<action name="reviewFstzs" class="com.jshx.fstzs.web.FstzsAction" method="reviewFstzs">
<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数据 --> <!-- 列表查询，返回Json数据 -->
<action name="fstzsList" class="com.jshx.fstzs.web.FstzsAction" method="list"> <action name="fstzsList" class="com.jshx.fstzs.web.FstzsAction" method="list">
</action> </action>
...@@ -52,6 +61,17 @@ ...@@ -52,6 +61,17 @@
<action name="addFstzsCheck" class="com.jshx.fstzs.web.FstzsAction" method="checkAddFstzs"> <action name="addFstzsCheck" class="com.jshx.fstzs.web.FstzsAction" method="checkAddFstzs">
</action> </action>
<!--激活项目，参数传到财政系统-->
<action name="jihuoXm" class="com.jshx.fstzs.web.FstzsAction" method="jihuo">
</action>
<!--作废-->
<action name="zuofei" class="com.jshx.fstzs.web.FstzsAction" method="zuofei">
</action>
<!--删除-->
<action name="shanchu" class="com.jshx.fstzs.web.FstzsAction" method="shanchu">
</action>
</package> </package>
</struts> </struts>
src/com/jshx/fstzs/entity/Fstzs.java
View file @ c108a122
...@@ -22,9 +22,10 @@ public class Fstzs extends BaseModel { ...@@ -22,9 +22,10 @@ public class Fstzs extends BaseModel {
/** /**
* 非税通知书状态 * 非税通知书状态
* 0：默认，正常 * 0：默认，不显示在列表
* 1：已作废 * 1:已激活，正常
* 2：已缴费：从财政同步状态 * 2：已作废
* 3：已缴费：从财政同步状态
*/ */
private Integer status; private Integer status;
...@@ -113,6 +114,12 @@ public class Fstzs extends BaseModel { ...@@ -113,6 +114,12 @@ public class Fstzs extends BaseModel {
*/ */
private String jkqd; private String jkqd;
/**
* 一个项目可以对应对个缴款人
* 这个是总缴款人数量
*/
private Integer length;
/** /**
* 对应项目信息 * 对应项目信息
...@@ -270,4 +277,12 @@ public class Fstzs extends BaseModel { ...@@ -270,4 +277,12 @@ public class Fstzs extends BaseModel {
public void setYjmj(String yjmj) { public void setYjmj(String yjmj) {
this.yjmj = yjmj; this.yjmj = yjmj;
} }
public Integer getLength() {
return length;
}
public void setLength(Integer length) {
this.length = length;
}
} }
src/com/jshx/fstzs/entity/FstzsXm.java
View file @ c108a122
...@@ -30,6 +30,7 @@ public class FstzsXm extends BaseModel ...@@ -30,6 +30,7 @@ public class FstzsXm extends BaseModel
* 2：复核通过 * 2：复核通过
* 3：复核不通过 * 3：复核不通过
* 4：作废退回 * 4：作废退回
* 5：已激活，不再显示在已生成列表
*/ */
private Integer status; private Integer status;
......
src/com/jshx/fstzs/service/FstzsService.java
View file @ c108a122
...@@ -49,6 +49,7 @@ public interface FstzsService extends BaseService ...@@ -49,6 +49,7 @@ public interface FstzsService extends BaseService
* @param ids 主键ID列表 * @param ids 主键ID列表
*/ */
public void delete(String[] ids); public void delete(String[] ids);
public void delete(List<String> ids);
/** /**
* 逻辑删除信息 * 逻辑删除信息
......
src/com/jshx/fstzs/service/impl/FstzsServiceImpl.java
View file @ c108a122
...@@ -87,13 +87,15 @@ public class FstzsServiceImpl extends BaseServiceImpl implements FstzsService ...@@ -87,13 +87,15 @@ public class FstzsServiceImpl extends BaseServiceImpl implements FstzsService
public void delete(String[] ids) public void delete(String[] ids)
{ {
List list=Arrays.asList(ids); List list=Arrays.asList(ids);
delete(list);
}
@Override
public void delete(List<String> ids) {
Map<String, Object> paraMap = new HashMap<String, Object>(); Map<String, Object> paraMap = new HashMap<String, Object>();
paraMap.put("ids", list); paraMap.put("ids", ids);
// List objects=fstzsDao.findByPage(paraMap); List objects=fstzsDao.findByPage(paraMap);
//TODO 删除 fstzsDao.removeAll(objects);
// fstzsDao.removeAll(objects);
} }
/** /**
......
src/com/jshx/fstzs/web/FstzsAction.java
View file @ c108a122
...@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
public class FstzsAction extends BaseAction { public class FstzsAction extends BaseAction {
...@@ -183,7 +184,6 @@ public class FstzsAction extends BaseAction { ...@@ -183,7 +184,6 @@ public class FstzsAction extends BaseAction {
* @return * @return
*/ */
public String addFstzs() { public String addFstzs() {
if("add".equals(flag)) {
FstzsXm dbXm = fstzsXmService.getById(fstzsXm.getId()); FstzsXm dbXm = fstzsXmService.getById(fstzsXm.getId());
//更新数据库项目状态 //更新数据库项目状态
dbXm.setStatus(1);//状态改为已生成、待复核 dbXm.setStatus(1);//状态改为已生成、待复核
...@@ -194,15 +194,11 @@ public class FstzsAction extends BaseAction { ...@@ -194,15 +194,11 @@ public class FstzsAction extends BaseAction {
dbXm.setZhanghao(fstzsXm.getZhanghao()); dbXm.setZhanghao(fstzsXm.getZhanghao());
fstzsXmService.update(dbXm); fstzsXmService.update(dbXm);
return RELOAD; return RELOAD;
} else {//edit
}
return ERROR;
} }
/** /**
* 校验添加的多个缴款人 * 校验添加的多个缴款人
* 添加前，会把改受理编号下的历史缴款人删除
*/ */
public void checkAddFstzs() throws IOException { public void checkAddFstzs() throws IOException {
boolean result = true; boolean result = true;
...@@ -243,7 +239,17 @@ public class FstzsAction extends BaseAction { ...@@ -243,7 +239,17 @@ public class FstzsAction extends BaseAction {
} else { } else {
message = "校验正确，添加进表，并提交表单"; message = "校验正确，添加进表，并提交表单";
result = true; result = true;
//TODO 添加多条记录到fstzs表 //先查询是否有老的数据，有就删除先
//编辑时，先删除之前添加的内容
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
List<Fstzs> list = fstzsService.findList(params);
if(list != null && list.size() > 0) {
List<String> ids = list.stream().map(f -> f.getId()).collect(Collectors.toList());
fstzsService.delete(ids);
}
// 添加多条记录到fstzs表
fstzsList.stream().map(i -> { fstzsList.stream().map(i -> {
i.setDelFlag(0); i.setDelFlag(0);
i.setStatus(0); i.setStatus(0);
...@@ -251,6 +257,7 @@ public class FstzsAction extends BaseAction { ...@@ -251,6 +257,7 @@ public class FstzsAction extends BaseAction {
i.setGcxmmc(fstzsXm.getGcxmmc()); i.setGcxmmc(fstzsXm.getGcxmmc());
i.setJsdwmc(fstzsXm.getJsdwmc()); i.setJsdwmc(fstzsXm.getJsdwmc());
i.setSlbh(fstzsXm.getSlbh()); i.setSlbh(fstzsXm.getSlbh());
i.setLength(fstzsList.size());
return i; return i;
}).forEach(i-> fstzsService.save(i)); }).forEach(i-> fstzsService.save(i));
} }
...@@ -261,6 +268,73 @@ public class FstzsAction extends BaseAction { ...@@ -261,6 +268,73 @@ public class FstzsAction extends BaseAction {
this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}"); this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
} }
/**
* 复核非税通知书
* flag=0 通过 flag=1 退回
* @return
*/
public String reviewFstzs() {
FstzsXm fstzsXm = fstzsXmService.getById(this.fstzsXm.getId());
if("0".equals(flag)) {
fstzsXm.setStatus(2);
} else {
fstzsXm.setStatus(3);
}
fstzsXmService.update(fstzsXm);
return RELOAD;
}
/**
* 项目激活
* @return
*/
public void jihuo() {
FstzsXm xm = fstzsXmService.getById(id);
xm.setStatus(5);
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",xm.getSlbh());
//TODO 需要调用财政系统操作，财政返回成功之后，才可以修改入库
List<Fstzs> list = fstzsService.findList(params);
list.stream().forEach(f-> {
f.setStatus(1);
fstzsService.update(f);
});
}
/**
* 作废操作
*/
public void zuofei() {
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzs.getSlbh());
//TODO 需要调用财政系统，作废接口
List<Fstzs> list = fstzsService.findList(params);
FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
xm.setStatus(4);//已作废
list.stream().forEach(i-> {
i.setStatus(2);//已作废
fstzsService.update(i);
});
fstzsXmService.update(xm);
}
/**
* 删除操作
* xm表复原，status=0
* 删除对应缴费人的信息
*/
public void shanchu() {
FstzsXm xm = fstzsXmService.getById(id);
xm.setStatus(0);
xm.setFhyj("");
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",xm.getSlbh());
List<Fstzs> list = fstzsService.findList(params);
List<String> ids = list.stream().map(i -> i.getId()).collect(Collectors.toList());
fstzsService.delete(ids);
fstzsXmService.update(xm);
}
public Pagination getPagination() { public Pagination getPagination() {
return pagination; return pagination;
} }
......
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