新增字段

src/com/jshx/fstzs/web/FstzsAction.java

@@ -764,6 +764,8 @@ public class FstzsAction extends BaseAction {
             //缴销
             Pjjx pjjx = new Pjjx();
 
+            pjjx.setJkr(f.getJkr());
+            pjjx.setJkje(f.getYjje());
             pjjx.setDeptId(this.getLoginUserDepartmentId());
             pjjx.setDelFlag(0);
             pjjx.setPjbm(paymentVoucherHis1.getVoucherCode());
@@ -771,7 +773,7 @@ public class FstzsAction extends BaseAction {
             pjjx.setJkrqc(paymentVoucherHis1.getPayerName());
             pjjx.setSalary(paymentVoucherHis1.getAmount());
             pjjx.setState(paymentVoucherHis1.getApplyStatus());
-            pjjx.setRkdate(new SimpleDateFormat("yyyy-MM").format(new Date()));
+            pjjx.setRkdate(f.getJkTime());
             pjjx.setSlbh(paymentVoucherHis1.getOrderId());
             pjjx.setDwdm(paymentVoucherHis1.getDwdm());
             pjjx.setPayITEMid(paymentVoucherHis1.getRelateId());

src/com/jshx/pjjx/entity/Pjjx.java

@@ -92,6 +92,16 @@ public class Pjjx extends BaseModel
 	
 	private String zsfw;
 	private String dwdm;
+
+	/**
+	 * 使用线上缴款时的缴款人
+	 */
+	private String jkr;
+
+	/**
+	 * 使用线上缴款时的缴款金额
+	 */
+	private String jkje;
 	
 	public Pjjx(){
 	}
@@ -279,4 +289,19 @@ this.state = state;
 		this.zsfw = zsfw;
 	}
 
+	public String getJkr() {
+		return jkr;
+	}
+
+	public void setJkr(String jkr) {
+		this.jkr = jkr;
+	}
+
+	public String getJkje() {
+		return jkje;
+	}
+
+	public void setJkje(String jkje) {
+		this.jkje = jkje;
+	}
 }