修改部分逻辑

WebRoot/WEB-INF/pages/rfdz/Rfdz_Detail.jsp

@@ -185,7 +185,7 @@
                     text: '添加',
                     iconCls: 'icon-add',
                     handler: function () {
-                        addNew4Sfxx("${zzhxm.id}");
+                        addNew4Sfxx("${paymentItem.id}");
                     }
                 }]
             }));

src/com/jshx/paymentItemHis/conf/sql-map-paymentItemHis.xml

@@ -66,6 +66,83 @@
 		<isNotEmpty property="isCreateJfpz">
 			<![CDATA[and t.isCreateJfpz = :isCreateJfpz]]>
 		</isNotEmpty>
+		<isNotEmpty property="isCwyz">
+			<![CDATA[and t.isCwyz = :isCwyz]]>
+		</isNotEmpty>
+		order by t.createTime desc
+	</select>
+
+
+	<!-- 根据搜索条件查询  -->
+	<select id="findPaymentItemHisJoinXmxxbByMap">
+		select t.* from Payment_Item_His t left join XMXXB b on t.xmbzj = b.row_id where t.delFlag = 0 and t.printFlag = 'YES'
+		<isNotEmpty property="deptCodes">
+			<![CDATA[and t.deptId in (:deptCodes)]]>
+		</isNotEmpty>
+		<isNotEmpty property="ids">
+			<![CDATA[and t.id in (:ids)]]>
+		</isNotEmpty>
+
+		<isNotEmpty property="slbh">
+			<![CDATA[and t.slbh like :slbh]]>
+		</isNotEmpty>
+		<isNotEmpty property="dwmc">
+			<![CDATA[and t.dwmc like :dwmc]]>
+		</isNotEmpty>
+		<isNotEmpty property="xmmc">
+			<![CDATA[and t.xmmc like :xmmc]]>
+		</isNotEmpty>
+		<isNotEmpty property="zsdw">
+			<![CDATA[and t.zsdw like :zsdw]]>
+		</isNotEmpty>
+		<isNotEmpty property="zslxdbh">
+			<![CDATA[and t.zslxdbh like :zslxdbh]]>
+		</isNotEmpty>
+		<isNotEmpty property="dwdm">
+			<![CDATA[and t.dwdm like :dwdm]]>
+		</isNotEmpty>
+		<isNotEmpty property="lockFlag">
+			<![CDATA[and t.lockFlag = :lockFlag]]>
+		</isNotEmpty>
+		<isNotEmpty property="zyjje">
+			<![CDATA[and t.zyjje > 0]]>
+		</isNotEmpty>
+		<isNotEmpty property="ptyjje">
+			<![CDATA[and t.ptyjje > 0]]>
+		</isNotEmpty>
+		<isNotEmpty property="yjje">
+			<![CDATA[and t.ptyjje = :yjje]]>
+		</isNotEmpty>
+		<isNotEmpty property="ECN">
+			<![CDATA[and t.ECN > 0]]>
+		</isNotEmpty>
+		<isNotEmpty property="ecnn">
+			<![CDATA[and t.ECN like :ecnn]]>
+		</isNotEmpty>
+		<isNotEmpty property="nonTaxStatus">
+			<![CDATA[and t.nonTaxStatus = :nonTaxStatus]]>
+		</isNotEmpty>
+		<isNotEmpty property="isPrintJfpz">
+			<![CDATA[and t.isPrintJfpz = :isPrintJfpz]]>
+		</isNotEmpty>
+		<isNotEmpty property="isfdx">
+			<![CDATA[and t.isfdx = :isfdx]]>
+		</isNotEmpty>
+		<isNotEmpty property="notisfdx">
+			<![CDATA[and t.isfdx is null]]>
+		</isNotEmpty>
+		<isNotEmpty property="yzsFlag">
+			<![CDATA[and t.yzsFlag = :yzsFlag]]>
+		</isNotEmpty>
+		<isNotEmpty property="isCreateJfpz">
+			<![CDATA[and t.isCreateJfpz = :isCreateJfpz]]>
+		</isNotEmpty>
+		<isNotEmpty property="paymentLink">
+			<![CDATA[and b.paymentLink = :paymentLink]]>
+		</isNotEmpty>
+		<isNotEmpty property="isCwyz">
+			<![CDATA[and t.is_Cwyz = :isCwyz]]>
+		</isNotEmpty>
 		order by t.createTime desc
 	</select>
 	

src/com/jshx/paymentItemHis/dao/PaymentItemHisDao.java

@@ -26,6 +26,7 @@ public interface PaymentItemHisDao extends BaseDao
 	 */
 	public List findPaymentItemHis(Map<String, Object> paraMap);
 	public List findsuoyou(Map<String, Object> paraMap);
+	public Pagination findPaymentItemHisJoinXmxxbByMap(Pagination page, Map<String, Object> paraMap);
 
 	/**
 	 * 根据主键ID查询信息

src/com/jshx/paymentItemHis/dao/impl/PaymentItemHisDaoImpl.java

@@ -40,6 +40,12 @@ public class PaymentItemHisDaoImpl extends BaseDaoImpl implements PaymentItemHis
 		return this.findListByHqlId("findPaymentItemHisByMap1", paraMap);
 	}
 
+
+
+	public Pagination findPaymentItemHisJoinXmxxbByMap(Pagination page, Map<String, Object> paraMap){
+		return this.findPageBySqlId("findPaymentItemHisJoinXmxxbByMap", paraMap,page);
+	}
+
 	/**
 	 * 根据主键ID查询信息
 	 * @param id 主键ID

src/com/jshx/paymentItemHis/entity/PaymentItemHis.java

 package com.jshx.paymentItemHis.entity;
 
-import java.sql.Blob;
 import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.GenericGenerator;
+import com.jshx.rfdz.entity.Rfdz;
 
 import com.jshx.core.base.entity.BaseModel;
 import com.jshx.module.admin.entity.User;
@@ -47,6 +44,13 @@ public class PaymentItemHis extends BaseModel
 	
 	private Xmxxb xmxxb;
 
+	/**
+	 * 人防到账表主键
+	 */
+	private String rfdzzj;
+
+	private Rfdz rfdz;
+
 	/**
 	 * 受理编号
 	 */
@@ -945,4 +949,23 @@ public class PaymentItemHis extends BaseModel
 	public void setIsCwyz(String isCwyz) {
 		this.isCwyz = isCwyz;
 	}
+
+	@Column(name="RFDZZJ")
+	public String getRfdzzj() {
+		return rfdzzj;
+	}
+
+	public void setRfdzzj(String rfdzzj) {
+		this.rfdzzj = rfdzzj;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity= Rfdz.class)
+	@JoinColumn(name = "RFDZZJ",updatable=false,insertable=false)
+	public Rfdz getRfdz() {
+		return rfdz;
+	}
+
+	public void setRfdz(Rfdz rfdz) {
+		this.rfdz = rfdz;
+	}
 }

src/com/jshx/paymentItemHis/service/PaymentItemHisService.java

@@ -18,6 +18,8 @@ public interface PaymentItemHisService extends BaseService
 	 * @return 分页信息
 	 */
 	public Pagination findByPage(Pagination page, Map<String, Object> paraMap);
+	public Pagination findPaymentItemHisJoinXmxxbByMap(Pagination page, Map<String, Object> paraMap);
+
 	public List<PaymentItemHis> findall( Map<String, Object> paraMap);
 	public List<PaymentItemHis> findsuoyou( Map<String, Object> paraMap);
 

src/com/jshx/paymentItemHis/service/impl/PaymentItemHisServiceImpl.java

@@ -40,6 +40,17 @@ public class PaymentItemHisServiceImpl extends BaseServiceImpl implements Paymen
 		return paymentItemHisDao.findByPage(page, paraMap);
 	}
 
+	/**
+	 * 分页查询
+	 * @param page 分页信息
+	 * @param paraMap 查询条件信息
+	 * @return 分页信息
+	 */
+	public Pagination findPaymentItemHisJoinXmxxbByMap(Pagination page, Map<String, Object> paraMap)
+	{
+		return paymentItemHisDao.findPaymentItemHisJoinXmxxbByMap(page, paraMap);
+	}
+
 	/**
 	 * 根据主键ID查询信息
 	 * @param id 主键ID

src/com/jshx/rfdz/conf/sql-map-rfdz.xml

@@ -4,14 +4,14 @@
 <sqlMap>
 	<!-- 根据搜索条件查询  -->
 	<select id="findRfdzByMap">
-		from Rfdz t where t.delFlag = 0 and t.printFlag = 'YES'
+		from Rfdz t where t.delFlag = 0
 		<isNotEmpty property="deptCodes">
 			<![CDATA[and t.deptId in (:deptCodes)]]>
 		</isNotEmpty>
 		<isNotEmpty property="ids">
 			<![CDATA[and t.id in (:ids)]]>
 		</isNotEmpty>
-		
+
 		<isNotEmpty property="slbh">
 			<![CDATA[and t.slbh like :slbh]]>
 		</isNotEmpty>
@@ -68,6 +68,6 @@
 		</isNotEmpty>
 		order by t.createTime desc
 	</select>
-	
+
 
 </sqlMap>

src/com/jshx/rfdz/conf/struts-rfdz.xml

@@ -20,7 +20,7 @@
 
 		<!-- 跳转收费信息添加页面 -->
 		<action name="RfdzSfxxAdd" class="com.jshx.rfdz.web.RfdzAction" method="sfxxAdd">
-			<result name="edit">/WEB-INF/pages/zzhxm/Rfdz_Add.jsp</result>
+			<result name="edit">/WEB-INF/pages/rfdz/Rfdz_Add.jsp</result>
 		</action>
 
 		<action name="RfdzEdit" >

src/com/jshx/rfdz/entity/Rfdz.java

 package com.jshx.rfdz.entity;
 
 import com.jshx.core.base.entity.BaseModel;
+import com.jshx.paymentItemHis.entity.PaymentItemHis;
+import com.jshx.xmxxb.entity.Xmxxb;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * 实体类模板（目前仅适配MS-SQLServer数据库）
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  */
 @SuppressWarnings("serial")
 @Entity
-@Table(name="PAYMENT_ITEM_RF")
+@Table(name="RFDZ")
 public class Rfdz extends BaseModel {
     /**
      * 部门代码
@@ -22,18 +22,18 @@ public class Rfdz extends BaseModel {
     /**
      * 删除标记
      */
+    @Column
     private Integer delFlag;
 
     /**
-     * 项目表主键
+     * 收费项目名称
      */
-    private String xmbzj;
+    private String scxmmc;
 
     /**
-     * 收费项目名称
-     * （防空地下室易地建设费）
+     * 联系单编号
      */
-    private String sfxmmc;
+    private String lxdbj;
 
     /**
      * 审核部门
@@ -41,32 +41,50 @@ public class Rfdz extends BaseModel {
     private String shbm;
 
     /**
-     * 收费项目联系单编号
+     * 应缴金额
      */
-    private String sfxmlxdbh;
+    private String yjje;
 
     /**
-     * 应缴金额
+     * 缴费承诺环节
+     * 1，30日内
      */
-    private String yjje;
+    private int jfcnhj;
+
+
+    /**
+     * 提前缴纳
+     */
+    private int txjn;
 
     /**
-     * 缴费承诺
+     * 上传的文件：征收联系单
      */
-    private String jfcn;
+    private String zslxd;
 
     /**
-     * 延后缴纳
+     * 上传的文件：征收联系单
      */
-    private String yhjn;
+    private String fkdsw;
+
+    /**
+     * 上传的文件：先行缴纳申请
+     */
+    private String xxjnsd;
 
     /**
      * 备注
      */
     private String beizhu;
 
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
 
-    @Column
     public Integer getDelFlag() {
         return delFlag;
     }
@@ -75,25 +93,22 @@ public class Rfdz extends BaseModel {
         this.delFlag = delFlag;
     }
 
-    @Column(name = "XMBZJ")
-    public String getXmbzj() {
-        return xmbzj;
+    public String getScxmmc() {
+        return scxmmc;
     }
 
-    public void setXmbzj(String xmbzj) {
-        this.xmbzj = xmbzj;
+    public void setScxmmc(String scxmmc) {
+        this.scxmmc = scxmmc;
     }
 
-    @Column(name = "SFXMMC")
-    public String getSfxmmc() {
-        return sfxmmc;
+    public String getLxdbj() {
+        return lxdbj;
     }
 
-    public void setSfxmmc(String sfxmmc) {
-        this.sfxmmc = sfxmmc;
+    public void setLxdbj(String lxdbj) {
+        this.lxdbj = lxdbj;
     }
 
-    @Column(name = "SHBM")
     public String getShbm() {
         return shbm;
     }
@@ -102,16 +117,6 @@ public class Rfdz extends BaseModel {
         this.shbm = shbm;
     }
 
-    @Column(name = "SFXMLXDBH")
-    public String getSfxmlxdbh() {
-        return sfxmlxdbh;
-    }
-
-    public void setSfxmlxdbh(String sfxmlxdbh) {
-        this.sfxmlxdbh = sfxmlxdbh;
-    }
-
-    @Column(name = "YJJE")
     public String getYjje() {
         return yjje;
     }
@@ -120,38 +125,51 @@ public class Rfdz extends BaseModel {
         this.yjje = yjje;
     }
 
-    @Column(name = "JFCN")
-    public String getJfcn() {
-        return jfcn;
+    public int getJfcnhj() {
+        return jfcnhj;
     }
 
-    public void setJfcn(String jfcn) {
-        this.jfcn = jfcn;
+    public void setJfcnhj(int jfcnhj) {
+        this.jfcnhj = jfcnhj;
     }
 
-    @Column(name = "YHJN")
-    public String getYhjn() {
-        return yhjn;
+    public int getTxjn() {
+        return txjn;
     }
 
-    public void setYhjn(String yhjn) {
-        this.yhjn = yhjn;
+    public void setTxjn(int txjn) {
+        this.txjn = txjn;
     }
 
-    @Column(name = "BEIZHU")
-    public String getBeizhu() {
-        return beizhu;
+    public String getZslxd() {
+        return zslxd;
     }
 
-    public void setBeizhu(String beizhu) {
-        this.beizhu = beizhu;
+    public void setZslxd(String zslxd) {
+        this.zslxd = zslxd;
     }
 
-    public String getDeptId() {
-        return deptId;
+    public String getFkdsw() {
+        return fkdsw;
     }
 
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
+    public void setFkdsw(String fkdsw) {
+        this.fkdsw = fkdsw;
+    }
+
+    public String getXxjnsd() {
+        return xxjnsd;
+    }
+
+    public void setXxjnsd(String xxjnsd) {
+        this.xxjnsd = xxjnsd;
+    }
+
+    public String getBeizhu() {
+        return beizhu;
+    }
+
+    public void setBeizhu(String beizhu) {
+        this.beizhu = beizhu;
     }
 }

src/com/jshx/rfdz/web/RfdzAction.java

@@ -9,15 +9,12 @@ import com.jshx.paymentItemHis.service.PaymentItemHisService;
 import com.jshx.rfdz.entity.Rfdz;
 import com.jshx.rfdz.service.RfdzService;
 import com.jshx.zsdw.service.ZsdwService;
-import com.jshx.zzhxm.entity.ZzhxmSfxx;
 import com.neusoft.egov.utils.TextUtils;
 import net.sf.json.JsonConfig;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class RfdzAction extends BaseAction
@@ -33,12 +30,13 @@ public class RfdzAction extends BaseAction
 	String hczt;
 
 	PaymentItemHis paymentItem = new PaymentItemHis();
+	Rfdz rfdz = new Rfdz();
 	/**
 	 * 分页信息
 	 */
 	private Pagination pagination;
 
-	private Rfdz rfdz = new Rfdz();
+
 
 	/**
 	 * 修改新增标记，add为新增、mod为修改
@@ -98,7 +96,7 @@ public class RfdzAction extends BaseAction
 		//TODO 缴费环节、核查状态筛选
 		//1施工许可前	2：30日内
 		if(!TextUtils.isEmpty(jfhj) && "0".equals(jfhj)) {
-
+//			paraMap
 		}
 
 		//1已同步 2未同步
@@ -177,18 +175,26 @@ public class RfdzAction extends BaseAction
 			rfdz.setDeptId(this.getLoginUserDepartmentId());
 			rfdz.setDelFlag(0);
 			rfdzService.save(rfdz);
+			PaymentItemHis his = paymentItemHisService.getById(paymentItem.getId());
+			his.setRfdzzj(rfdz.getId());
+			paymentItemHisService.update(his);
 		}else{
 			//TODO 判断审核人和创建人是否一致
-			Rfdz model = rfdzService.getById(rfdz.getId());
-			model.setBeizhu(rfdz.getBeizhu());
-			model.setJfcn(rfdz.getJfcn());
-			model.setSfxmlxdbh(rfdz.getSfxmlxdbh());
-			model.setSfxmmc(rfdz.getSfxmmc());
-			model.setDeptId(rfdz.getDeptId());
-			model.setShbm(rfdz.getShbm());
-			model.setXmbzj(rfdz.getXmbzj());
-			model.setYhjn(rfdz.getYhjn());
-			rfdzService.update(model);
+			PaymentItemHis his = paymentItemHisService.getById(paymentItem.getId());
+
+			//TODO 人防信息保存
+//			his.setRfsfxxzj("");
+			paymentItemHisService.update(his);
+//			Rfdz model = rfdzService.getById(rfdz.getId());
+//			model.setBeizhu(rfdz.getBeizhu());
+//			model.setJfcn(rfdz.getJfcn());
+//			model.setSfxmlxdbh(rfdz.getSfxmlxdbh());
+//			model.setSfxmmc(rfdz.getSfxmmc());
+//			model.setDeptId(rfdz.getDeptId());
+//			model.setShbm(rfdz.getShbm());
+//			model.setXmbzj(rfdz.getXmbzj());
+//			model.setYhjn(rfdz.getYhjn());
+//			rfdzService.update(model);
 		}
 
 		return RELOAD;