Skip to content

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

新增收款人入非税通知书表

parent 6ede9641
Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 119 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ 95700b51
...@@ -133,47 +133,47 @@ ...@@ -133,47 +133,47 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">征收单位名称</th> <th width="15">征收单位名称</th>kpsjgl
<td width="35%"> <td width="35%">
<input style="width:90%" value="??南京市城市建设费用征收服务中心" disabled/> <input id="zsdw" name="fstzsXm.kpsjgl.zsdw" style="width:90%" value="{{fstzsXm.kpsjgl.zsdw}}" disabled/>
</td> </td>
<th width="15">征收单位编码</th> <th width="15">征收单位编码</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="??708002" disabled/> <input id="zsdwbm" name="fstzsXm.kpsjgl.zsdwbm" style="width:90%" value="{{fstzsXm.kpsjgl.zsdwbm}}" disabled/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">区划码</th> <th width="15">区划码</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="??320100" disabled/> <input id="qhm" name="fstzsXm.kpsjgl.qhm" style="width:90%" value="{{fstzsXm.kpsjgl.qhm}}" disabled/>
</td> </td>
<th width="15">收款人全称</th> <th width="15">收款人全称</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="??南京市财政局" disabled/> <input id="krqc" name="fstzsXm.kpsjgl.krqc" style="width:90%" value="{{fstzsXm.kpsjgl.krqc}}" disabled/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">收款人账号</th> <th width="15">收款人账号</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="??88888888888" disabled/> <input id="skrzh" name="fstzsXm.kpsjgl.skrzh" style="width:90%" value="{{fstzsXm.kpsjgl.skrzh}}" disabled/>
</td> </td>
<th width="15">收款人开户行</th> <th width="15">收款人开户行</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="??南京市农行大行宫支行" disabled/> <input id="skrkhh" name="fstzsXm.kpsjgl.skrkhh" style="width:90%" value="{{fstzsXm.kpsjgl.skrkhh}}" disabled/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">项目编码</th> <th width="15">项目编码</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="??1500112" disabled/> <input id="xmbm" name="fstzsXm.kpsjgl.xmbm" style="width:90%" value="{{fstzsXm.kpsjgl.xmbm}}" disabled/>
</td> </td>
<th width="15">收入项目名称</th> <th width="15">收入项目名称</th>
<td width="35%"> <td width="35%">
<input style="width:90%" value="城市基础设施配套费" disabled/> <input id="srxmmc" name="fstzsXm.kpsjgl.srxmmc" style="width:90%" value="{{fstzsXm.kpsjgl.srxmmc}}" disabled/>
</td> </td>
</tr> </tr>
<tr> <tr>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjk.jsp
View file @ 95700b51
...@@ -6,83 +6,15 @@ ...@@ -6,83 +6,15 @@
<%@include file="/common/jsLib.jsp"%> <%@include file="/common/jsLib.jsp"%>
<script> <script>
function addNew(){
var dt=new Date();
createSimpleWindow("win_fsjktb","添加非税借口同步信息","${ctx}/jsp/fsjktb/fsjktbInitEdit.action?flag=add&dt="+dt.getTime(),700,300);
} function search_fstzs(){
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_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 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(){
var queryParams = { var queryParams = {
"queryTbrqStart" :$("#queryTbrqStart").val(), "fstzs.slbh": $("#slbh").val(),
"queryTbrqEnd" :$("#queryTbrqEnd").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('options').queryParams = queryParams;
$('#pagination').datagrid('clearSelections'); $('#pagination').datagrid('clearSelections');
...@@ -91,32 +23,57 @@ ...@@ -91,32 +23,57 @@
$(function(){ $(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp,{ $('#pagination').datagrid($.extend(window.dg_cm_pp,{
title:'非税借口同步信息列表', title:'已缴款非税通知书列表',
url:'fsjktbQuery.action', url:'${ctx}/jsp/fstzs/fstzsList.action?status=2',
queryParams:{ queryParams:{
"queryTbrqStart" :$("#queryTbrqStart").val(), "fstzs.slbh": $("#slbh").val(),
"queryTbrqEnd" :$("#queryTbrqEnd").val() "fstzs.dwmc": $("#dwmc").val(),
"fstzs.xmmc": $("#xmmc").val(),
"fstzs.yjje": $("#yjje").val(),
"fstzs.jkm": $("#jkm").val(),
"fstzs.status": $("#status").val(),
}, },
frozenColumns:[[ frozenColumns:[[
// {field:'id',checkbox:true} {field:'id',checkbox:true}
]], ]],
columns:[[ columns:[[
{field:'createTime',title:'同步日期',width:100}, {field:'op',title:'操作',width:80,align:'center',formatter:function(value,rec){
// {field:'tbzsdw',title:'执收单位状态',width:100}, var result = "";
// {field:'tbsrxm',title:'收入项目状态',width:100}, if(rec.isKp == 0) {
// {field:'tbdsyh',title:'代收银行状态',width:100}, result += "<a class='btn_01_mini' onclick=kaipiao('"+rec.id+"') >开票<b></b></a>";
{field:'zsdw',title:'征收单位',width:100}, }
{field:'zsdwbm',title:'征收单位编码',width:100}, return result;
{field:'qhm',title:'区划码',width:100}, }},
{field:'skrqc',title:'收款人全称',width:100}, {field:'jkm',title:'缴款码',width:100},
{field:'skrzh',title:'收款人账户',width:100}, {field:'bzrq',title:'编制日期',width:100},
{field:'skrkhh',title:'收款人开户行',width:100}, {field:'slbh',title:'受理编号',width:100},
{field:'xmbm',title:'项目编码',width:100}, {field:'jsdwmc',title:'建设单位名称',width:100},
{field:'srxmmc',title:'收款人项目名称',width:100}, {field:'gcxmmc',title:'工程项目名称',width:100},
{field:'sfbz',title:'收费标准',width:100}, {field:'jkr',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:'yjje',title:'金额',width:100},
{field:'pjdm',title:'票据代码',width:100},
{field:'jksh',title:'缴款书号',width:100},
{field:'dzph',title:'相关电子票号',width:100},
{field:'isKp',title:'开票状态',width:100,formatter: function (value, row, index){
if (value == 0) return "未开票";
return "已开票";
}},
{field:'isJk',title:'缴款状态',width:100,formatter: function (value, row, index){
if (value == 0) return "未缴款";
return "已缴款";
}},
{field:'jkTime',title:'缴款日期',width:100},
{field:'jkqd',title:'缴款渠道',width:100}
]], ]],
toolbar:[] toolbar:[{
id:'btnkaipiao',
text:'批量开票',
iconCls:'icon-ok',
handler:function(){
addNew();
}
}
]
})); }));
}); });
...@@ -131,16 +88,22 @@ ...@@ -131,16 +88,22 @@
<div class="cell boxBmargin12"> <div class="cell boxBmargin12">
<table width="100%"> <table width="100%">
<tr> <tr>
<th width="15%">受理编号</th>
<!-- <th width="15%">同步日期</th> --> <td width="35%"><input name="fstzsXm.slbh" id="slbh" value="" type="text"></td>
<%-- <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\')}'})" > --%> <th width="15%">应缴金领</th>
<%-- -<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> --%> <td width="35%"><input name="fstzsXm.yjje" id="yjje" value="" type="text"></td>
<!-- </tr> --> </tr>
<!-- <tr> --> <tr>
<!-- <td colspan="4" align="center"> --> <th width="15%">工程项目名称</th>
<%-- <a href="${ctx}/jsp/fsjktb/yijiantb.action" class="btn_01" >手动同步<b></b></a>&nbsp; --%> <td width="35%"><input name="fstzsXm.gcxmmc" id="gcxmmc" value="" type="text"></td>
<a href="###" class="btn_01" onclick="yijiantb();" >手动同步<b></b></a>&nbsp; <th width="15%">建设单位名称</th>
<!-- </td> --> <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> </tr>
</table> </table>
</div> </div>
......
src/com/jshx/fstzs/conf/sql-map-fstzs.xml
View file @ 95700b51
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<![CDATA[and t.id in (:ids)]]> <![CDATA[and t.id in (:ids)]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="status"> <isNotEmpty property="status">
<![CDATA[and t.status = :status]]> <![CDATA[and t.status in (:status)]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="slbh"> <isNotEmpty property="slbh">
......
src/com/jshx/fstzs/entity/Fstzs.java
View file @ 95700b51
...@@ -24,6 +24,7 @@ public class Fstzs extends BaseModel { ...@@ -24,6 +24,7 @@ public class Fstzs extends BaseModel {
* 非税通知书状态 * 非税通知书状态
* 0：默认，正常 * 0：默认，正常
* 1：已作废 * 1：已作废
* 2：已缴费：从财政同步状态
*/ */
private Integer status; private Integer status;
...@@ -77,6 +78,36 @@ public class Fstzs extends BaseModel { ...@@ -77,6 +78,36 @@ public class Fstzs extends BaseModel {
*/ */
private String jsdwmc; private String jsdwmc;
/**
* 电子票号
*/
private String dzph;
/**
* 是否开票
* 0 没开
*/
private Integer isKp;
/**
* 是否缴款
* 0，未交款
*/
private Integer isJk;
/**
* 缴款时间
*/
private String jkTime;
/**
* 开票时间
*/
private String kpTime;
/**
* 缴款渠道
*/
private String jkqd;
/** /**
* 对应项目信息 * 对应项目信息
...@@ -178,4 +209,52 @@ public class Fstzs extends BaseModel { ...@@ -178,4 +209,52 @@ public class Fstzs extends BaseModel {
public void setJsdwmc(String jsdwmc) { public void setJsdwmc(String jsdwmc) {
this.jsdwmc = jsdwmc; this.jsdwmc = jsdwmc;
} }
public String getDzph() {
return dzph;
}
public void setDzph(String dzph) {
this.dzph = dzph;
}
public Integer getIsKp() {
return isKp;
}
public void setIsKp(Integer isKp) {
this.isKp = isKp;
}
public Integer getIsJk() {
return isJk;
}
public void setIsJk(Integer isJk) {
this.isJk = isJk;
}
public String getJkTime() {
return jkTime;
}
public void setJkTime(String jkTime) {
this.jkTime = jkTime;
}
public String getKpTime() {
return kpTime;
}
public void setKpTime(String kpTime) {
this.kpTime = kpTime;
}
public String getJkqd() {
return jkqd;
}
public void setJkqd(String jkqd) {
this.jkqd = jkqd;
}
} }
src/com/jshx/fstzs/entity/FstzsXm.java
View file @ 95700b51
...@@ -2,6 +2,7 @@ package com.jshx.fstzs.entity; ...@@ -2,6 +2,7 @@ package com.jshx.fstzs.entity;
import com.jshx.common.utils.NumberToCN; import com.jshx.common.utils.NumberToCN;
import com.jshx.core.base.entity.BaseModel; import com.jshx.core.base.entity.BaseModel;
import com.jshx.kpsjgl.entity.Kpsjgl;
import com.jshx.module.admin.entity.User; import com.jshx.module.admin.entity.User;
import com.jshx.paymentItemPending.entity.PaymentItemPending; import com.jshx.paymentItemPending.entity.PaymentItemPending;
import com.jshx.xmxxb.entity.Xmxxb; import com.jshx.xmxxb.entity.Xmxxb;
...@@ -92,6 +93,11 @@ public class FstzsXm extends BaseModel ...@@ -92,6 +93,11 @@ public class FstzsXm extends BaseModel
*/ */
private PaymentItemPending paymentItemPending; private PaymentItemPending paymentItemPending;
/**
* 对应的收款人
*/
private Kpsjgl kpsjgl;
public Integer getStatus() { public Integer getStatus() {
return status; return status;
} }
...@@ -201,4 +207,14 @@ public class FstzsXm extends BaseModel ...@@ -201,4 +207,14 @@ public class FstzsXm extends BaseModel
public void setPaymentItemPending(PaymentItemPending paymentItemPending) { public void setPaymentItemPending(PaymentItemPending paymentItemPending) {
this.paymentItemPending = paymentItemPending; this.paymentItemPending = paymentItemPending;
} }
@OneToOne(fetch = FetchType.EAGER, targetEntity=Kpsjgl.class)
@JoinColumn(name = "KPSJGL_ZJ",updatable=false,insertable=false)
public Kpsjgl getKpsjgl() {
return kpsjgl;
}
public void setKpsjgl(Kpsjgl kpsjgl) {
this.kpsjgl = kpsjgl;
}
} }
src/com/jshx/fstzs/web/FstzsAction.java
View file @ 95700b51
...@@ -8,6 +8,7 @@ import com.jshx.fstzs.entity.Fstzs; ...@@ -8,6 +8,7 @@ import com.jshx.fstzs.entity.Fstzs;
import com.jshx.fstzs.entity.FstzsXm; import com.jshx.fstzs.entity.FstzsXm;
import com.jshx.fstzs.service.FstzsService; import com.jshx.fstzs.service.FstzsService;
import com.jshx.fstzs.service.FstzsXmService; import com.jshx.fstzs.service.FstzsXmService;
import com.jshx.kpsjgl.service.KpsjglService;
import com.neusoft.egov.utils.TextUtils; import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JsonConfig; import net.sf.json.JsonConfig;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -19,6 +20,11 @@ public class FstzsAction extends BaseAction { ...@@ -19,6 +20,11 @@ public class FstzsAction extends BaseAction {
FstzsService fstzsService; FstzsService fstzsService;
@Autowired @Autowired
FstzsXmService fstzsXmService; FstzsXmService fstzsXmService;
/**
* 获取收款人信息
*/
@Autowired
KpsjglService kpsjglService;
/** /**
* 分页信息 * 分页信息
...@@ -47,12 +53,21 @@ public class FstzsAction extends BaseAction { ...@@ -47,12 +53,21 @@ public class FstzsAction extends BaseAction {
Map<String, Object> paraMap = new HashMap<String, Object>(); Map<String, Object> paraMap = new HashMap<String, Object>();
if(pagination==null) if(pagination==null)
pagination = new Pagination(this.getRequest()); pagination = new Pagination(this.getRequest());
//url带了status参数
List<Integer> statusList = new ArrayList<>();
if(status != null) {
statusList.add(status);
} else {
statusList.add(1);
statusList.add(2);
}
paraMap.put("status",statusList);
if(null != fstzs){ if(null != fstzs){
//状态 //筛选条件带了status，覆盖之前的
if(fstzs.getStatus() != null) { if(fstzs.getStatus() != null) {
paraMap.put("status",fstzs.getStatus()); paraMap.put("status",new ArrayList<Integer>(){{
fstzs.getStatus();
}});
} }
if (!TextUtils.isEmpty(fstzs.getSlbh())){ if (!TextUtils.isEmpty(fstzs.getSlbh())){
......
src/com/jshx/kpsjgl/dao/KpsjglDao.java
View file @ 95700b51
...@@ -26,6 +26,8 @@ public interface KpsjglDao extends BaseDao ...@@ -26,6 +26,8 @@ public interface KpsjglDao extends BaseDao
*/ */
public List findKpsjgl(Map<String, Object> paraMap); public List findKpsjgl(Map<String, Object> paraMap);
public Kpsjgl findFirst(Map<String, Object> paraMap);
/** /**
* 根据主键ID查询信息 * 根据主键ID查询信息
* @param id 主键ID * @param id 主键ID
......
src/com/jshx/kpsjgl/dao/impl/KpsjglDaoImpl.java
View file @ 95700b51
package com.jshx.kpsjgl.dao.impl; package com.jshx.kpsjgl.dao.impl;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.sql.Blob; import java.sql.Blob;
import java.util.Map; import java.util.Map;
...@@ -37,6 +38,16 @@ public class KpsjglDaoImpl extends BaseDaoImpl implements KpsjglDao ...@@ -37,6 +38,16 @@ public class KpsjglDaoImpl extends BaseDaoImpl implements KpsjglDao
return this.findListByHqlId("findKpsjglByMap", paraMap); return this.findListByHqlId("findKpsjglByMap", paraMap);
} }
@Override
public Kpsjgl findFirst(Map<String, Object> paraMap) {
List list = findKpsjgl(paraMap);
if(list != null && list.size() > 0) {
return (Kpsjgl) list.get(0);
}
return null;
}
/** /**
* 根据主键ID查询信息 * 根据主键ID查询信息
* @param id 主键ID * @param id 主键ID
......
src/com/jshx/paymentItemPending/service/impl/PaymentItemPendingServiceImpl.java
View file @ 95700b51
...@@ -9,6 +9,7 @@ import javax.annotation.Resource; ...@@ -9,6 +9,7 @@ import javax.annotation.Resource;
import com.jshx.fstzs.dao.FstzsXmDao; import com.jshx.fstzs.dao.FstzsXmDao;
import com.jshx.fstzs.entity.FstzsXm; import com.jshx.fstzs.entity.FstzsXm;
import com.jshx.kpsjgl.dao.KpsjglDao;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -38,6 +39,9 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa ...@@ -38,6 +39,9 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa
@Autowired() @Autowired()
private JktzsDao jktzsDao; private JktzsDao jktzsDao;
@Autowired()
private KpsjglDao kpsjglDao;
@Autowired() @Autowired()
private FstzsXmDao fstzsXmDao; private FstzsXmDao fstzsXmDao;
...@@ -251,6 +255,10 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa ...@@ -251,6 +255,10 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa
//保存项目到非税通知书表 //保存项目到非税通知书表
FstzsXm xm = new FstzsXm(); FstzsXm xm = new FstzsXm();
xm.setPaymentItemPending(dj); xm.setPaymentItemPending(dj);
//获取收款人信息保存到项目中
HashMap<String, Object> param = new HashMap<>();
param.put("gllb","001");
xm.setKpsjgl(kpsjglDao.findFirst(param));
xm.setDelFlag(0); xm.setDelFlag(0);
xm.setStatus(0); xm.setStatus(0);
......
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