Skip to content

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

修改部分问题

parent 8ec6fc0c
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 412 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ ff86a91e
......@@ -483,17 +483,9 @@
copyrights: "杰创软件拥有版权 www.jatools.com"
}
var jatoolsPrinter = document.getElementById("jatoolsPrinter");
if("pre"==type){
updateZslxdbh();
jatoolsPrinter.printPreview(myDoc);
}else if("print"==type){
updateZslxdbh();
jatoolsPrinter.print(myDoc,true);
}
}
function updateZslxdbh(){
$.ajax({
url : "${ctx}/jsp/paymentVoucher/updateZslxdbh.action",
url : "${ctx}/jsp/jfzm/queryDetail.action",
type: 'post',
dataType: 'json',
data:{
......@@ -502,7 +494,9 @@
},
async : false,
});
jatoolsPrinter.print(myDoc,true);
}
</script>
</head>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp
View file @ ff86a91e
......@@ -18,32 +18,7 @@
console.log($("#id").val());
window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id;
}
//生成缴款通知书;
/*function generateNotice(id){
$.ajax({
url: "/jsp/rfxm/produceNotice.action",
type: 'post',
dataType: 'json',
async: false,
data: {ids : $("#xbxb").val()},
error: function () {
$.messager.alert('错误', '提交出错！');
},
success: function (data) {
if (data.result) {
$("#yzjg").html('验证成功!');
alert("验证成功");
abc="1";
} else {
abc="0";
$("#yzjg").html('信息表编号重复!该项目状态:'+data.message);
}
}
});
console.log(id);
}*/
</script>
</head>
<body>
......@@ -197,68 +172,7 @@
</div>
</s:iterator>
</div>
<%--</c:forEach>--%>
<%--<table>
<tr>
<th width="15%">代收单位经办人</th>
<td width="35%" >${rfxm.dsdwjbr}</td>
</tr>
<tr>
<th width="15%">经办意见</th>
<td width="85%">${rfxm.jbyj}</td>
</tr>
<tr>
<th width="15%">代收单位复核人</th>
<td width="35%" >${rfxm.dsdwjbr}</td>
</tr>
<tr>
<th width="15%">复核意见</th>
<td width="85%">${rfxm.fhyj}</td>
</tr>
</table>--%>
<%--
<s:if test="attach.size()>0">
<table width="100%" id="table">
<tr>
<td width="15%" bgcolor="rgba(244, 244, 244, 1)">流程节点</td>
<td width="15%" bgcolor="rgba(244, 244, 244, 1)">附送材料</td>
<td width="25%" bgcolor="rgba(244, 244, 244, 1)">点击下载</td>
</tr>
<c:forEach var="c" items="${attach}">
<tr>
<td width="15%">${c.xmType}</td>
<td width="15%">${c.attachType}</td>
<td> <a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.attachname}</font></a> </br></td>
</tr>
</c:forEach>
</table>
</s:if>
<tr style="height: 120px">
<th width="15%">备注</th>
<td width="35%" colspan="3"><textarea style="height: 80%" name="sdjd.beizhu" value="${sdjd.beizhu}" type="text" maxlength="500" disabled="disabled">${sdjd.beizhu}</textarea></td>
</tr>
<tr>
<th width="15%">复核意见:</th>
<td width="35%" colspan="3"><textarea style="height: 80%" name="sdjd.beizhu" value="${sdjd.bxzd1}" type="text" maxlength="500" disabled="disabled">${sdjd.bxzd1}</textarea></td>
</tr>
<tr>
<td colspan="4" height="100px" style="text-align:center">
<a href="#" class="btn_01" onclick="parent.close_win('win_sdjd');">关闭<b></b></a>
<c:if test="${sdjd.urldz != '1'}">
&lt;%&ndash; <a href="${ctx}/jsp/sdjd/itPayRollDownloadTemplate.action?excel_Name=${sdjd.xxbbh}&urldz=${sdjd.urldz}"><p style="color:red">下载项目一览表编号</p></a> &ndash;%&gt;
</c:if>
</td>
</tr>
</table>--%>
<table width="100%" border="0">
<tr>
<td colspan="4" height="100px" style="text-align:center">
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ ff86a91e
......@@ -205,9 +205,9 @@
{ field: 'jsdwmc', title: '建设单位名称', width: 150, align: 'center' },
{ field: 'gcxmmc', title: '工程项目名称', width: 150, align: 'center' },
{
field: 'gcxmdd', title: '工程项目地点', width: 150, align: 'center'
field: 'gcxmdd', title: '工程项目地址', width: 150, align: 'center'
},
{ field: 'xxylbbh', title: '信息一览表编号', width: 150, align: 'center' },
// { field: 'xxylbbh', title: '信息一览表编号', width: 150, align: 'center' },
{
field: 'xkzh', title: '规划许可证号', width: 150, align: 'center'
},
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ ff86a91e
......@@ -335,10 +335,8 @@
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%">
<input type="radio" name="zzhxmsfxx.tqjnptf" value="否" />
否
<input type="radio" name="zzhxmsfxx.tqjnptf" value="是" checked="checked" />
是
<input type="radio" name="zzhxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="zzhxmsfxx.tqjn" value="1" />是
</td>
</tr>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ ff86a91e
......@@ -156,7 +156,7 @@
{field:'yjjemx',title:'应缴金额明细',width:160},
{field:'shbm',title:'审核部门',width:160},
{field:'cnjfhj',title:'承诺缴费环节',width:160},
{field:'jfpz',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'zslxdbh',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'sfxxjbr',title:'信息录入人',width:160},
{field:'createTime',title:'录入时间',width:fixWidth(0.16)},
{field:'statusJBFH',title:'是否复核',width:160,formatter:function (value, rec) {
......
src/com/jshx/jfzm/conf/struts-jfzm.xml
View file @ ff86a91e
......@@ -14,5 +14,9 @@
<action name="jflist" class="com.jshx.jfzm.web.JfzmAction" method="list">
</action>
<action name="queryDetail" class="com.jshx.jfzm.web.JfzmAction" method="queryDetail">
</action>
</package>
</struts>
src/com/jshx/jfzm/web/JfzmAction.java
View file @ ff86a91e
......@@ -4,8 +4,12 @@ import com.jshx.core.base.action.BaseAction;
import com.jshx.core.base.vo.Pagination;
import com.jshx.core.json.CodeJsonValueProcessor;
import com.jshx.core.json.DateJsonValueProcessor;
import com.jshx.paymentItemHis.entity.PaymentItemHis;
import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.service.RfxmService;
import com.jshx.xmxxb.entity.Xmxxb;
import com.jshx.xmxxb.service.XmxxbService;
import com.jshx.zsdw.service.ZsdwService;
import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JsonConfig;
......@@ -20,6 +24,10 @@ public class JfzmAction extends BaseAction {
@Autowired
RfxmService rfxmService;
@Autowired
XmxxbService xmxxbService;
@Autowired
PaymentItemHisService paymentItemHisService;
@Autowired
private ZsdwService zsdwService;
......@@ -38,6 +46,10 @@ public class JfzmAction extends BaseAction {
String jfhj;
String hczt;
Rfxm rfxm = new Rfxm();
Xmxxb xmxxb = new Xmxxb();
PaymentItemHis paymentItemHis = new PaymentItemHis();
/**
......@@ -110,6 +122,15 @@ public class JfzmAction extends BaseAction {
}
/**
* 打印缴费证明时，查询所需要的数据
*/
public void queryDetail() {
rfxm = rfxmService.getById(rfxm.getId());
xmxxb = xmxxbService.getById(rfxm.getXmxxbId());
paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
}
public Pagination getPagination() {
return pagination;
}
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ ff86a91e
......@@ -269,11 +269,14 @@ public class PaymentItemHisAction extends BaseAction
rfxm.setXmdm(model.getXmxxb().getLxpw());
rfxm.setXmbh(model.getXmxxb().getXmbh());
rfxm.setMjyj(model.getXmxxb().getMjyj());
rfxm.setIsSl("002".equals(model.getXmxxb().getMjyj()) || "004".equals(model.getXmxxb().getMjyj()) ? 1 : 0);
rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
rfxm.setIsRfyz(0);
rfxm.setIsTqdy(0);
rfxm.setIsSl(0);
rfxm.setXmxxbId(model.getXmxxb().getId());
rfxm.setPaymentHisId(model.getId());
rfxmService.save(rfxm);
}
}
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ ff86a91e
......@@ -269,6 +269,15 @@ public class Rfxm extends BaseModel
*/
private String mjyj;
/**
* 项目信息表id
*/
private String xmxxbId;
/**
* 财务到账id
*/
private String paymentHisId;
public String getMjyj() {
return mjyj;
}
......@@ -680,4 +689,20 @@ public class Rfxm extends BaseModel
public void setSfqy(String sfqy) {
this.sfqy = sfqy;
}
public String getXmxxbId() {
return xmxxbId;
}
public void setXmxxbId(String xmxxbId) {
this.xmxxbId = xmxxbId;
}
public String getPaymentHisId() {
return paymentHisId;
}
public void setPaymentHisId(String paymentHisId) {
this.paymentHisId = paymentHisId;
}
}
src/com/jshx/rfxm/entity/RfxmSfxx.java
View file @ ff86a91e
......@@ -72,7 +72,7 @@ public class RfxmSfxx extends BaseModel {
* 承诺缴费环节
* 1. 施工许可前
* 2. 竣工验收前
* 3. x日内
* 3. 30日内
*/
private String cnjfhj;
......@@ -83,6 +83,10 @@ public class RfxmSfxx extends BaseModel {
* 2 n日内
*/
private Integer typeCnjfhj;
/**
* 提前缴纳配套费
*/
private Integer tqjn;
/**
* 是否已经生成缴款通知书
......@@ -273,6 +277,8 @@ public class RfxmSfxx extends BaseModel {
private String showNameZm;
// 文件上传end
private String zslxdbh;
public RfxmSfxx() {}
// 2019-6-27 v4
......@@ -918,4 +924,20 @@ public class RfxmSfxx extends BaseModel {
public void setShowNameSq(String showNameSq) {
this.showNameSq = showNameSq;
}
public Integer getTqjn() {
return tqjn;
}
public void setTqjn(Integer tqjn) {
this.tqjn = tqjn;
}
public String getZslxdbh() {
return zslxdbh;
}
public void setZslxdbh(String zslxdbh) {
this.zslxdbh = zslxdbh;
}
}
src/com/jshx/rfxm/web/RfxmAction.java
View file @ ff86a91e
......@@ -9,7 +9,6 @@ import com.jshx.common.utils.Constant;
import com.jshx.common.utils.FileUtils;
import com.jshx.core.base.action.BaseAction;
import com.jshx.core.base.vo.Pagination;
import com.jshx.core.exception.BasalException;
import com.jshx.core.json.CodeJsonValueProcessor;
import com.jshx.core.json.DateJsonValueProcessor;
......@@ -545,173 +544,6 @@ public class RfxmAction extends BaseAction
str = "{ \"message\": \"调用成功\",\"code\": \"200\"}";
JsonUtil.printJsonString(getResponse(), str);
Thread.sleep(1000);
//存项目表
/*Rfxm rfxm11 = new Rfxm();
Map<String,Object> paramMap = new HashMap<>();
paramMap.put("ghxkzbh",ghxkzbh);
paramMap.put("ghxmbh",ghxmbh);
paramMap.put("sfqy",sfqy);
Yzsdicgl yzsdicgl = yzsdicglService.getBySflxm(dsdwm);
String dsdw = yzsdicgl.getYzssfmc();
paramMap.put("dsdw",dsdw);
List<RfxmJktzs> rfxmJktzsList111 = rfxmJktzsService.findRfxmJktzs(paramMap);
List<Rfxm> rfxmList1 = rfxmService.findRfxm(paramMap);
if(CollectionUtils.isEmpty(rfxmList1) && rfxmList1.size()==0){
rfxm11.setDelFlag(0);
rfxm11.setGcxmmc(gcxmmc);
rfxm11.setXmdm(xmdm);
rfxm11.setGhxkzbh(ghxkzbh);
rfxm11.setGhxmbh(ghxmbh);
rfxm11.setJsdwmc(jsdwmc);
rfxm11.setInsertType(0);
// rfxmService.save(rfxm11);
}
//如果存在相同缴款通知信息的情况下，如果子账户状态不是已作废状态，如果收费信息出现申请施工许可前，则提示请先作废当前子账户
if(CollectionUtils.isNotEmpty(rfxmJktzsList111) && rfxmJktzsList111.size() > 0) {
for (RfxmJktzs rfxmJktzs : rfxmJktzsList111) {
Map<String,Object> xtxmMap = new HashMap<>();
xtxmMap.put("jfdmwybh",rfxmJktzs.getJfdmwybh());
List<RfxmSfxx> rfxmSfxxListxtxm = rfxmSfxxService.findRfxmSfxx(xtxmMap);
if (!"2".equals(rfxmJktzs.getAccountStatus())) {
for (int i = 0; i < yzssf.size(); i++) {
jsonObject1 = yzssf.getJSONObject(i);
String cnjfsj = jsonObject1.getString("cnjfsj");//承诺缴费时间（申请施工许可前，申请竣工验收前，_日内）
if ("申请施工许可前".equals(cnjfsj)) {
getResponse().setStatus(302);
str = "{ \"message\": \"存在未作废子账户的相同项目，请先作废后再申请新的子账户！\",\"code\": \"1000\"}";
JsonUtil.printJsonString(getResponse(), str);
return;
}
if("申请竣工验收前".equals(rfxmSfxxListxtxm.get(i).getCnjfhj()) && "申请竣工验收前".equals(cnjfsj)){
getResponse().setStatus(303);
str = "{ \"message\": \"存在未作废子账户的相同项目，请先作废后再申请新的子账户！\",\"code\": \"1000\"}";
JsonUtil.printJsonString(getResponse(), str);
return;
}
}
}
}
}
//随机获取状态为未激活状态的子账户账号
String zzhzh = getZzh(dsdw);
if(StringUtil.isEmpty(zzhzh)){
getResponse().setStatus(302);
str = "{ \"message\": \"无符合条件的子账户可用，请联系管理员\",\"code\": \"1000\"}";
JsonUtil.printJsonString(getResponse(), str);
return;
}
//保存项目数据至缴款通知书表
//获取rfxm_id
Map<String,Object> paramMap1 = new HashMap<>();
paramMap1.put("ghxkzbh",ghxkzbh);
paramMap1.put("ghxmbh",ghxmbh);
paramMap1.put("dsdwcj",sfqy);
paramMap1.put("dsdw",dsdw);
String rfxmId = "";
List<Rfxm> rfxmList11 = rfxmService.findRfxm(paramMap1);
if(CollectionUtils.isNotEmpty(rfxmList11)) {
Rfxm rfxmok = rfxmList11.get(0);
rfxmId = rfxmok.getId();
}
RfxmJktzs rfxmJktzs1 = new RfxmJktzs();
zzh = zzhglService.getByAccountDetail(zzhzh);
rfxmJktzs1.setAccountName(zzh.getAccountName());//子账户名称
rfxmJktzs1.setAccountDetail(zzh.getAccountDetail());//子账户账号
// rfxmJktzs1.setAccountStatus(zzh.getAccountStatus());//子账户状态
rfxmJktzs1.setAccountStatus("1");//子账户状态
rfxmJktzs1.setJktzsbh(jktzsbh);//缴款通知书编号
rfxmJktzs1.setJfdmwybh(jfdmwybh);//缴费代码唯一编号
rfxmJktzs1.setDsdw(dsdw);//代收单位
rfxmJktzs1.setXmdm(xmdm);//项目代码
rfxmJktzs1.setSfqy(sfqy);//收费区域
rfxmJktzs1.setGhxkzbh(ghxkzbh);//规划许可证编号
rfxmJktzs1.setGhxmbh(ghxmbh);//规划项目编号
rfxmJktzs1.setGcxmmc(gcxmmc);//工程项目名称
rfxmJktzs1.setGcxmmc(jsdwmc);//建设单位名称
rfxmJktzs1.setJftzyje(jftzyje);//缴款通知应缴金额合计
rfxmJktzs1.setDelFlag(0);//
rfxmJktzs1.setNfkp("0");//能否开票
rfxmJktzs1.setKpzt("0");//开票状态
rfxmJktzs1.setNfqf("0");//能否清分
rfxmJktzs1.setQfzt("0");//清分状态zz
rfxmJktzs1.setInsertType(0);
rfxmJktzs1.setInvalidStatus(0);
rfxmJktzs1.setRfxmid(rfxmId);
// rfxmJktzsService.save(rfxmJktzs1);
//保存收费项目信息至收费项目信息表
RfxmSfxx rfxmSfxx1 = new RfxmSfxx();
for(int i=0;i<yzssf.size();i++){
jsonObject = yzssf.getJSONObject(i);
String sfxmmcm = jsonObject.getString("sfxmmc");//收费项目名称
String shbmm = jsonObject.getString("shbm");//审核部门
String yjje = jsonObject.getString("yjje");//（收费项目）应缴金额（元）
String cnjfsj = jsonObject.getString("cnjfsj");//承诺缴费时间（申请施工许可前，申请竣工验收前，_日内）
String sfxmlxdbh = jsonObject.getString("sfxmlxdbh");//收费项目联系单编号
Yzsdicgl yzsdicgl1 = yzsdicglService.getBySflxm(sfxmmcm);
String sfxmmc = yzsdicgl1.getYzssfmc();
Yzsdicgl yzsdicgl2 = yzsdicglService.getBySflxm(shbmm);
String shbm = yzsdicgl2.getYzssfmc();
System.out.println("sfxmmc:"+sfxmmcm+"shbm:"+shbmm+"yjje:"+yjje+"cnjfsj:"+cnjfsj+"sfxmlxdbh:"+sfxmlxdbh);
Map<String, Object> paraMap = new HashMap<>();
List<Yzssfgl> yzssfglList1 = new ArrayList<>();
paraMap.put("dsdw",dsdw);
paraMap.put("sfxmmc",sfxmmc);
paraMap.put("shbm",shbm);
yzssfglList1 = yzssfglService.findYzssfgl(paraMap);
if(CollectionUtils.isEmpty(yzssfglList1)){
getResponse().setStatus(303);
str = "{ \"message\": \"调用失败，根据代收单位、收费项目名称、审核部门无法获取非税信息，请检查参数\",\"code\": \"1000\"}";
JsonUtil.printJsonString(getResponse(), str);
return;
}else{
String yzsqy = yzssfglList1.get(0).getYzsqy();//一站式区域
String ssdwmc = yzssfglList1.get(0).getSsdwmc();//实收单位名称
String qhm = yzssfglList1.get(0).getQhm();//区划码
String fsxmbm = yzssfglList1.get(0).getFsxmbm();//非税项目编码
String zsdwbm = yzssfglList1.get(0).getZsdwbm();//执收单位编码
String khyh = yzssfglList1.get(0).getKhyh();//收款人全称
String skrzh = yzssfglList1.get(0).getSkrzh();//收款人账号
rfxmSfxx1.setYzsqy(yzsqy);//一站式区域
rfxmSfxx1.setSsdwmc(ssdwmc);//实收单位名称
rfxmSfxx1.setQhm(qhm);//区划码
rfxmSfxx1.setFsxmbm(fsxmbm);//非税项目编码
rfxmSfxx1.setZsdwbm(zsdwbm);//执收单位编码
rfxmSfxx1.setKhyh(khyh);//收款人全称
rfxmSfxx1.setSkrzh(skrzh);//收款人账号
}
rfxmSfxx1.setJfdmwybh(getJfdmwybh(xmdm,dsdw,jktzsbh));//缴费代码唯一编号
rfxmSfxx1.setSfxmmc(sfxmmc);//收费项目名称
rfxmSfxx1.setYjjemx(yjje);//应缴金额明细
rfxmSfxx1.setShbm(shbm);//审核部门
rfxmSfxx1.setCnjfhj(cnjfsj);//承诺缴费时间（申请施工许可前，申请竣工验收前，_日内）
rfxmSfxx1.setSfxmlxdbh(sfxmlxdbh);//
rfxmSfxx1.setDelFlag(0);//
// rfxmSfxxService.save(rfxmSfxx1);
}
//保存作废信息至历史记录表
RfxmHistory rfxmHistory = new RfxmHistory();
zzh = zzhglService.getByAccountDetail(accountDetail);
rfxmHistory.setAccountName(zzh.getAccountName());//子账户名称
rfxmHistory.setAccountDetail(zzh.getAccountDetail());//子账户账号
rfxmHistory.setAccountStatus(zzh.getAccountStatus());//子账户状态
rfxmHistory.setJktzsbh(jktzsbh);//缴款通知书编号
rfxmHistory.setJfdmwybh(jfdmwybh);//缴费代码唯一编号
rfxmHistory.setDsdw(dsdw);//代收单位
rfxmHistory.setXmdm(xmdm);//项目代码
rfxmHistory.setGhxkzbh(ghxkzbh);//规划许可证编号
rfxmHistory.setGhxmbh(ghxmbh);//规划项目编号
rfxmHistory.setGcxmmc(gcxmmc);//工程项目名称
rfxmHistory.setGcxmmc(jsdwmc);//建设单位名称
rfxmHistory.setJktzyjjehj(jftzyje);//缴款通知应缴金额合计
// rfxmHistoryService.save(rfxmHistory);*/
}catch (Exception e){
e.printStackTrace();
......@@ -1592,7 +1424,7 @@ public class RfxmAction extends BaseAction
if (StringUtils.isNotBlank(flag) && null != rfxm) {
Rfxm rfxmById = rfxmService.getById(rfxm.getId());
if ("2".equalsIgnoreCase(flag)) {
//通过
rfxmById.setStatusJBFH(2);
rfxmById.setFhTime(new Date());
rfxmById.setDsdwfhr(this.getLoginUser().getDisplayName());
......@@ -1641,14 +1473,19 @@ public class RfxmAction extends BaseAction
*/
if ("2".equalsIgnoreCase(flag)) {
//通过
sfxx.setStatusJBFH(2);
sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj());
if(sfxx.getSfxxjbr().equals(this.getLoginUser().getDisplayName())) {
message = "不允许复核自己添加的费用";
reviewFlag = false;
} else {
sfxx.setStatusJBFH(2);
sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj());
}
message = "复核通过";
reviewFlag = true;
}
message = "复核通过";
reviewFlag = true;
}else if ("1".equalsIgnoreCase(flag)){
//退回
sfxx.setStatusJBFH(1);
......@@ -1750,14 +1587,19 @@ public class RfxmAction extends BaseAction
*/
public void getSfxmmcYzssfgl(){
Map<String,Object> paramMap = new HashMap<>();
yzssxsfxmmcList =yzssfglService.getYzssfxmmc(paramMap);
// yzssxsfxmmcList =yzssfglService.getYzssfxmmc(paramMap);
yzssxsfxmmcList = new ArrayList<>();
yzssxsfxmmcList.add("防空地下室易地建设费");
}
/**
* 获取一站式审核部门
*/
public void getShbmYzssfgl(){
Map<String,Object> paramMap = new HashMap<>();
yzssxshbmList =yzssfglService.getYzsshbm(paramMap);
// yzssxshbmList =yzssfglService.getYzsshbm(paramMap);
yzssxshbmList = new ArrayList<>();
yzssxshbmList.add("南京市人民防空办公室");
yzssxshbmList.add("南京市建邺区人防办");
}
// end 2019-6-5 ---------------------------------------------
......@@ -1913,56 +1755,7 @@ public class RfxmAction extends BaseAction
rfxm.setStatusComplete(0);
rfxm.setStatusWithinTheDay(0);
//缴费代码唯一编号
// 缴费代码唯一编号与缴款通知书再生成缴款通知书再生成;
/*String jfdmwybh = getJfdmwybh(this.rfxm.getXmdm(), this.rfxm.getDsdw());
this.rfxm.setJfdmwybh(jfdmwybh);*/
//循环保存缴费信息的内容
/*for (int i = 0; i < rfxmSfxx.size(); i++) {
*//*}*//*
*//*for (RfxmSfxx sfxx : rfxmSfxx) {*//*
RfxmSfxx sfxx = rfxmSfxx.get(i);
//设置部门id
sfxx.setDeptId(this.getLoginUserDepartmentId());
//逻辑删除标记符
sfxx.setDelFlag(0);
//缴费代码唯一编号
sfxx.setJfdmwybh(jfdmwybh);
//承诺缴费环节
String cnjfhj = sfxx.getCnjfhj();
if (sfxx.getCnjfhj().contains("施工")){
//施工许可前
*//* String cnjfhj = this.rfxm.getCnjfhj();
cnjfhj = cnjfhj.substring(1);
cnjfhj+="日内";*//*
sfxx.setCnjfhj(cnjfhj.split(",")[0]);
// rfxmSfxxService.save(sfxx);
}else if(sfxx.getCnjfhj().contains("竣工")) {
// 竣工验收前
// String cnjfhj = sfxx.getCnjfhj();
sfxx.setCnjfhj(cnjfhj.split(",")[0]);
// rfxmSfxxService.save(sfxx);
}else {
// x日内
sfxx.setCnjfhj(cnjfhj.replaceAll(",", ""));
}
// sfxx.setUrldz(fileNames.size()<= i ? "" : fileNames.get(i));
rfxmSfxxService.save(sfxx);
}*/
/**
*
* 子账户相关数据插入
*/
/* String accountDetail = getZzh("城市基础设施配套费");
rfxm.setAccountDetail(accountDetail);
Zzh zzh = zzhglService.getByAccountDetail(accountDetail);
rfxm.setAccountName(zzh.getAccountName());
rfxm.setAccountStatus(zzh.getAccountStatus());*/
/**
* TODO
* 代收单位及代收单位层级
......@@ -2103,12 +1896,6 @@ public class RfxmAction extends BaseAction
rfxmsfxx.setTypeCnjfhj(1);
}else {
// x日内
rfxmsfxx.setCnjfhj(cnjfhj.replaceAll(",", ""));
rfxmsfxx.setCnjfhj(cnjfhj.substring(1));
cnjfhj = cnjfhj.substring(1).trim();
cnjfhj+="日内";
rfxmsfxx.setCnjfhj(cnjfhj);
rfxmsfxx.setTypeCnjfhj(2);
}
......@@ -2126,30 +1913,6 @@ public class RfxmAction extends BaseAction
paraMap.put("sfxmmc", rfxmsfxx.getSfxmmc());
paraMap.put("shbm", rfxmsfxx.getShbm());
List<Yzssfgl> list = yzssfglService.findYzssfgl(paraMap);
// yzssfgl = list.get(0);
// //非税项目编码
// rfxmsfxx.setFsxmbm(yzssfgl.getFsxmbm());
// //实收单位名称
// rfxmsfxx.setSsdwmc(yzssfgl.getSsdwmc());
// //区域码
// rfxmsfxx.setQhm(yzssfgl.getQhm());
// //执收单位编码
// rfxmsfxx.setZsdwbm(yzssfgl.getZsdwbm());
// //收款人全称
// rfxmsfxx.setSkrqc(yzssfgl.getSkrqc());
// //收款人账号
// rfxmsfxx.setSkrzh(yzssfgl.getSkrzh());
// //开户行
// rfxmsfxx.setKhyh(yzssfgl.getKhyh());
//审核部门别名 todo
// rfxmsfxx.setShbmbm(yzssfgl.getShbmbm());
//
/*//一站式区域
rfxmsfxx.setYzsqy(yzssfgl.getYzsqy());
//代收单位
rfxmsfxx.setDsdw(yzssfgl.getDsdw());*/
if (rfxmsfxx.getYjjemx().contains(",")/* || rfxmsfxx.getYjjemx().contains("，")*/) {
String replaceAll = rfxmsfxx.getYjjemx().replaceAll(",", "");
rfxmsfxx.setYjjemx(replaceAll);
......@@ -2158,6 +1921,8 @@ public class RfxmAction extends BaseAction
rfxmsfxx.setSfxxjbr(this.getLoginUser().getDisplayName());
rfxmsfxx.setJbTime(new Date());
rfxmsfxx.setStatusJBFH(0);
rfxm = rfxmService.getById(rfxm.getId());
rfxmsfxx.setZslxdbh(rfxm.getZslxdbh());
rfxmSfxxService.save(rfxmsfxx);
// }
return RELOAD;
......@@ -2474,60 +2239,21 @@ public class RfxmAction extends BaseAction
public void chargeVerification() throws IOException {
boolean status = true;
//TODO 这里可以校验选择的对不对
// boolean status = false;
String message = "OK";
// //验证收费信息中非税信息,如若没有,则提示用户重新选择
// int i = checkNonTaxInformation(rfxmsfxx.getYzsqy(),rfxmsfxx.getDsdw(),rfxmsfxx.getSfxmmc(),rfxmsfxx.getShbm());
// if (i==0) {
// //表示未查到
// message = "当前选择的收费名称与审核部门未匹配,请重新选择或录入字典";
//TODO 先注释起来，不然不方便测试
// Map<String, Object> query = new HashMap<>();
// query.put("rfxmid",rfxmid);
// if(pagination==null) {
// pagination = new Pagination(this.getRequest());
// }
// Pagination byPage = rfxmSfxxService.findByPage(pagination, query);
// if(byPage.totalCount > 0) {
// status = false;
// message = "只允许添加一条记录";
// this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
//// return;
// }else {
// Map<String, Object> paraMap = new HashMap<>();
// paraMap.put("rfxmid", rfxmid);
// // 1.查询rfxm表对应字段
// Rfxm byId = rfxmService.getById(rfxmid);
// //验证是否生成缴费通知书
// String cnjfhj = rfxmsfxx.getCnjfhj();
// if ("施工许可前".equals(cnjfhj)) {
// if (null != byId.getStatusConstract() && 1 == byId.getStatusConstract()){
// status = false;
// message = "选中的缴费环节已生成缴款通知书,不能再添加或者修改!";
// }else {
// status = true;
// }
// }else if ("竣工验收前".equals(cnjfhj)) {
// if (null != byId.getStatusComplete() && 1 == byId.getStatusComplete()){
// status = false;
// message = "选中的缴费环节已生成缴款通知书,不能再添加或者修改!";
// } else {
// status = true;
// }
// }else {
// if (null != byId.getStatusWithinTheDay() && 1 == byId.getStatusWithinTheDay()){
// status = false;
// message = "选中的缴费环节已生成缴款通知书,不能再添加或者修改!";
// } else {
// status = true;
// }
// }
// // 此处操作是限制添加条数,暂时先不用,等客户提出需求再放开.
// /*if (status) {
// //验证是否已经至多有8条收费信息
// List<RfxmSfxx> lists = rfxmSfxxService.findRfxmSfxx(paraMap);
// if (null!=lists && lists.size()>8) {
// status = false;
// message = "最多只可有7条收费信息";
// }else {
// status = true;
// message = "可以创建新的收费信息";
// }
// } else {
// message = "已生成缴款通知书,不能再添加!";
// }*/
this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
// return;
// }
this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
}
......
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