Skip to content

N
njzsb
Commit 87a5c7ff authored by houyu's avatar houyu
Browse files
Options

Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

parents 4e308bf4 b3a07f50
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 166 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 87a5c7ff
...@@ -435,34 +435,34 @@ ...@@ -435,34 +435,34 @@
} }
}, },
/*
{field:'accountStatus',title:'子账户状态',width:180,formatter:function(value,rec){ { field: 'jsdwmc', title: '建设单位名称', width: 186, align: 'center' },
if(rec.accountStatus == '0'){ { field: 'gcxmmc', title: '工程项目名称', width: 186, align: 'center' },
return "未激活"; { field: 'gcxmdd', title: '工程项目地址', width: 186, align: 'center' },
} { field: 'xkzh', title: '规划许可证号', width: 186, align: 'center' },
if(rec.accountStatus == '1'){
return "已激活"; { field: 'xmdm', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) {
} if(rec.payment_link == 1) {
if(rec.accountStatus == '2'){ return "施工许可前";
return "已作废"; } else if(rec.payment_link == 3) {
return "30日内";
} else {
return "";
} }
if(rec.accountStatus == '3'){
return "已到账";
} }
if(rec.accountStatus == '4'){ },
return "已缴销"; { field: 'zsfw', title: '二级统计单位', width: 186, align: 'center' },
{ field: 'is_rfyz', title: '人防是否用章', width: 150, align: 'center', formatter: function (value, rec) {
if(rec.is_rfyz == 1) {
return "是";
} else {
return "否";
} }
}},*/
/*{field:'createTime',title:'创建时间',width:fixWidth(0.16)},*/
{ field: 'dwmc', title: '建设单位名称', width: 186, align: 'center' },
{ field: 'xmmc', title: '工程项目名称', width: 186, align: 'center' },
{ field: 'jsdd', title: '工程项目地址', width: 186, align: 'center' },
{ field: 'xkzh', title: '规划许可证号', width: 186, align: 'center' },
{ field: 'xmdm', title: '缴费环节', width: 150, align: 'center' }, }
{ field: 'zsfw', title: '二级统计单位', width: 186, align: 'center' }, },
{ field: 'xmdm', title: '核查状态', width: 150, align: 'center' }, { field: 'slbh', title: '缴款通知书编号', width: 186, align: 'center' },
{ field: 'xmdm', title: '缴款通知书编号', width: 186, align: 'center' },
{ field: 'zslxdbh', title: '缴款凭证编号', width: 186, align: 'center' }, { field: 'zslxdbh', title: '缴款凭证编号', width: 186, align: 'center' },
]] ]]
...@@ -543,13 +543,12 @@ ...@@ -543,13 +543,12 @@
<option value="2">30日</option> <option value="2">30日</option>
</select> </select>
</td> </td>
<th width="15%">核查状态</th> <th width="15%">人防是否用章</th>
<td width="35%"> <td width="35%">
<select name="jfzm.accountStatus" id="accountStatus"> <select name="jfzm.is_rfyz" id="accountStatus">
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">无</option> <option value="0">否</option>
<option value="1">已同步</option> <option value="1">是</option>
<option value="2">未同步</option>
</select> </select>
</td> </td>
</tr> </tr>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 87a5c7ff
...@@ -5,6 +5,7 @@ import com.jshx.core.base.vo.Pagination; ...@@ -5,6 +5,7 @@ import com.jshx.core.base.vo.Pagination;
import com.jshx.core.json.CodeJsonValueProcessor; import com.jshx.core.json.CodeJsonValueProcessor;
import com.jshx.core.json.DateJsonValueProcessor; import com.jshx.core.json.DateJsonValueProcessor;
import com.jshx.paymentItemHis.service.PaymentItemHisService; import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.rfxm.service.RfxmService;
import com.jshx.zsdw.service.ZsdwService; import com.jshx.zsdw.service.ZsdwService;
import com.neusoft.egov.utils.TextUtils; import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JsonConfig; import net.sf.json.JsonConfig;
...@@ -16,11 +17,9 @@ import java.util.Map; ...@@ -16,11 +17,9 @@ import java.util.Map;
public class JfzmAction extends BaseAction { public class JfzmAction extends BaseAction {
/**
* 业务类
*/
@Autowired @Autowired
private PaymentItemHisService paymentItemHisService; RfxmService rfxmService;
@Autowired @Autowired
private ZsdwService zsdwService; private ZsdwService zsdwService;
...@@ -51,8 +50,6 @@ public class JfzmAction extends BaseAction { ...@@ -51,8 +50,6 @@ public class JfzmAction extends BaseAction {
if(pagination==null) if(pagination==null)
pagination = new Pagination(this.getRequest()); pagination = new Pagination(this.getRequest());
paraMap.put("isCwyz", "1");// 财务用章
if (!TextUtils.isEmpty(ghxkzbh)){ if (!TextUtils.isEmpty(ghxkzbh)){
paraMap.put("xkzh", "%" + ghxkzbh + "%"); paraMap.put("xkzh", "%" + ghxkzbh + "%");
} }
...@@ -101,7 +98,7 @@ public class JfzmAction extends BaseAction { ...@@ -101,7 +98,7 @@ public class JfzmAction extends BaseAction {
// } // }
// }); // });
// } // }
pagination = paymentItemHisService.findByPage(pagination, paraMap); pagination = rfxmService.findByPage(pagination, paraMap);
convObjectToJson(pagination, config); convObjectToJson(pagination, config);
} }
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ 87a5c7ff
...@@ -259,6 +259,13 @@ public class PaymentItemHisAction extends BaseAction ...@@ -259,6 +259,13 @@ public class PaymentItemHisAction extends BaseAction
rfxm.setDxjzmj(model.getXmxxb().getJzmjdx());//地下建筑面积 rfxm.setDxjzmj(model.getXmxxb().getJzmjdx());//地下建筑面积
rfxm.setJsdwlxr(model.getXmxxb().getLianxiren());//建设单位联系人 rfxm.setJsdwlxr(model.getXmxxb().getLianxiren());//建设单位联系人
rfxm.setLxdh(model.getXmxxb().getPhone());//联系电话 rfxm.setLxdh(model.getXmxxb().getPhone());//联系电话
rfxm.setJsdd(model.getXmxxb().getJsdd());
rfxm.setXkzh(model.getXmxxb().getXkzh());
rfxm.setPaymentLink(model.getXmxxb().getPaymentLink());
rfxm.setZsfw(model.getXmxxb().getZsfw());
rfxm.setSlbh(model.getXmxxb().getSlbh());
rfxm.setZslxdbh(model.getZslxdbh());
rfxmService.save(rfxm); rfxmService.save(rfxm);
} }
} }
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 87a5c7ff
...@@ -211,140 +211,96 @@ public class Rfxm extends BaseModel ...@@ -211,140 +211,96 @@ public class Rfxm extends BaseModel
private Integer insertType; private Integer insertType;
// 2019-7-16 end --------------------- // 2019-7-16 end ---------------------
public Rfxm(){ /**
* 建设地点
*/
private String jsdd;
/**
* 许可证号
*/
private String xkzh;
private Integer paymentLink;
/**
* 二级统计单位
*/
private String zsfw;
/**
* 人防是否用章
*/
private Integer isRfyz;
/**
* 缴款通知书编号
*/
private String slbh;
/**
* 缴款通知书编号
*/
private String zslxdbh;
public String getZslxdbh() {
return zslxdbh;
} }
public Rfxm(String sfqy,String deptId, Integer delFlag, String status, Integer statusConstract, Integer statusComplete, Integer statusWithinTheDay, String dsdw, String dsdwcj, String jfdm, String xmdm, String ghxkzbh, String ghxmbh, String ghxmlx, String ghxkzlx, String xxylbbh, String jsdwmc, String gcxmmc, String gcxmdd, String dsjzmj, String dxjzmj, String jsdwlxr, String lxdh, String jktzyjjehj, Integer sfxxbb, String dsdwjbr, String jbyj, Date jbTime, String dsdwfhr, String fhyj, Date fhTime, Integer statusJBFH, String zhcklxr, String zhcklxdh, String jddh, Integer insertType) { public void setZslxdbh(String zslxdbh) {
this.deptId = deptId; this.zslxdbh = zslxdbh;
this.delFlag = delFlag;
this.status = status;
this.statusConstract = statusConstract;
this.statusComplete = statusComplete;
this.statusWithinTheDay = statusWithinTheDay;
this.dsdw = dsdw;
this.dsdwcj = dsdwcj;
this.jfdm = jfdm;
this.xmdm = xmdm;
this.ghxkzbh = ghxkzbh;
this.ghxmbh = ghxmbh;
this.ghxmlx = ghxmlx;
this.ghxkzlx = ghxkzlx;
this.xxylbbh = xxylbbh;
this.jsdwmc = jsdwmc;
this.gcxmmc = gcxmmc;
this.gcxmdd = gcxmdd;
this.dsjzmj = dsjzmj;
this.dxjzmj = dxjzmj;
this.jsdwlxr = jsdwlxr;
this.lxdh = lxdh;
this.jktzyjjehj = jktzyjjehj;
this.sfxxbb = sfxxbb;
this.dsdwjbr = dsdwjbr;
this.jbyj = jbyj;
this.jbTime = jbTime;
this.dsdwfhr = dsdwfhr;
this.fhyj = fhyj;
this.fhTime = fhTime;
this.statusJBFH = statusJBFH;
this.zhcklxr = zhcklxr;
this.zhcklxdh = zhcklxdh;
this.jddh = jddh;
this.insertType = insertType;
this.sfqy = sfqy;
} }
//v2 public String getSlbh() {
/*public Rfxm(String zzhhjdzje,String status, String qfqrlsh,String qfhjkzje,String jftzyje,String jfdmwybh,String deptId, Integer delFlag, String dsdw, String dsdwcj, String accountName, String khh, String accountDetail, String accountStatus, String jktzsbh, String jktzszt, String jfdm, String xmdm, String ghxkzbh, String ghxmbh, String ghxmlx, String ghxkzlx, String xxylbbh, String jsdwmc, String gcxmmc, String gcxmdd, String dsjzmj, String dxjzmj, String jsdwlxr, String lxdh, String sfxmmc, String shbm, String sfxmzslxdbh, String yjjemx, String jktzyjjehj, String cnjfhj, String sfxmzslxdsmj, Integer sfxxbb, String dsdwjbr, String jbyj, String dsdwfhr, String fhyj, String zhcklxr, String zhcklxdh, String jddh) { return slbh;
this.zzhhjdzje = zzhhjdzje; }
this.status = status;
this.qfqrlsh = qfqrlsh; public void setSlbh(String slbh) {
this.qfhjkzje = qfhjkzje; this.slbh = slbh;
this.jftzyje = jftzyje; }
this.jfdmwybh = jfdmwybh;
this.deptId = deptId; @Column(name = "IS_RFYZ")
this.delFlag = delFlag; public Integer getIsRfyz() {
this.dsdw = dsdw; return isRfyz;
this.dsdwcj = dsdwcj; }
this.accountName = accountName;
this.khh = khh; public void setIsRfyz(Integer isRfyz) {
this.accountDetail = accountDetail; this.isRfyz = isRfyz;
this.accountStatus = accountStatus; }
this.jktzsbh = jktzsbh;
this.jktzszt = jktzszt; public String getZsfw() {
this.jfdm = jfdm; return zsfw;
this.xmdm = xmdm; }
this.ghxkzbh = ghxkzbh;
this.ghxmbh = ghxmbh; public void setZsfw(String zsfw) {
this.ghxmlx = ghxmlx; this.zsfw = zsfw;
this.ghxkzlx = ghxkzlx; }
this.xxylbbh = xxylbbh;
this.jsdwmc = jsdwmc; @Column(name = "PAYMENT_LINK")
this.gcxmmc = gcxmmc; public Integer getPaymentLink() {
this.gcxmdd = gcxmdd; return paymentLink;
this.dsjzmj = dsjzmj; }
this.dxjzmj = dxjzmj;
this.jsdwlxr = jsdwlxr; public void setPaymentLink(Integer paymentLink) {
this.lxdh = lxdh; this.paymentLink = paymentLink;
this.sfxmmc = sfxmmc; }
this.shbm = shbm;
this.sfxmzslxdbh = sfxmzslxdbh; public String getXkzh() {
this.yjjemx = yjjemx; return xkzh;
this.jktzyjjehj = jktzyjjehj; }
this.cnjfhj = cnjfhj;
this.sfxmzslxdsmj = sfxmzslxdsmj; public void setXkzh(String xkzh) {
this.sfxxbb = sfxxbb; this.xkzh = xkzh;
this.dsdwjbr = dsdwjbr; }
this.jbyj = jbyj;
this.dsdwfhr = dsdwfhr; public String getJsdd() {
this.fhyj = fhyj; return jsdd;
this.zhcklxr = zhcklxr; }
this.zhcklxdh = zhcklxdh;
this.jddh = jddh; public void setJsdd(String jsdd) {
}*/ this.jsdd = jsdd;
//v1 }
/* public Rfxm(String deptId, Integer delFlag, String status, Integer statusConstract, Integer statusComplete, Integer statusWithinTheDay, String dsdw, String dsdwcj, String accountName, String khh, String accountDetail, String accountStatus, String jktzsbh, String jktzszt, String jfdm, String xmdm, String ghxkzbh, String ghxmbh, String ghxmlx, String ghxkzlx, String xxylbbh, String jsdwmc, String gcxmmc, String gcxmdd, String dsjzmj, String dxjzmj, String jsdwlxr, String lxdh, String jktzyjjehj, String dsdwjbr, String jbyj, String dsdwfhr, String fhyj, String zhcklxr, String zhcklxdh, String jddh, String jfdmwybh, String zzhhjdzje, String qfqrlsh, String qfhjkzje, String jftzyje) {
this.deptId = deptId;
this.delFlag = delFlag;
this.status = status;
this.statusConstract = statusConstract;
this.statusComplete = statusComplete;
this.statusWithinTheDay = statusWithinTheDay;
this.dsdw = dsdw;
this.dsdwcj = dsdwcj;
this.accountName = accountName;
this.khh = khh;
this.accountDetail = accountDetail;
this.accountStatus = accountStatus;
this.jktzsbh = jktzsbh;
this.jktzszt = jktzszt;
this.jfdm = jfdm;
this.xmdm = xmdm;
this.ghxkzbh = ghxkzbh;
this.ghxmbh = ghxmbh;
this.ghxmlx = ghxmlx;
this.ghxkzlx = ghxkzlx;
this.xxylbbh = xxylbbh;
this.jsdwmc = jsdwmc;
this.gcxmmc = gcxmmc;
this.gcxmdd = gcxmdd;
this.dsjzmj = dsjzmj;
this.dxjzmj = dxjzmj;
this.jsdwlxr = jsdwlxr;
this.lxdh = lxdh;
this.jktzyjjehj = jktzyjjehj;
this.dsdwjbr = dsdwjbr;
this.jbyj = jbyj;
this.dsdwfhr = dsdwfhr;
this.fhyj = fhyj;
this.zhcklxr = zhcklxr;
this.zhcklxdh = zhcklxdh;
this.jddh = jddh;
this.jfdmwybh = jfdmwybh;
this.zzhhjdzje = zzhhjdzje;
this.qfqrlsh = qfqrlsh;
this.qfhjkzje = qfhjkzje;
this.jftzyje = jftzyje;
}*/
@Column(name = "deptid") @Column(name = "deptid")
public String getDeptId() public String getDeptId()
......
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