数据填充，新增缴款人类型

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

@@ -115,9 +115,8 @@
 							</td>
 							<th width="15">缴款人类型</th>
 							<td width="35%">
-<%--								<input style="width:90%" value="单位" disabled/>--%>
-								<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />单位
-								<input type="radio" name="rfxmsfxx.tqjn" value="1"/>个人
+								<input type="radio" name="fstzsXm.jkrlx" value="单位" checked="checked" />单位
+								<input type="radio" name="fstzsXm.jkrlx" value="个人"/>个人
 
 							</td>
 						</tr>

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

@@ -215,28 +215,28 @@
 			 class='f4'>${fstzsXm.kpsjgl.zsdw}
 		</div>
 		<div id='f5' draggable='true'
-			 class='f5'>${fstzs.mobile}
+			 class='f5'>${fstzsXm.mobile}
 		</div>
 		<div id='f6' draggable='true'
 			 class='f6'>${fstzsXm.kpsjgl.krqc}
 		</div>
 		<div id='f7' draggable='true'
-			 class='f7'>缴款人类型
+			 class='f7'>${fstzsXm.jkrlx}
 		</div>
 		<div id='f8' draggable='true'
-			 class='f8'>${fstzs.zhanghao}
+			 class='f8'>${fstzsXm.zhanghao}
 		</div>
 		<div id='f9' draggable='true'
-			 class='f9'>
+			 class='f9'>${fstzsXm.beizhu}
 		</div>
 		<div id='f10' draggable='true'
-			 class='f10'>${fstzs.khh}
+			 class='f10'>${fstzsXm.khh}
 		</div>
 		<div id='f11' draggable='true'
-			 class='f11'>项目编码
+			 class='f11'>${fstzsXm.kpsjgl.xmbm}
 		</div>
 		<div id='f12' draggable='true'
-			 class='f12'>${fstzs.gcxmmc}
+			 class='f12'>${fstzsXm.kpsjgl.srxmmc}
 		</div>
 		<div id='f13' draggable='true'
 			 class='f13'>元
@@ -251,13 +251,13 @@
 			 class='f16'>${fstzs.yjje}
 		</div>
 		<div id='f17' draggable='true'
-			 class='f17'>${fstzsXm.beizhu}
+			 class='f17'>
 		</div>
 		<div id='f18' draggable='true'
-			 class='f18'>￥${fstzs.yjje}
+			 class='f18'>￥${fstzs.yjjeQfw}
 		</div>
 		<div id='f19' draggable='true'
-			 class='f19'>${fstzs.yjjedx}
+			 class='f19'>${fstzs.yjjeDx}
 		</div>
 	</div>
 	<script>

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

@@ -114,7 +114,7 @@
 						</td>
 						<th width="15">缴款人类型</th>
 						<td width="35%">
-							<input style="width:90%" value="单位" disabled/>
+							<input style="width:90%" name="fstzsXm.jkrlx" value="${fstzsXm.jkrlx}" disabled/>
 							
 						</td>
 					</tr>

src/com/jshx/core/utils/SysPropertiesUtil.java

@@ -98,7 +98,7 @@ public class SysPropertiesUtil {
 	         StringBuffer ret = new StringBuffer();
 	        for( int i = num.length()-1; i>=0; i-- ){
 	            ret.append( num.charAt(i) );
-	            if( (num.length()-i)%3==0 ){
+	            if(i != 0 && (num.length()-i)%3==0 ){
 	                ret.append(",");
 	            }
 	        }

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

@@ -160,6 +160,15 @@ public class Fstzs extends BaseModel {
      */
     private String kpJbr;
 
+    /**
+     * 应缴金额大写
+     */
+    private String yjjeDx;
+    /**
+     * 应缴金额千分位
+     */
+    private String yjjeQfw;
+
 
     /**
      * 对应项目信息
@@ -389,4 +398,20 @@ public class Fstzs extends BaseModel {
     public void setJkUrl(String jkUrl) {
         this.jkUrl = jkUrl;
     }
+
+    public String getYjjeDx() {
+        return yjjeDx;
+    }
+
+    public String getYjjeQfw() {
+        return yjjeQfw;
+    }
+
+    public void setYjjeDx(String yjjeDx) {
+        this.yjjeDx = yjjeDx;
+    }
+
+    public void setYjjeQfw(String yjjeQfw) {
+        this.yjjeQfw = yjjeQfw;
+    }
 }

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

@@ -55,6 +55,12 @@ public class FstzsXm extends BaseModel
 	 */
 	private String zhanghao;
 
+	/**
+	 * 缴款人类型
+	 * 单位、个人
+	 */
+	private String jkrlx;
+
 	/**
 	 * 经办人
 	 * 点击生成非税通知书的人
@@ -244,4 +250,12 @@ public class FstzsXm extends BaseModel
 	public void setJhjd(String jhjd) {
 		this.jhjd = jhjd;
 	}
+
+	public String getJkrlx() {
+		return jkrlx;
+	}
+
+	public void setJkrlx(String jkrlx) {
+		this.jkrlx = jkrlx;
+	}
 }

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

@@ -7,6 +7,7 @@ import com.jshx.core.base.action.BaseAction;
 import com.jshx.core.base.vo.Pagination;
 import com.jshx.core.json.CodeJsonValueProcessor;
 import com.jshx.core.json.DateJsonValueProcessor;
+import com.jshx.core.utils.SysPropertiesUtil;
 import com.jshx.fstzs.entity.Fstzs;
 import com.jshx.fstzs.entity.FstzsXm;
 import com.jshx.fstzs.fsutil.bean.FsResult;
@@ -247,6 +248,8 @@ public class FstzsAction extends BaseAction {
     public String winFstzs() {
         fstzs = fstzsService.getById(id);
         fstzsXm = fstzsXmService.getBySlbh(fstzs.getSlbh());
+        fstzs.setYjjeDx(NumberToCN.number2CNMontrayUnit(new BigDecimal(fstzs.getYjje())));
+        fstzs.setYjjeQfw(SysPropertiesUtil.qwfgf(fstzs.getYjje()));
         return VIEW;
     }
 
@@ -263,6 +266,7 @@ public class FstzsAction extends BaseAction {
         dbXm.setKhh(fstzsXm.getKhh());
         dbXm.setMobile(fstzsXm.getMobile());
         dbXm.setZhanghao(fstzsXm.getZhanghao());
+        dbXm.setJkrlx(fstzsXm.getJkrlx());
 
         HashMap<String, Object> params = new HashMap<>();
         params.put("slbh",dbXm.getSlbh());