Skip to content

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

修改部分问题

parent 22324f6c
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 80 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 0eb26b5d
......@@ -572,44 +572,23 @@
{
field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) {
var result = "";
console.info(rec.showTb)
if(rec.showTb == true && rec.showYb==true) {
if(rec.enableTb == true && rec.enableDy == true) {
return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" +
"<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
"<a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
} else if(rec.enableTb == false && rec.enableDy == true) {
return "<a class='btn_01_mini' style='opacity: 0.5'>同步施工许可<b></b></a>\n" +
"<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
"<a class='btn_01_mini edit' onclick=one_book()>一般缴款书<b></b></a>";
} else if(rec.enableTb == true && rec.enableDy == false){
return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" +
"<a class='btn_01_mini' style='opacity: 0.5'>打印缴费凭证<b></b></a>\n" +
"<a class='btn_01_mini edit' onclick=one_book()>一般缴款书<b></b></a>";
}
} else if(rec.showTb == true && rec.showYb==false){
if(rec.enableTb == true && rec.enableDy == true) {
return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" +
"<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n"
} else if(rec.enableTb == false && rec.enableDy == true) {
return "<a class='btn_01_mini' style='opacity: 0.5'>同步施工许可<b></b></a>\n" +
"<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n"
} else if(rec.enableTb == true && rec.enableDy == false){
return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" +
"<a class='btn_01_mini' style='opacity: 0.5'>打印缴费凭证<b></b></a>\n"
}
}else if(rec.showTb == false && rec.showYb==true){
if(rec.enableTb == true && rec.enableDy == true) {
return "<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
"<a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
} else if(rec.enableTb == false && rec.enableDy == true) {
return "<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
"<a class='btn_01_mini edit' onclick=one_book()>一般缴款书<b></b></a>";
} else if(rec.enableTb == true && rec.enableDy == false){
return "<a class='btn_01_mini' style='opacity: 0.5'>打印缴费凭证<b></b></a>\n" +
"<a class='btn_01_mini edit' onclick=one_book()>一般缴款书<b></b></a>";
if(rec.showTb == 1) {
if(rec.enableTb == 1) {
result += "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n";
} else {
result += "<a class='btn_01_mini' style='opacity: 0.5'>同步施工许可<b></b></a>\n";
}
}
if(rec.enableDy == 1) {
result += "<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n";
} else {
result += "<a class='btn_01_mini' style='opacity: 0.5'>打印缴费凭证<b></b></a>\n";
}
if(rec.showYb == 1) {
result += "<a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
}
return result;
}
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ 0eb26b5d
......@@ -23,9 +23,9 @@
/* $(document).ready(function () {
$("#showTitle").title($("#sfxmmcselect option:selected").val().text());
});*/
$(function () {
getShbmBySfxmmc();
})
// $(function () {
// getShbmBySfxmmc();
// })
function onSelected() {
var option = $("#sfxmmcselect option:selected").val();
......@@ -309,7 +309,7 @@
</tr>
<tr>
<th width="15">缴费承诺环节</th>
<c:if test="${ rxfm.paymentLink == 'null'}">
<c:if test="${ rxfm.paymentLink == null}">
<td width="35%">
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
施工许可前
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ 0eb26b5d
......@@ -181,7 +181,7 @@
var btnTag = "";
if(rec.id.length > 0) {
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
if (rec.tqjn == 1 && rec.statusJBFH == 2) {//延后缴纳并且已通过核验，显示补录
if (rec.tqjn == 1) {//延后缴纳并且已通过核验，显示补录
btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>"
}
} else {
......@@ -292,10 +292,10 @@
<td colspan="4" height="100px" style="text-align:center">
<c:if test="${rfxm.isRfyz == 1}">
<c:if test="${rfxm.isSbj==1}">
<a id="noticeBtn0" href="#" class="btn_01 nohover">人防费已用章（市本级）<b></b></a>
<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费已用章（市本级）<b></b></a>
</c:if>
<c:if test="${rfxm.isSbj!=1}">
<a id="noticeBtn0" href="#" class="btn_01 nohover">人防费已用章（非市本级）<b></b></a>
<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费已用章（非市本级）<b></b></a>
</c:if>
</c:if>
......
WebRoot/WEB-INF/resources/datasource.xml
View file @ 0eb26b5d
......@@ -29,7 +29,8 @@
<Connection name="zsb" class="com.fr.data.impl.JDBCDatabaseConnection">
<DatabaseAttr originalCharsetName="UTF-8" newCharsetName="UTF-8"/>
<!-- <JDBCDatabaseAttr url="jdbc:oracle:thin:@101.132.99.10:1521:orcl" driver="oracle.jdbc.driver.OracleDriver" user="zsb0727" password="___0022007c0039003b005100e3" encryptPassword="true">-->
<JDBCDatabaseAttr url="jdbc:oracle:thin:@192.168.1.244:1521:orcl" driver="oracle.jdbc.driver.OracleDriver" user="zsb1016" password="___0022007c0039003b005100e3" encryptPassword="true">
<!-- <JDBCDatabaseAttr url="jdbc:oracle:thin:@192.168.1.244:1521:orcl" driver="oracle.jdbc.driver.OracleDriver" user="zsb1016" password="___0022007c0039003b005100e3" encryptPassword="true">-->
<JDBCDatabaseAttr url="jdbc:oracle:thin:@192.168.30.140:1521:orcl" driver="oracle.jdbc.driver.OracleDriver" user="zsb1" password="123456" encryptPassword="true">
<DBCPAttr/>
</JDBCDatabaseAttr>
</Connection>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 0eb26b5d
......@@ -129,6 +129,7 @@ public class JfzmAction extends BaseAction {
pagination = rfxmService.findByPage(pagination, paraMap);
for (int i = 0; i < pagination.list.size(); i++) {
Rfxm r = (Rfxm) pagination.list.get(i);
if(r.getPaymentHisId() != null) {
PaymentItemHis pih = paymentItemHisService.getById(r.getPaymentHisId());
Map<String, Object> pm = new HashMap<>();
pm.put("rfxmid", id);
......@@ -136,23 +137,23 @@ public class JfzmAction extends BaseAction {
RfxmSfxx sfxx = rfxmSfxxList == null || rfxmSfxxList.size() == 0 ? null : rfxmSfxxList.get(0);
//TODO 1,判断是否显示同步按钮 2，判断是否置灰
r.setShowTb(r.getIsSl() != 1);//房改办,竖联,不显示施工许可
r.setShowTb(r.getIsSl() != 1 ? 1 : 0);//房改办,竖联,不显示施工许可
try {
r.setShowTb(Double.parseDouble(pih.getPtyjje()) != 0);//配套费=0,不显示一般缴费证明
r.setShowYb(Double.parseDouble(pih.getPtyjje()) != 0 ? 1 : 0);//配套费=0,不显示一般缴费证明
} catch (Exception e) {
}
r.setEnableDy(r.getIsRfyz() == 1 || r.getIsSl() == 1);//人防用章后，才可以打印
r.setEnableDy(r.getIsRfyz() == 1 || r.getIsSl() == 1 ? 1 : 0);//人防用章后，才可以打印
if(r.getIsRfyz() == 1) {//人防用章后可以同步
r.setEnableTb(true);
} else if(sfxx != null && sfxx.getTqjn() == 1 && sfxx.getStatusJBFH() == 2) {//显示补录时可以同步
r.setEnableTb(true);
if(r.getIsRfyz() != null && r.getIsRfyz() == 1) {//人防用章后可以同步
r.setEnableTb(1);
} else if(sfxx != null && sfxx.getTqjn() != null && sfxx.getTqjn() == 1 && sfxx.getStatusJBFH() != null && sfxx.getStatusJBFH() == 2) {//显示补录时可以同步
r.setEnableTb(1);
} else {
r.setEnableTb(false);
r.setEnableTb(0);
}
}
}
convObjectToJson(pagination, config);
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ 0eb26b5d
......@@ -189,7 +189,7 @@ public class PaymentItemHisAction extends BaseAction
paraMap.put("nonTaxStatus", paymentItemHis.getNonTaxStatus().trim());
}
if ((null != paymentItemHis.getIsCreateJfpz()) && (0 < paymentItemHis.getIsCreateJfpz().trim().length()) && "1".equals(paymentItemHis.getIsCreateJfpz())){
if ((null != paymentItemHis.getIsCreateJfpz()) && (0 < paymentItemHis.getIsCreateJfpz().trim().length())){
paraMap.put("isCreateJfpz", paymentItemHis.getIsCreateJfpz().trim());
}
if ((null != paymentItemHis.getZslxdbh()) && (0 < paymentItemHis.getZslxdbh().trim().length())){
......@@ -245,6 +245,7 @@ public class PaymentItemHisAction extends BaseAction
public void cwyz() throws Exception {
PaymentItemHis model = paymentItemHisService.getById(id);
model.setIsCwyz("1");
model.setJbr(this.getLoginUser().getDisplayName());
paymentItemHisService.update(model);
//TODO 新增表人防费，把他加入人防费表内
if(model.getXmxxb() != null) {
......@@ -270,7 +271,6 @@ public class PaymentItemHisAction extends BaseAction
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.setJbr(this.getLoginUser().getDisplayName());//经办人
rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
rfxm.setIsRfyz(0);
rfxm.setIsTqdy(0);
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 0eb26b5d
......@@ -285,15 +285,11 @@ public class Rfxm extends BaseModel
public String jbr;
@Transient
boolean showTb;//是否显示同步按钮
@Transient
boolean showYb;//是否显示一般缴费按钮
Integer showTb;//是否显示同步按钮
Integer showYb;//是否显示一般缴费按钮
@Transient
boolean enableTb;//同步按钮是否可以点击（false置灰）
@Transient
boolean enableDy;//打印按钮是否可以点击(false置灰)
Integer enableTb;//同步按钮是否可以点击（false置灰）
Integer enableDy;//打印按钮是否可以点击(false置灰)
/**
* 收费项目联系单编号
......@@ -744,35 +740,35 @@ public class Rfxm extends BaseModel
this.paymentHisId = paymentHisId;
}
public boolean isShowTb() {
public Integer getShowTb() {
return showTb;
}
public void setShowTb(boolean showTb) {
public void setShowTb(Integer showTb) {
this.showTb = showTb;
}
public boolean isShowYb() {
public Integer getShowYb() {
return showYb;
}
public void setShowYb(boolean showYb) {
public void setShowYb(Integer showYb) {
this.showYb = showYb;
}
public boolean isEnableTb() {
public Integer getEnableTb() {
return enableTb;
}
public void setEnableTb(boolean enableTb) {
public void setEnableTb(Integer enableTb) {
this.enableTb = enableTb;
}
public boolean isEnableDy() {
public Integer getEnableDy() {
return enableDy;
}
public void setEnableDy(boolean enableDy) {
public void setEnableDy(Integer enableDy) {
this.enableDy = enableDy;
}
}
src/com/jshx/rfxm/web/RfxmAction.java
View file @ 0eb26b5d
......@@ -39,6 +39,10 @@ import com.jshx.zzhqfdz.service.ZzhqfdzService;
import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.entity.RfxmSfxx;
import com.jshx.rfxm.service.*;
import com.jshx.zzhxm.entity.Zzhxm;
import com.jshx.zzhxm.entity.ZzhxmJktzs;
import com.jshx.zzhxm.service.ZzhxmJktzsService;
import com.jshx.zzhxm.service.ZzhxmService;
import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
......@@ -201,16 +205,13 @@ public class RfxmAction extends BaseAction
@Autowired
private YzssfglService yzssfglService;
@Autowired
private YzsdicglService yzsdicglService;
@Autowired
private PaymentVoucherHisService paymentVoucherHisService;
@Autowired
private PaymentItemHisService paymentItemHisService;
@Autowired
private PaymentVoucherService paymentVoucherService;
ZzhxmService zzhxmService;
@Autowired
private BillManagerService billManagerService;
ZzhxmJktzsService zzhxmJktzsService;
/**
* 修改新增标记，add为新增、mod为修改
......@@ -537,10 +538,21 @@ public class RfxmAction extends BaseAction
}
rfxmsfxx = new RfxmSfxx();
rfxmsfxx.setSfxmmc("城市基础设施配套费");
rfxmsfxx.setSfxmlxdbh(paymentItemHis.getSlbh());
rfxmsfxx.setYjjemx(paymentItemHis.getZyjje());
rfxmsfxx.setShbm(paymentItemHis.getZsdw());
rfxmsfxx.setShbm("南京市城市建设费用征收服务中心");
rfxmsfxx.setZslxdbh(paymentItemHis.getZslxdbh());
Map<String, Object> par2 = new HashMap<>();
par2.put("xxylbbh",paymentItemHis.getXmxxb().getXxylb());
List<Zzhxm> zzhxm = zzhxmService.findZzhxm(par2);
if(zzhxm != null && zzhxm.size() > 0) {
Map<String, Object> par3 = new HashMap<>();
par3.put("zzhxmid",zzhxm.get(0).getId());
List<ZzhxmJktzs> zzhxmJktzs = zzhxmJktzsService.findZzhxmJktzs(par3);
if (zzhxmJktzs != null && zzhxmJktzs.size()> 0) {
rfxmsfxx.setSfxmlxdbh(zzhxmJktzs.get(0).getJktzsbh());
}
}
return VIEW;
}else {
this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"获取当前收费信息失败,请稍后再试."+"\"}");
......
src/com/jshx/zzhxm/conf/sql-map-zzhxm.xml
View file @ 0eb26b5d
......@@ -11,6 +11,9 @@
<isNotEmpty property="accountName">
<![CDATA[and t.accountName like :accountName]]>
</isNotEmpty>
<isNotEmpty property="xxylbbh">
<![CDATA[and t.xxylbbh like :xxylbbh]]>
</isNotEmpty>
<isNotEmpty property="accountDetail">
<![CDATA[and t.accountDetail like :accountDetail]]>
</isNotEmpty>
......
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