Skip to content

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

新增人防到账部分判断

parent 27a722f8
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 89 deletions
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ 51277078
...@@ -91,10 +91,16 @@ ...@@ -91,10 +91,16 @@
<%-- 页面筛选查询 --%> <%-- 页面筛选查询 --%>
function search_rfxm(){ function search_rfxm(){
var queryParams = { var queryParams = {
"rfxm.xmdm": $("#xmdm").val(), "rfxm.xkzh": $("#xkzh").val(),
"rfxm.ghxkzbh": $("#ghxkzbh").val(), "rfxm.zslxdbh": $("#zslxdbh").val(),
"rfxm.ghxmbh": $("#ghxmbh").val(), "rfxm.xxylbbh": $("#xxylbbh").val(),
"rfxm.xxylbbh": $("#xxylbbh").val() "rfxm.xmbh": $("#xmbh").val(),
"rfxm.jsdwmc": $("#jsdwmc").val(),
"rfxm.gcxmmc": $("#gcxmmc").val(),
"rfxm.paymentLink": $("#paymentLink").val(),
"rfxm.isRfyz": $("#isRfyz").val(),
"rfxm.mjyj": $("#mjyj").val()
}; };
console.info(queryParams); console.info(queryParams);
$('#pagination').datagrid('options').queryParams = queryParams; $('#pagination').datagrid('options').queryParams = queryParams;
...@@ -169,10 +175,15 @@ ...@@ -169,10 +175,15 @@
title:'项目管理列表', title:'项目管理列表',
url:'rfxmQuery.action', url:'rfxmQuery.action',
queryParams:{ queryParams:{
"rfxm.ghxmbh": $("#ghxmbh").val(), "rfxm.xkzh": $("#xkzh").val(),
"rfxm.zslxdbh": $("#zslxdbh").val(),
"rfxm.xxylbbh": $("#xxylbbh").val(), "rfxm.xxylbbh": $("#xxylbbh").val(),
"rfxm.xmdm": $("#xmdm").val(), "rfxm.xmbh": $("#xmbh").val(),
"rfxm.ghxkzbh": $("#ghxkzbh").val(), "rfxm.jsdwmc": $("#jsdwmc").val(),
"rfxm.gcxmmc": $("#gcxmmc").val(),
"rfxm.paymentLink": $("#paymentLink").val(),
"rfxm.isRfyz": $("#isRfyz").val(),
"rfxm.mjyj": $("#mjyj").val()
}, },
frozenColumns:[[ frozenColumns:[[
// {field:'id',checkbox:true} // {field:'id',checkbox:true}
...@@ -228,21 +239,7 @@ ...@@ -228,21 +239,7 @@
{ field: 'slbh', title: '缴款通知书编号', width: 150, align: 'center' }, { field: 'slbh', title: '缴款通知书编号', width: 150, align: 'center' },
{ field: 'zslxdbh', title: '缴款凭证编号', width: 150, align: 'center' } { field: 'zslxdbh', title: '缴款凭证编号', width: 150, align: 'center' }
]], ]],
toolbar:[{
id:'btnadd',
text:'添加',
iconCls:'icon-add',
handler:function(){
addNew();
}
}/*,{
id:'btnadd',
text:'关联添加',
iconCls:'icon-add',
handler:function(){
addLinkedNew();
}
}*/]
})); }));
}); });
...@@ -257,15 +254,15 @@ ...@@ -257,15 +254,15 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<th width="15%">规划许可证编号</th> <th width="15%">规划许可证编号</th>
<td width="35%"><input name="rfxm.ghxkzbh" id="ghxkzbh" value="" type="text"></td> <td width="35%"><input name="rfxm.xkzh" id="xkzh" value="" type="text"></td>
<th width="15%">缴费凭证编号</th> <th width="15%">缴费凭证编号</th>
<td width="35%"><input name="rfxm.jfpzbh" id="jfpzbh" value="" type="text"></td> <td width="35%"><input name="rfxm.zslxdbh" id="zslxdbh" value="" type="text"></td>
</tr> </tr>
<tr> <tr>
<th width="15%">信息表编号</th> <th width="15%">信息表编号</th>
<td width="35%"><input name="rfxm.xxylbbh" id="xxylbbh" value="" type="text"></td> <td width="35%"><input name="rfxm.xxylbbh" id="xxylbbh" value="" type="text"></td>
<th width="15%">规划项目编号</th> <th width="15%">规划项目编号</th>
<td width="35%"><input name="rfxm.ghxmbh" id="ghxmbh" value="" type="text"></td> <td width="35%"><input name="rfxm.xmbh" id="xmbh" value="" type="text"></td>
</tr> </tr>
<tr> <tr>
<th width="15%">建设单位名称</th> <th width="15%">建设单位名称</th>
...@@ -276,28 +273,26 @@ ...@@ -276,28 +273,26 @@
<tr> <tr>
<th width="15%">缴费环节</th> <th width="15%">缴费环节</th>
<td width="35%"> <td width="35%">
<select name="jfhj" id="jfhj"> <select name="paymentLink" id="paymentLink">
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">无</option>
<option value="1">施工许可前</option> <option value="1">施工许可前</option>
<option value="3">30日</option> <option value="3">30日</option>
</select> </select>
</td> </td>
<th width="15%">人防费是否用章</th> <th width="15%">人防费是否用章</th>
<td width="35%"> <td width="35%">
<select name="hczt" id="hczt"> <select name="isRfyz" id="isRfyz">
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">无</option>
<option value="1">是</option> <option value="1">是</option>
<option value="2">否</option> <option value="0">否</option>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15%">项目来源</th> <th width="15%">项目来源</th>
<td width="35%"> <td width="35%">
<select id="mjyj" name="xmxxb.mjyj" value="${xmxxb.mjyj}" > <select id="mjyj" name="mjyj" >
<option value="000">无</option> <option value="">无</option>
<option value="001">规划(正常)</option> <option value="001">规划(正常)</option>
<option value="002">房产测绘(超建面积)</option> <option value="002">房产测绘(超建面积)</option>
<option value="003">交易登记</option> <option value="003">交易登记</option>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ 51277078
...@@ -203,14 +203,7 @@ ...@@ -203,14 +203,7 @@
handler:function(){ handler:function(){
addNew4Sfxx("${rfxm.id}"); addNew4Sfxx("${rfxm.id}");
} }
}/*,{ }]
id:'btnadd',
text:'关联添加',
iconCls:'icon-add',
handler:function(){
addLinkedNew();
}
}*/]
})); }));
}); });
</script> </script>
...@@ -222,6 +215,7 @@ ...@@ -222,6 +215,7 @@
<div class="inner12px"> <div class="inner12px">
<div class="cell" style="<%--width: ${tableWidth}--%>"> <div class="cell" style="<%--width: ${tableWidth}--%>">
<table> <table>
<input id="ids" type="hidden" value="${rfxm.id}">
<tr> <tr>
<td width="15%">项目信息</td> <td width="15%">项目信息</td>
</tr> </tr>
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ 51277078
...@@ -268,7 +268,12 @@ public class PaymentItemHisAction extends BaseAction ...@@ -268,7 +268,12 @@ public class PaymentItemHisAction extends BaseAction
rfxm.setPaymentLink(model.getXmxxb().getPaymentLink()); rfxm.setPaymentLink(model.getXmxxb().getPaymentLink());
rfxm.setXmdm(model.getXmxxb().getLxpw()); rfxm.setXmdm(model.getXmxxb().getLxpw());
rfxm.setXmbh(model.getXmxxb().getXmbh()); rfxm.setXmbh(model.getXmxxb().getXmbh());
rfxm.setMjyj(model.getXmxxb().getMjyj());
rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
rfxm.setIsRfyz(0);
rfxm.setIsTqdy(0);
rfxm.setIsSl(0);
rfxmService.save(rfxm); rfxmService.save(rfxm);
} }
} }
......
src/com/jshx/rfxm/conf/sql-map-rfxm.xml
View file @ 51277078
...@@ -2,50 +2,38 @@ ...@@ -2,50 +2,38 @@
<!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" <!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-2.dtd"> "http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap> <sqlMap>
<!-- 根据搜索条件查询 -->
<select id="findRfxmByMap"> <select id="findRfxmByMap">
from Rfxm t where t.delFlag = 0 from Rfxm t where t.delFlag = 0
<isNotEmpty property="ids"> <isNotEmpty property="ids">
<![CDATA[and t.id in (:ids)]]> <![CDATA[and t.id in (:ids)]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="accountName"> <isNotEmpty property="xkzh">
<![CDATA[and t.accountName like :accountName]]> <![CDATA[and t.xkzh like :xkzh]]>
</isNotEmpty>
<isNotEmpty property="accountDetail">
<![CDATA[and t.accountDetail like :accountDetail]]>
</isNotEmpty>
<isNotEmpty property="accountStatus">
<![CDATA[and t.accountStatus = :accountStatus]]>
</isNotEmpty>
<isNotEmpty property="jktzsbh">
<![CDATA[and t.jktzsbh like :jktzsbh]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="xmdm"> <isNotEmpty property="zslxdbh">
<![CDATA[and t.xmdm like :xmdm]]> <![CDATA[and t.zslxdbh like :zslxdbh]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="dsdw"> <isNotEmpty property="xxylbbh">
<![CDATA[and t.dsdw = :dsdw]]> <![CDATA[and t.xxylbbh like :xxylbbh]]>
</isNotEmpty>
<isNotEmpty property="dsdwcj">
<![CDATA[and t.dsdwcj = :dsdwcj]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="sfxmmc"> <isNotEmpty property="xmbh">
<![CDATA[and t.sfxmmc = :sfxmmc]]> <![CDATA[and t.xmbh like :xmbh]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="shbm"> <isNotEmpty property="jsdwmc">
<![CDATA[and t.shbm = :shbm]]> <![CDATA[and t.jsdwmc like :jsdwmc]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="ghxkzbh"> <isNotEmpty property="gcxmmc">
<![CDATA[and t.ghxkzbh like :ghxkzbh]]> <![CDATA[and t.gcxmmc like :gcxmmc]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="ghxmbh">
<![CDATA[and t.ghxmbh = :ghxmbh]]> <isNotEmpty property="paymentLink">
<![CDATA[and t.paymentLink = :paymentLink]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="deptId"> <isNotEmpty property="isRfyz">
<![CDATA[and t.deptId = :deptId]]> <![CDATA[and t.isRfyz = :isRfyz]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="abc"> <isNotEmpty property="mjyj">
<![CDATA[and t.starts in ('0','2')]]> <![CDATA[and t.mjyj = :mjyj]]>
</isNotEmpty> </isNotEmpty>
order by t.createTime desc order by t.createTime desc
</select> </select>
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 51277078
...@@ -264,6 +264,19 @@ public class Rfxm extends BaseModel ...@@ -264,6 +264,19 @@ public class Rfxm extends BaseModel
*/ */
private String xmbh; private String xmbh;
/**
* 项目来源
*/
private String mjyj;
public String getMjyj() {
return mjyj;
}
public void setMjyj(String mjyj) {
this.mjyj = mjyj;
}
public String getXmbh() { public String getXmbh() {
return xmbh; return xmbh;
} }
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ 51277078
...@@ -39,6 +39,7 @@ import com.jshx.zzhqfdz.service.ZzhqfdzService; ...@@ -39,6 +39,7 @@ import com.jshx.zzhqfdz.service.ZzhqfdzService;
import com.jshx.rfxm.entity.Rfxm; import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.entity.RfxmSfxx; import com.jshx.rfxm.entity.RfxmSfxx;
import com.jshx.rfxm.service.*; import com.jshx.rfxm.service.*;
import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import net.sf.json.JsonConfig; import net.sf.json.JsonConfig;
...@@ -1280,29 +1281,46 @@ public class RfxmAction extends BaseAction ...@@ -1280,29 +1281,46 @@ public class RfxmAction extends BaseAction
if(null != rfxm){ if(null != rfxm){
//设置查询条件，开发人员可以在此增加过滤条件 //设置查询条件，开发人员可以在此增加过滤条件
/* /**
* 子账号相关已转移到jktzs对应实体类 * "rfxm.xkzh": $("#xkzh").val(),
if ((null != rfxm.getAccountName()) && (0 < rfxm.getAccountName().trim().length())){ * "rfxm.zslxdbh": $("#zslxdbh").val(),
paraMap.put("accountName", "%" + rfxm.getAccountName().trim() + "%"); * "rfxm.xxylbbh": $("#xxylbbh").val(),
* "rfxm.xmbh": $("#xmbh").val(),
* "rfxm.jsdwmc": $("#jsdwmc").val(),
* "rfxm.gcxmmc": $("#gcxmmc").val(),
* "rfxm.paymentLink": $("#paymentLink").val(),
* "rfxm.isRfyz": $("#isRfyz").val(),
* "rfxm.mjyj": $("#mjyj").val()
*/
if (!TextUtils.isEmpty(rfxm.getXkzh())){
paraMap.put("xkzh", "%" + rfxm.getXkzh().trim() + "%");
} }
if ((null != rfxm.getAccountDetail()) && (0 < rfxm.getAccountDetail().trim().length())){ if (!TextUtils.isEmpty(rfxm.getZslxdbh())){
paraMap.put("accountDetail", "%" + rfxm.getAccountDetail().trim() + "%"); paraMap.put("zslxdbh", "%" + rfxm.getZslxdbh().trim() + "%");
} }
if ((null != rfxm.getAccountStatus()) && (0 < rfxm.getAccountStatus().trim().length())){ if (!TextUtils.isEmpty(rfxm.getXxylbbh())){
paraMap.put("accountStatus", "%" + rfxm.getAccountStatus().trim() + "%"); paraMap.put("xxylbbh", "%" + rfxm.getXxylbbh().trim() + "%");
} }
if ((null != rfxm.getJktzsbh()) && (0 < rfxm.getJktzsbh().trim().length())){ if (!TextUtils.isEmpty(rfxm.getXmbh())){
paraMap.put("jktzsbh", "%" + rfxm.getJktzsbh().trim() + "%"); paraMap.put("xmbh", "%" + rfxm.getXmbh().trim() + "%");
}*/
if ((null != rfxm.getXmdm()) && (0 < rfxm.getXmdm().trim().length())){
paraMap.put("xmdm", "%" + rfxm.getXmdm().trim() + "%");
} }
if ((null != rfxm.getGhxmbh()) && (0 < rfxm.getGhxmbh().trim().length())){ if (!TextUtils.isEmpty(rfxm.getJsdwmc())){
paraMap.put("ghxmbh", rfxm.getGhxmbh().trim()); paraMap.put("jsdwmc", "%" + rfxm.getJsdwmc().trim() + "%");
} }
if ((null != rfxm.getGhxkzbh()) && (0 < rfxm.getGhxkzbh().trim().length())){ if (!TextUtils.isEmpty(rfxm.getGcxmmc())){
paraMap.put("ghxkzbh", "%"+ ghxkzbhTranslate(rfxm.getGhxkzbh().trim(), 1) +"%"); paraMap.put("gcxmmc", "%" + rfxm.getGcxmmc().trim() + "%");
} }
if (rfxm.getPaymentLink() != null && rfxm.getPaymentLink() > 0){
paraMap.put("paymentLink", rfxm.getPaymentLink());
}
if (rfxm.getIsRfyz() != null){
paraMap.put("isRfyz", rfxm.getIsRfyz());
}
if (!TextUtils.isEmpty(rfxm.getMjyj())){
paraMap.put("mjyj", rfxm.getMjyj().trim());
}
} }
JsonConfig config = new JsonConfig(); JsonConfig config = new JsonConfig();
config.registerJsonValueProcessor(Date.class,new DateJsonValueProcessor()); config.registerJsonValueProcessor(Date.class,new DateJsonValueProcessor());
......
src/com/neusoft/egov/utils/TextUtils.java
View file @ 51277078
...@@ -3,6 +3,6 @@ package com.neusoft.egov.utils; ...@@ -3,6 +3,6 @@ package com.neusoft.egov.utils;
public class TextUtils { public class TextUtils {
public static boolean isEmpty(String s) { public static boolean isEmpty(String s) {
return s == null || s.length() == 0; return s == null || s.length() == 0 || s.trim().length() == 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