修改部分问题

WebRoot/WEB-INF/pages/fstzs/Fstzs_Print.jsp

@@ -213,7 +213,7 @@
 			 class='f1'>${fstzs.jhTime}
 		</div>
 		<div id='f2' draggable='true'
-			 class='f2'>缴款码
+			 class='f2'>${fstzs.jkm}
 		</div>
 		<div id='f3' draggable='true'
 			 class='f3'>${fstzs.jkr}

conf/system.properties

@@ -145,6 +145,7 @@ fs-dwbm:708002
 fs-qhbm:320100
 fs-pjdm:32010122
 fs-version:1.0.1
+fs-billcode:00010302
 #收费项目编号，上线需要切为线上编码，10304240101为测试编码
 fs-sfxmbh:10304240101
 #fs-sfxmbh:103015601

src/com/jshx/fstzs/entity/FstzsXm.java

@@ -215,8 +215,8 @@ public class FstzsXm extends BaseModel
 		this.yjjedx = yjjedx;
 	}
 
-	@OneToOne(fetch = FetchType.EAGER, targetEntity=PaymentItemPending.class)
-	@JoinColumn(name = "PENDING_ZJ",updatable=false,insertable=false)
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity=PaymentItemPending.class)
+	@JoinColumn(name = "PENDING_ZJ",updatable=false,insertable=true)
 	public PaymentItemPending getPaymentItemPending() {
 		return paymentItemPending;
 	}
@@ -225,12 +225,14 @@ public class FstzsXm extends BaseModel
 		this.paymentItemPending = paymentItemPending;
 	}
 
-	@OneToOne(fetch = FetchType.EAGER, targetEntity=Kpsjgl.class)
-	@JoinColumn(name = "KPSJGL_ZJ",updatable=false,insertable=false)
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity=Kpsjgl.class)
+	@JoinColumn(name = "KPSJGL_ZJ",updatable=false,insertable=true)
 	public Kpsjgl getKpsjgl() {
 		return kpsjgl;
 	}
 
+
+
 	public void setKpsjgl(Kpsjgl kpsjgl) {
 		this.kpsjgl = kpsjgl;
 	}
@@ -258,4 +260,5 @@ public class FstzsXm extends BaseModel
 	public void setJkrlx(String jkrlx) {
 		this.jkrlx = jkrlx;
 	}
+
 }

src/com/jshx/fstzs/fsutil/FsRequest.java

@@ -56,7 +56,7 @@ public class FsRequest {
         Map<String,Object> map = new HashMap<>();
         map.put("serial_number", fstzs.getLsh());//流水号
         map.put("place_code",getProp("fs-kpdbm"));//开票点编码
-        map.put("bill_code","00010302");//票据种类编码
+        map.put("bill_code",getProp("fs-billcode"));//票据种类编码
         map.put("date",new SimpleDateFormat("yyyy-MM-dd").format(new Date()));//日期: YYYY-MM-DD
         map.put("payer_name",fstzs.getJkr());//缴款人
         map.put("payer_tel",fstzs.getFstzsXm().getMobile());//缴款人手机号

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

@@ -278,6 +278,22 @@ public class FstzsAction extends BaseAction {
             dbXm.setBeizhu(dbXm.getBeizhu() + "，" + beizhuAppend);
         }
         fstzsXmService.update(dbXm);
+        /**
+         * TODO 删除测试代码
+         * 上一个走了，再创建个新的
+         */
+        String time =  new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
+        FstzsXm xm = new FstzsXm();
+        xm.setSlbh("slbh" + time);
+        xm.setStatus(0);//状态改为已生成、待复核
+        xm.setYjje("9000");
+        xm.setKpsjgl(dbXm.getKpsjgl());
+        xm.setGcxmmc("项目名称" + time);
+        xm.setJsdwmc("单位名称" + time);
+        xm.setDelFlag(0);
+        xm.setPaymentItemPending(dbXm.getPaymentItemPending());
+        fstzsXmService.save(xm);
+
         return RELOAD;
     }