Skip to content

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

非税通知书-自动缴销需求提交

parent 4bea66da
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 32 deletions
WebRoot/WEB-INF/pages/account/accountBank/AccountBank_Detail.jsp
View file @ 369bc32d
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
{ {
window.location.href="${ctx}/jsp/accountBank/downloadFile.action?attachId="+id; window.location.href="${ctx}/jsp/accountBank/downloadFile.action?attachId="+id;
} }
function viewFs(fsId) {
createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + fsId,900,700);
}
</script> </script>
</head> </head>
<body> <body>
...@@ -30,14 +34,29 @@ ...@@ -30,14 +34,29 @@
<td width="35%" >${accountBank.remark}</td> <td width="35%" >${accountBank.remark}</td>
</tr> </tr>
<c:if test="${accountBank.hasInvoice == 0}"> <c:if test="${accountBank.hasInvoice == 0}">
<c:forEach var="c" items="${attach}" varStatus="status">
<tr> <c:choose>
<th width="15%">附件${status.count}</th> <c:when test="${not empty accountBank.fsId}">
<td colspan="4" style="text-align: left;"> <tr>
<a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.attachname}</font></a> </br> <th width="15%">附件</th>
</td> <td colspan="4" style="text-align: left;">
</tr> <a href="#" class="btn_01" onclick=viewFs('${accountBank.fsId}');>查看<b></b></a>
</c:forEach> </td>
</tr>
</c:when>
<c:otherwise>
<c:forEach var="c" items="${attach}" varStatus="status">
<tr>
<th width="15%">附件${status.count}</th>
<td colspan="4" style="text-align: left;">
<a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.attachname}</font></a> </br>
</td>
</tr>
</c:forEach>
</c:otherwise>
</c:choose>
</c:if> </c:if>
<tr> <tr>
</tr> </tr>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ 369bc32d
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<tr> <tr>
<th width="15">应缴总面积(平方米)</th> <th width="15">应缴总面积(平方米)</th>
<td width="35%"> <td width="35%">
<input id="csmj" name="fstzsXm.paymentItemPending.csmj" style="width:90%" value="${fstzsXm.paymentItemPending.csmj}" disabled/> <input id="csmj" name="fstzsXm.xmxxb.csmj" style="width:90%" value="${fstzsXm.xmxxb.csmj}" disabled/>
</td> </td>
<th width="15">收费标准(元)</th> <th width="15">收费标准(元)</th>
...@@ -396,12 +396,11 @@ ...@@ -396,12 +396,11 @@
}else if (typeof(num) === 'number' && isNaN(num)) { }else if (typeof(num) === 'number' && isNaN(num)) {
$.messager.alert('提示', '请输入正确的数字!'); $.messager.alert('提示', '请输入正确的数字!');
} else { } else {
//计算应缴面积 //计算应缴面积
var yjmjNums = numb / 150 var yjmjNums = numb / 150
var x = String(yjmjNums).indexOf(".")+1;//得到小数点的位置 var x = String(yjmjNums).indexOf(".")+1;//得到小数点的位置
var y = String(yjmjNums).length - x;//小数点的位数 var y = String(yjmjNums).length - x;//小数点的位数
if(y > 2) { if(x != 0 && y > 2) {
$.messager.alert('提示', '请输入正确的应缴金额!'); $.messager.alert('提示', '请输入正确的应缴金额!');
$(this).parent().prev().text(''); $(this).parent().prev().text('');
return false; return false;
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Dsc.jsp
View file @ 369bc32d
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
} }
}}, }},
{field:'zyjje',title:'项目总应缴金额',width:150,formatter: function (value, row, index){ {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, '$&,'); return (parseFloat(row.xmxxb.yjje).toFixed(2) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
}}, }},
{field:'jzmj',title:'总建筑面积',width:150,formatter: function (value, row, index){ {field:'jzmj',title:'总建筑面积',width:150,formatter: function (value, row, index){
return row.paymentItemPending.csmj; return row.xmxxb.csmj;
}} }}
]] ]]
})); }));
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp
View file @ 369bc32d
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<tr> <tr>
<th width="15">应缴总面积(平方米)</th> <th width="15">应缴总面积(平方米)</th>
<td width="35%"> <td width="35%">
<input id="csmj" name="fstzsXm.paymentItemPending.csmj" style="width:90%" value="${fstzsXm.paymentItemPending.csmj}" disabled/> <input id="csmj" name="fstzsXm.xmxxb.csmj" style="width:90%" value="${fstzsXm.xmxxb.csmj}" disabled/>
</td> </td>
<th width="15">收费标准(元)</th> <th width="15">收费标准(元)</th>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp
View file @ 369bc32d
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
function dayin(id){ function dayin(id){
var dt=new Date(); var dt=new Date();
createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + id,900,700); createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + id,900,700);
} }
function reloadDate(){ function reloadDate(){
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ 369bc32d
...@@ -120,10 +120,10 @@ ...@@ -120,10 +120,10 @@
} }
}}, }},
{field:'zyjje',title:'项目总应缴金额',width:150,formatter: function (value, row, index){ {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, '$&,'); return (parseFloat(row.xmxxb.yjje).toFixed(2) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
}}, }},
{field:'jzmj',title:'总建筑面积',width:100,formatter: function (value, row, index){ {field:'jzmj',title:'总建筑面积',width:100,formatter: function (value, row, index){
return row.paymentItemPending.csmj; return row.xmxxb.csmj;
}}, }},
{field:'status',title:'是否复核',width:80,formatter: function (value, row, index){ {field:'status',title:'是否复核',width:80,formatter: function (value, row, index){
if (value == 1) return "待复核"; if (value == 1) return "待复核";
......
src/com/jshx/account/accountBank/entity/AccountBank.java
View file @ 369bc32d
...@@ -92,6 +92,11 @@ public class AccountBank extends BaseModel ...@@ -92,6 +92,11 @@ public class AccountBank extends BaseModel
* 子系统类型 * 子系统类型
*/ */
private String sysType; private String sysType;
/**
* 如果是由非税查询状态时，自动插入的数据，则存一下fs记录的id
*/
private String fsId;
public AccountBank(){ public AccountBank(){
} }
...@@ -235,4 +240,12 @@ public class AccountBank extends BaseModel ...@@ -235,4 +240,12 @@ public class AccountBank extends BaseModel
public void setSysType(String sysType) { public void setSysType(String sysType) {
this.sysType = sysType; this.sysType = sysType;
} }
public String getFsId() {
return fsId;
}
public void setFsId(String fsId) {
this.fsId = fsId;
}
} }
src/com/jshx/account/accountBank/service/impl/AccountBankServiceImpl.java
View file @ 369bc32d
...@@ -276,7 +276,7 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa ...@@ -276,7 +276,7 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa
String ECN = "PZ"+xmxxb.getBllb()+xmxxb.getDwdm().toUpperCase()+genericManager.getSN("dzpz"); String ECN = "PZ"+xmxxb.getBllb()+xmxxb.getDwdm().toUpperCase()+genericManager.getSN("dzpz");
paymentItemHis.setECN(ECN); paymentItemHis.setECN(ECN);
//转入已缴款项目 //转入已缴款项目
paymentItemHisDao.save(paymentItemHis); paymentItemHisDao.save(paymentItemHis);//???
//清除待缴款项目 //清除待缴款项目
paymentItemPendingDao.delete(paymentItemPending.getId()); paymentItemPendingDao.delete(paymentItemPending.getId());
//若是催缴项目，则需要清除催缴记录 //若是催缴项目，则需要清除催缴记录
......
src/com/jshx/fstzs/entity/Fstzs.java
View file @ 369bc32d
...@@ -136,6 +136,12 @@ public class Fstzs extends BaseModel { ...@@ -136,6 +136,12 @@ public class Fstzs extends BaseModel {
*/ */
private String jkqd; private String jkqd;
/**
* 缴款渠道
* 11柜面缴款和13网上缴款
*/
private String jkqdCode;
/** /**
* 操作激活的时间 * 操作激活的时间
*/ */
...@@ -416,4 +422,12 @@ public class Fstzs extends BaseModel { ...@@ -416,4 +422,12 @@ public class Fstzs extends BaseModel {
public void setYjjeQfw(String yjjeQfw) { public void setYjjeQfw(String yjjeQfw) {
this.yjjeQfw = yjjeQfw; this.yjjeQfw = yjjeQfw;
} }
public String getJkqdCode() {
return jkqdCode;
}
public void setJkqdCode(String jkqdCode) {
this.jkqdCode = jkqdCode;
}
} }
src/com/jshx/fstzs/entity/FstzsXm.java
View file @ 369bc32d
...@@ -101,10 +101,8 @@ public class FstzsXm extends BaseModel ...@@ -101,10 +101,8 @@ public class FstzsXm extends BaseModel
*/ */
private String fhyj; private String fhyj;
/**
* 对应项目信息主键 private Xmxxb xmxxb;
*/
private PaymentItemPending paymentItemPending;
/** /**
* 对应的收款人 * 对应的收款人
...@@ -118,6 +116,11 @@ public class FstzsXm extends BaseModel ...@@ -118,6 +116,11 @@ public class FstzsXm extends BaseModel
*/ */
private String jhjd; private String jhjd;
/**
* 项目是否缴销
*/
private Integer isJx;
public Integer getStatus() { public Integer getStatus() {
return status; return status;
...@@ -215,14 +218,14 @@ public class FstzsXm extends BaseModel ...@@ -215,14 +218,14 @@ public class FstzsXm extends BaseModel
this.yjjedx = yjjedx; this.yjjedx = yjjedx;
} }
@ManyToOne(fetch = FetchType.EAGER, targetEntity=PaymentItemPending.class) @ManyToOne(fetch = FetchType.EAGER, targetEntity=Xmxxb.class)
@JoinColumn(name = "PENDING_ZJ",updatable=false,insertable=true) @JoinColumn(name = "XMXXB_ZJ",updatable=false,insertable=true)
public PaymentItemPending getPaymentItemPending() { public Xmxxb getXmxxb() {
return paymentItemPending; return xmxxb;
} }
public void setPaymentItemPending(PaymentItemPending paymentItemPending) { public void setXmxxb(Xmxxb xmxxb) {
this.paymentItemPending = paymentItemPending; this.xmxxb = xmxxb;
} }
@ManyToOne(fetch = FetchType.EAGER, targetEntity=Kpsjgl.class) @ManyToOne(fetch = FetchType.EAGER, targetEntity=Kpsjgl.class)
...@@ -261,4 +264,11 @@ public class FstzsXm extends BaseModel ...@@ -261,4 +264,11 @@ public class FstzsXm extends BaseModel
this.jkrlx = jkrlx; this.jkrlx = jkrlx;
} }
public Integer getIsJx() {
return isJx;
}
public void setIsJx(Integer isJx) {
this.isJx = isJx;
}
} }
src/com/jshx/fstzs/fsutil/bean/JkztResp.java
View file @ 369bc32d
...@@ -14,11 +14,17 @@ public class JkztResp { ...@@ -14,11 +14,17 @@ public class JkztResp {
public String confirmDate; public String confirmDate;
/** /**
* 缴款渠道(代码) * 缴款渠道
*/ */
@SerializedName("payment_channel") @SerializedName("payment_channel")
public String paymentChannel; public String paymentChannel;
/**
* 缴款渠道(代码)
*/
@SerializedName("payment_channel_code")
public String paymentChannelCode;
/** /**
* 缴款银行 * 缴款银行
*/ */
......
src/com/jshx/fstzs/web/FstzsAction.java
View file @ 369bc32d
This diff is collapsed.
src/com/jshx/paymentItemPending/service/impl/PaymentItemPendingServiceImpl.java
View file @ 369bc32d
...@@ -254,7 +254,7 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa ...@@ -254,7 +254,7 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa
this.save(dj); this.save(dj);
//保存项目到非税通知书表 //保存项目到非税通知书表
FstzsXm xm = new FstzsXm(); FstzsXm xm = new FstzsXm();
xm.setPaymentItemPending(dj); xm.setXmxxb(xmb);
//获取收款人信息保存到项目中 //获取收款人信息保存到项目中
HashMap<String, Object> param = new HashMap<>(); HashMap<String, Object> param = new HashMap<>();
param.put("gllb","001"); param.put("gllb","001");
......
src/com/jshx/paymentItemPending/web/PaymentItemPendingAction.java
View file @ 369bc32d
...@@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
import com.jshx.fstzs.entity.FstzsXm; import com.jshx.fstzs.entity.FstzsXm;
import com.jshx.fstzs.service.FstzsXmService; import com.jshx.fstzs.service.FstzsXmService;
import com.jshx.xmxxb.service.XmxxbService;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.hibernate.LobHelper; import org.hibernate.LobHelper;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
...@@ -54,6 +55,9 @@ public class PaymentItemPendingAction extends BaseAction ...@@ -54,6 +55,9 @@ public class PaymentItemPendingAction extends BaseAction
*/ */
private PaymentItemPending paymentItemPending = new PaymentItemPending(); private PaymentItemPending paymentItemPending = new PaymentItemPending();
@Autowired
private XmxxbService xmxxbService;
/** /**
* 业务类 * 业务类
*/ */
...@@ -190,7 +194,7 @@ public class PaymentItemPendingAction extends BaseAction ...@@ -190,7 +194,7 @@ public class PaymentItemPendingAction extends BaseAction
* 入paymentItemPending表同时，入FstzsXm表 * 入paymentItemPending表同时，入FstzsXm表
*/ */
FstzsXm xm = new FstzsXm(); FstzsXm xm = new FstzsXm();
xm.setPaymentItemPending(paymentItemPending); xm.setXmxxb(xmxxbService.getById(paymentItemPending.getXmbzj()));
xm.setDelFlag(0); xm.setDelFlag(0);
xm.setStatus(0); xm.setStatus(0);
...@@ -208,7 +212,7 @@ public class PaymentItemPendingAction extends BaseAction ...@@ -208,7 +212,7 @@ public class PaymentItemPendingAction extends BaseAction
FstzsXm xm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh()); FstzsXm xm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh());
if(xm == null) { if(xm == null) {
xm = new FstzsXm(); xm = new FstzsXm();
xm.setPaymentItemPending(paymentItemPending); xm.setXmxxb(xmxxbService.getById(paymentItemPending.getXmbzj()));
xm.setDelFlag(0); xm.setDelFlag(0);
xm.setStatus(0); xm.setStatus(0);
xm.setJsdwmc(paymentItemPending.getDwmc()); xm.setJsdwmc(paymentItemPending.getDwmc());
......
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