修改问题

WebRoot/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp

@@ -69,7 +69,7 @@
 						<input type='text' name='xmxxb.xxylb' value="${xmxxb.xxylb}"  hidden="hidden" id="xmxxb.xxylb"/>
 						<th width="15%">附件显示名称</th>
 						<td width="31%"><select name="ids"  >
-							<option value="缴费凭证">缴费凭证</option>
+							<option value="一般缴款书">一般缴款书</option>
 						</select>
 						</td>
 						<th width="15%">选择文件</th>
@@ -84,7 +84,7 @@
 					<tr>
 						<td colspan="5" height="100px" style="text-align:center">
 							<a href="#" class="btn_01" type="submit" onclick="showUpload()" id="huancun">缓存<b></b></a>&nbsp;
-							<a href="#" class="btn_01" onclick="parent.close_win('win_jfzm');">关闭<b></b></a>
+							<a href="#" class="btn_01" onclick="parent.close_win('win_jfzm1');">关闭<b></b></a>
 						</td>
 					</tr>
 				</table>

WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp

@@ -436,7 +436,7 @@
 
         function reloadDate() {
             $('#pagination').datagrid('clearSelections');
-            search_zzhxm();
+            search_rfxm();
         }
         function addNew() {
             var dt = new Date();
@@ -586,7 +586,7 @@
                             }
 
                             if(rec.showYb == 1) {
-                                result += "<a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
+                                result += "<a class='btn_01_mini' onclick=one_book('" + rec.slbh + "')>一般缴款书<b></b></a>";
                             }
                            return result;
 
@@ -729,7 +729,7 @@
     }
     function one_book(row_Id) {
         var dt = new Date();
-        createSimpleWindow("win_jfzm", "一般缴款书","${ctx}/jsp/jfzm/fujian.action", 990, 300);
+        createSimpleWindow("win_jfzm1", "一般缴款书","${ctx}/jsp/jfzm/fujian.action?xmxxb.slbh=" + row_Id, 990, 300);
     }
 </script>
 

WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp

@@ -108,13 +108,20 @@
                                         <%--<td width="35%" ><s:property value="#sfxx.yjjemx"/></td>--%>
                                         <th width="15%">审核部门</th>
                                         <%--<td width="35%" ><s:property value="#sfxx.shbm"/></td>--%>
-                                    <td width="35%" ><s:property value="paymentItemHis.shbm"/></td>
+                                    <td width="35%" >南京市城市建设费用征收服务中心</td>
                                         <%--<td width="35%" >${li.shbm}</td>--%>
                                 </tr>
                                 <tr>
                                         <th width="15%">承诺缴费环节</th>
                                         <%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
-                                    <td width="35%" ><s:property value="paymentItemHis.cnjfhj"/></td>
+									<s:if test="paymentItemHis.xmxxb.paymentLink == 1">
+										<td width="35%" >施工许可前</td>
+									</s:if>
+
+									<s:if test="paymentItemHis.xmxxb.paymentLink != 1">
+										<td width="35%" >30日内</td>
+									</s:if>
+
 									<th width="15%">缴费凭证编号</th>
 									<td width="35%" ><s:property value="paymentItemHis.zslxdbh"/></td>
                                 </tr>

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp

@@ -113,6 +113,8 @@
             var ids = $("#sfxxid").val();
             var yzsqy = $('#yzsqy') .val();
             var dsdw = $('#dsdw') .val();
+            var yjjemx = $('#yjjemx') .val();
+            var sfxmlxdbh = $('#sfxmlxdbh') .val();
             var sfxmmc = $('#sfxmmcselect option:selected') .val();//选中的值
             var shbm = $('#shbmselect option:selected') .val();//选中的值
 
@@ -122,7 +124,7 @@
 				type: 'post',
 				dataType: 'json',
 				async: false,
-				data: {rfxmid : "${rfxm.id}","rfxmsfxx.cnjfhj":cnjfhj, "rfxmsfxx.yzsqy":yzsqy, "rfxmsfxx.dsdw":dsdw, "rfxmsfxx.sfxmmc":sfxmmc, "rfxmsfxx.shbm":shbm},
+				data: {rfxmid : "${rfxm.id}","rfxmsfxx.yjjemx":yjjemx, "rfxmsfxx.sfxmlxdbh":sfxmlxdbh},
 				error: function (data) {
 					$.messager.alert('错误', data.message);
 				},
@@ -322,7 +324,7 @@
 									<th width="15">应缴金额</th>
 									<c:if test="${ empty rfxm.paymentLink}">
 										<td width="35%" class="showyj">
-											<input class="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;" datatype="*1-50" errormsg='此项为必填' maxlength="50" onblur="numberCheck(this)"/>
+											<input class="yjjemx" id="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;" datatype="*1-50" errormsg='此项为必填' maxlength="50" onblur="numberCheck(this)"/>
 											<font style='color:red'>*</font>
 										</td>
 										<td width="35%" class="yjstyle">
@@ -331,32 +333,19 @@
 									</c:if>
 									<c:if test="${rfxm.paymentLink == 1}">
 										<td width="35%" class="showyj">
-											<input class="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;" datatype="*1-50" errormsg='此项为必填' maxlength="50" onblur="numberCheck(this)"/>
+											<input class="yjjemx" id="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;" datatype="*1-50" errormsg='此项为必填' maxlength="50" onblur="numberCheck(this)"/>
 											<font style='color:red'>*</font>
 										</td>
 									</c:if>
 									<c:if test="${rfxm.paymentLink == 3}">
 										<td width="35%" >
-											<input  name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;" />
+											<input id="yjjemx"  name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;" />
 										</td>
 									</c:if>
 
 								</tr>
 								<tr>
 									<th width="15">缴费承诺环节</th>
-									<c:if test="${ empty rfxm.paymentLink}">
-										<td width="35%">
-											<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
-											施工许可前
-
-											<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="30日内" />30日内
-										</td>
-										<th width="15" class="showPt" >提前缴纳配套费</th>
-										<td width="35%" class="showPt" >
-											<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否
-											<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
-										</td>
-									</c:if>
 									<c:if test="${rfxm.paymentLink == 1}">
 										<td width="35%">
 											施工许可前
@@ -388,21 +377,21 @@
 										<tr>
 											<th width="20%" style="text-align: left;"><input name="id"  type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
 											<td style="text-align: left;"width="20%" colspan="2">
-												<input type="file" name="file1" >
+												<input type="file" name="file2" >
 												<input type="button" value="扫描" onclick="scan(this)"/>
 											</td>
 										</tr>
 										<tr>
 											<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
 											<td style="text-align: left;"width="20%" colspan="2">
-												<input type="file" name="file1" >
+												<input type="file" name="file3" >
 												<input type="button" value="扫描" onclick="scan(this)"/>
 											</td>
 										</tr>
 										<tr>
 											<th width="20%" style="text-align: left;"><input name="id"  type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
 											<td style="text-align: left;"width="20%" colspan="2">
-												<input type="file" name="file1" >
+												<input type="file" name="file4" >
 												<input type="button" value="扫描" onclick="scan(this)"/>
 											</td>
 										</tr>

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp

@@ -199,19 +199,13 @@
                     {field:'cnjfhj',title:'承诺缴费环节',width:160},
                     {field:'zslxdbh',title:'缴费凭证/反馈单编号',width:200,align:'center'},
                     {field:'sfxxjbr',title:'信息录入人',width:160},
-                    {field:'updateTime',title:'录入时间',width:fixWidth(0.16)},
-                    {field:'statusJBFH',title:'是否复核',width:160,formatter:function (value, rec) {
-							if (rec.statusJBFH==0) {
-							    return "待复核";
+                    {field:'jbTime',title:'录入时间',width:fixWidth(0.16)},
+                    {field:'status',title:'是否复核',width:160,formatter:function (value, rec) {
+							if (rec.status==0) {
+							    return "否";
 							}
-							if (rec.statusJBFH==1) {
-							    return "已退回";
-							}
-							if (rec.statusJBFH==2) {
-							    return "已通过";
-							}
-							if (rec.statusJBFH==3) {
-							    return "已修改";
+							if (rec.status==1 || rec.status == 2) {
+							    return "是";
 							}
                         }},
                 ]],

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp

@@ -87,37 +87,38 @@
             var dsdw = $('#dsdw') .val();
             var sfxmmc = $('#sfxmmcselect option:selected') .val();//选中的值
             var shbm = $('#shbmselect option:selected') .val();//选中的值
+			var yjjemx = $('#yjjemx') .val();
+			var sfxmlxdbh = $('#sfxmlxdbh') .val();
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action?flag=edit",
+				type: 'post',
+				dataType: 'json',
+				async: false,
+				data: {rfxmid : "${rfxm.id}", "rfxmsfxx.yjjemx":yjjemx, "rfxmsfxx.sfxmlxdbh":sfxmlxdbh},
+				error: function () {
+					$.messager.alert('错误', '提交出错！');
+				},
+				success: function (data) {
+					if (data.result) {
+						abc="1";
+						$.messager.confirm("提交","确定提交吗?",function(result){
+							if(result){
 								document.myform1.action="rfxmSfxxEdit1.action";
 								document.myform1.submit();
-			<%--$.ajax({--%>
-			<%--	async: false,--%>
-			<%--	url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action?flag=edit",--%>
-			<%--	type: 'post',--%>
-			<%--	dataType: 'json',--%>
-			<%--	async: false,--%>
-			<%--	data: {rfxmid : "${rfxm.id}", "ids" : "${rfxm.id}","rfxmsfxx.id":ids, "rfxmsfxx.cnjfhj":cnjfhj, "rfxmsfxx.yzsqy":yzsqy, "rfxmsfxx.dsdw":dsdw, "rfxmsfxx.sfxmmc":sfxmmc, "rfxmsfxx.shbm":shbm},--%>
-			<%--	error: function () {--%>
-			<%--		$.messager.alert('错误', '提交出错！');--%>
-			<%--	},--%>
-			<%--	success: function (data) {--%>
-			<%--		if (data.result) {--%>
-			<%--			abc="1";--%>
-			<%--			$.messager.confirm("提交","确定提交吗?",function(result){--%>
-			<%--				if(result){--%>
-			<%--					--%>
-			<%--				}--%>
-            <%--                parent.close_win();--%>
-            <%--                reloadData();--%>
-			<%--			});--%>
-			<%--		} else {--%>
-			<%--			abc="0";--%>
-			<%--			// $("#yzjg").html('添加失败!'+data.message);--%>
-			<%--			$.messager.alert('错误', '验证失败,'+data.message);--%>
-			<%--			return;--%>
-			<%--		}--%>
-			<%--	}--%>
-			<%--});--%>
-			/*}*/
+							}
+                            parent.close_win();
+                            reloadData();
+						});
+					} else {
+						abc="0";
+						// $("#yzjg").html('添加失败!'+data.message);
+						$.messager.alert('错误', '验证失败,'+data.message);
+						return;
+					}
+				}
+			});
 		}
         function getShbmBySfxmmc() {
             //监测收费项目名称选择框

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp

@@ -424,7 +424,7 @@
 						<table width="100%" border="0">
 							<tr>
 								<td colspan="4" height="100px" style="text-align:center">
-									<c:if test="${rfxmsfxx.status != 0}">
+									<c:if test="${rfxmsfxx.status == 2}">
 										<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">已通过</i><b></b></a>&nbsp;
 										<%--<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">退回中</i><b></b></a>&nbsp;--%>
 									</c:if>

WebRoot/common/successToSelf.jsp

@@ -41,6 +41,7 @@
 					windowId=parent.$("#"+window.name).parent().attr("id");
 
 			}
+			console.log('windowId','<%=windowId%>');
 			parent.close_win('<%=windowId%>');
 			//reloadData('<%=windowId%>');
 		}

src/com/jshx/account/paymentVoucher/web/PaymentVoucherAction.java

@@ -1634,6 +1634,7 @@ public class PaymentVoucherAction extends BaseAction
 				savePaymentVerification(xmxxb, paymentItemHis);
 			}*/
 			this.getResponse().getWriter().println("{\"result1\":\"true\",\"info\":\"查询成功\"}");
+
 			return ;
 		}
 	}

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

@@ -30,7 +30,7 @@
 		<action name="fujiantongbu" class="com.jshx.jfzm.web.JfzmAction" method="fujiantongbu">
 			<interceptor-ref name="tokenInterceptor" />
 			<interceptor-ref name="coreStack" />
-			<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_jfzm</result>
+			<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_jfzm1</result>
 			<result name="invalid.token">/invalid.jsp</result>
 		</action>
 

src/com/jshx/jfzm/web/JfzmAction.java

@@ -18,7 +18,9 @@ import com.jshx.rfxm.entity.RfxmSfxx;
 import com.jshx.rfxm.service.RfxmService;
 import com.jshx.rfxm.service.RfxmSfxxService;
 import com.jshx.wwjdclinfo.entity.Wwjdclinfo;
+import com.jshx.wwjdclinfo.service.WwjdclinfoService;
 import com.jshx.wwsqys.entity.Wwsqys;
+import com.jshx.wwsqys.service.WwsqysService;
 import com.jshx.xmxxb.entity.Xmxxb;
 import com.jshx.xmxxb.service.XmxxbService;
 import com.jshx.zsdw.service.ZsdwService;
@@ -46,6 +48,10 @@ public class JfzmAction extends BaseAction {
     XmxxbService xmxxbService;
     @Autowired
     PaymentItemHisService paymentItemHisService;
+    @Autowired
+    private WwsqysService wwsqysService;
+    @Autowired
+    private WwjdclinfoService wwjdclinfoService;
 
 
     @Autowired
@@ -180,7 +186,7 @@ public class JfzmAction extends BaseAction {
     }
 
     public String fujian() {
-
+        xmxxb = xmxxbService.getBySlbh(xmxxb.getSlbh());
         return EDIT;
     }
 
@@ -195,6 +201,7 @@ public class JfzmAction extends BaseAction {
         String fileName1="";
         String rubiaopath ="";
         //id : uploadName;ids:uploadShowName
+        String ids = "一般缴款书";
         if(file!=null && StringUtil.isNotEmpty(id))
         {
             //TODO 上传文件
@@ -205,46 +212,46 @@ public class JfzmAction extends BaseAction {
             path = path.replaceAll("\\\\", "/").trim();
             fileName1 = FileUtils.uploadFile(file,id, path);
         }
-//        Wwjdclinfo wwjdclinfo = new Wwjdclinfo();
-//        wwjdclinfo.setDeptId(this.getLoginUserDepartmentId());
-//        wwjdclinfo.setDelFlag(0);
-
-//        xmxxb = xmxxbService.getByXxylb(xmxxb.getXxylb());
-////			List<Wwsqys> ls = wwsqysService.findxxylb(xmxxb.getXxylb());
-//        if(xmxxb != null && "9".equals(xmxxb.getHfsz()))
-//        {
-//            List<Wwsqys> wwsqyss = wwsqysService.findxxylb(xmxxb.getXxylb());
-//            wwjdclinfo.setWwsqbh(wwsqyss.get(0).getWwsqbh());
-//        }
-//        else
-//        {
-//            wwjdclinfo.setWwsqbh("xxsbxm");
-//        }
-//
-//        wwjdclinfo.setScdz(rubiaopath);
-//        wwjdclinfo.setScwjm(id);
-//        wwjdclinfo.setFjqm(ids);
-////		wwjdclinfo.setWwsqbh(wwsqys.getWwsqbh());
-//        wwjdclinfo.setXxylb(xmxxb.getXxylb());
-//        //查询表中是否存在，若存在则覆盖
-//        Map<String, Object> paraMap = new HashMap<String, Object>();
-//        Pagination pagination =new Pagination(1,100);
-//        paraMap.put("xxylb",xmxxb.getXxylb());
-//        paraMap.put("fjqm",ids);
-//        pagination = wwjdclinfoService.findByPage(pagination,paraMap);
-//        List<Wwjdclinfo> wwjdclinfos = pagination.getListOfObject();
-//        if(CollectionUtils.isEmpty(wwjdclinfos))
-//        {
-//            wwjdclinfoService.save(wwjdclinfo);
-//        }
-//        else
-//        {
-//            Wwjdclinfo wwjdclinfo1 = wwjdclinfos.get(0);
-//            wwjdclinfo1.setFjqm(ids);
-//            wwjdclinfo1.setScwjm(id);
-//            wwjdclinfo1.setScdz(rubiaopath);
-//            wwjdclinfoService.update(wwjdclinfo1);
-//        }
+        Wwjdclinfo wwjdclinfo = new Wwjdclinfo();
+        wwjdclinfo.setDeptId(this.getLoginUserDepartmentId());
+        wwjdclinfo.setDelFlag(0);
+
+        xmxxb = xmxxbService.getByXxylb(xmxxb.getXxylb());
+//			List<Wwsqys> ls = wwsqysService.findxxylb(xmxxb.getXxylb());
+        if(xmxxb != null && "9".equals(xmxxb.getHfsz()))
+        {
+            List<Wwsqys> wwsqyss = wwsqysService.findxxylb(xmxxb.getXxylb());
+            wwjdclinfo.setWwsqbh(wwsqyss.get(0).getWwsqbh());
+        }
+        else
+        {
+            wwjdclinfo.setWwsqbh("xxsbxm");
+        }
+
+        wwjdclinfo.setScdz(rubiaopath);
+        wwjdclinfo.setScwjm(id);
+        wwjdclinfo.setFjqm(ids);
+//		wwjdclinfo.setWwsqbh(wwsqys.getWwsqbh());
+        wwjdclinfo.setXxylb(xmxxb.getXxylb());
+        //查询表中是否存在，若存在则覆盖
+        Map<String, Object> paraMap = new HashMap<String, Object>();
+        Pagination pagination =new Pagination(1,100);
+        paraMap.put("xxylb",xmxxb.getXxylb());
+        paraMap.put("fjqm",ids);
+        pagination = wwjdclinfoService.findByPage(pagination,paraMap);
+        List<Wwjdclinfo> wwjdclinfos = pagination.getListOfObject();
+        if(CollectionUtils.isEmpty(wwjdclinfos))
+        {
+            wwjdclinfoService.save(wwjdclinfo);
+        }
+        else
+        {
+            Wwjdclinfo wwjdclinfo1 = wwjdclinfos.get(0);
+            wwjdclinfo1.setFjqm(ids);
+            wwjdclinfo1.setScwjm(id);
+            wwjdclinfo1.setScdz(rubiaopath);
+            wwjdclinfoService.update(wwjdclinfo1);
+        }
         return RELOAD;
     }
 

src/com/jshx/rfxm/web/RfxmAction.java

 package com.jshx.rfxm.web;
 
-import com.jshx.account.paymentVoucher.service.PaymentVoucherService;
-import com.jshx.account.paymentVoucherHis.service.PaymentVoucherHisService;
-import com.jshx.billManager.entity.Indeticur;
-import com.jshx.billManager.service.BillManagerService;
 import com.jshx.common.utils.Constant;
 import com.jshx.common.utils.FileUtils;
 import com.jshx.core.base.action.BaseAction;
@@ -229,7 +225,13 @@ public class RfxmAction extends BaseAction
 
 	private String urldz;
 	private List<File> file1 ;
+	private List<File> file2 ;
+	private List<File> file3 ;
+	private List<File> file4 ;
 	private List<String> file1FileName ;
+	private List<String> file2FileName ;
+	private List<String> file3FileName ;
+	private List<String> file4FileName ;
 	private String allFileName;
 	private String originFileName;
 
@@ -376,6 +378,22 @@ public class RfxmAction extends BaseAction
 		pagination = rfxmSfxxService.findByPage(pagination, paraMap);
 
 		rfxm = rfxmService.getById(ids);
+		if(pagination.totalCount > 0) {
+			//如果缴费金额为0（或0.0、0.00），则反馈单编号应为空缺。如果缴费金额不为0，则反馈单编号与联系单编号相同。
+			RfxmSfxx s = (RfxmSfxx) pagination.list.get(0);
+			try {
+				double b = Double.parseDouble(s.getYjjemx());
+				if(b != 0) {
+					s.setZslxdbh(s.getSfxmlxdbh());
+				} else {
+					s.setSfxmlxdbh("");
+					s.setZslxdbh("");
+				}
+			} catch (Exception e) {
+				s.setSfxmlxdbh("");
+				s.setZslxdbh("");
+			}
+		}
 		if(!TextUtils.isEmpty(rfxm.getPaymentHisId())) {
 			PaymentItemHis paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
 			RfxmSfxx sfxx = new RfxmSfxx();
@@ -489,6 +507,9 @@ public class RfxmAction extends BaseAction
 				id = rfxm.getId();
 			}
 			rfxm = rfxmService.getById(id);
+			Map<String, Object> paraMap2 = new HashMap<>();
+			paraMap2.put("rfxmid", rfxm.getId());
+			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap2);
 			if(rfxm.getIsRfyz() == 1) {
 				rfxm.setEnableRfyz(0);
 			} else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
@@ -506,7 +527,7 @@ public class RfxmAction extends BaseAction
 			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap);
 			paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
 			paymentItemHis.setSlbh(rfxm.getJktzsbh());
-
+			paymentItemHis.setZsdw("南京市城市建设费用征收服务中心");
 
 			Map<String, Object> paramMap = new HashMap<>();
 			List<String> remarks = yzssfglService.getJktzsRemarks(paramMap);
@@ -632,7 +653,7 @@ public class RfxmAction extends BaseAction
 					sfxx.setStatus(2);
 				} else if(sfxx.getTqjn() != 1) {
 					sfxx.setStatus(2);
-				} else if(sfxx.getStatus() == 2) {//提前选是，并且复核过1次，页面显示补录
+				} else if(sfxx.getStatus() == 1) {//提前选是，并且复核过1次，页面显示补录
 					sfxx.setStatus(2);
 				} else {//提前选是，1次未复核
 					sfxx.setStatus(1);
@@ -907,14 +928,10 @@ public class RfxmAction extends BaseAction
 			JSONObject jsonObject = JSONObject.fromObject(allFileName);
 			JSONObject jsonObject1= JSONObject.fromObject(originFileName);
 			String fileName = "";
-			if(file1!=null)
-			{
-				for(int i = 0 ; i < file1.size() ; i++ )
-				{
-					fileName = FileUtils.uploadFile(file1.get(i),file1FileName.get(i), path,UUID.randomUUID().toString());
+			if(file1 != null && file1.size() > 0) {
+				fileName = FileUtils.uploadFile(file1.get(0),file1FileName.get(0), path,UUID.randomUUID().toString());
 				String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
-					if(i == 0) {
-						rfxmsfxx.setAttachname(file1FileName.get(i));
+				rfxmsfxx.setAttachname(file1FileName.get(0));
 				rfxmsfxx.setUrldz(fileName);
 				rfxmsfxx.setFilePath(path);
 				rfxmsfxx.setAttachType(attachType);
@@ -925,43 +942,55 @@ public class RfxmAction extends BaseAction
 				} else {
 					rfxmsfxx.setShowName("");
 				}
-					} else if(i == 1) {
-						rfxmsfxx.setAttachnameFk(file1FileName.get(i));
+			}
+
+			if(file2 != null && file2.size() > 0) {
+				fileName = FileUtils.uploadFile(file2.get(0),file2FileName.get(0), path,UUID.randomUUID().toString());
+				String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
+				rfxmsfxx.setAttachnameFk(file2FileName.get(0));
 				rfxmsfxx.setUrldzFk(fileName);
 				rfxmsfxx.setFilePathFk(path);
 				rfxmsfxx.setAttachTypeFk(attachType);
 				rfxmsfxx.setXmTypeFk("税务反馈单");
+				//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
 				if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeFk())) {
 					rfxmsfxx.setShowNameFk(rfxmsfxx.getXmTypeFk()+"."+rfxmsfxx.getAttachTypeFk());
 				} else {
 					rfxmsfxx.setShowNameFk("");
 				}
-					} else if(i == 2) {
-						rfxmsfxx.setAttachnameSq(file1FileName.get(i));
+			}
+
+			if(file3 != null && file3.size() > 0) {
+				fileName = FileUtils.uploadFile(file3.get(0),file3FileName.get(0), path,UUID.randomUUID().toString());
+				String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
+				rfxmsfxx.setAttachnameSq(file3FileName.get(0));
 				rfxmsfxx.setUrldzSq(fileName);
 				rfxmsfxx.setFilePathSq(path);
 				rfxmsfxx.setAttachTypeSq(attachType);
 				rfxmsfxx.setXmTypeSq("先行缴纳配套费申请");
+				//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
 				if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeSq())) {
 					rfxmsfxx.setShowNameSq(rfxmsfxx.getXmTypeSq()+"."+rfxmsfxx.getAttachTypeSq());
 				} else {
 					rfxmsfxx.setShowNameSq("");
 				}
-					} else if(i == 3) {
-						rfxmsfxx.setAttachnameZm(file1FileName.get(i));
+			}
+
+			if(file4 != null && file4.size() > 0) {
+				fileName = FileUtils.uploadFile(file4.get(0),file4FileName.get(0), path,UUID.randomUUID().toString());
+				String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
+				rfxmsfxx.setAttachnameZm(file4FileName.get(0));
 				rfxmsfxx.setUrldzZm(fileName);
 				rfxmsfxx.setFilePathZm(path);
 				rfxmsfxx.setAttachTypeZm(attachType);
 				rfxmsfxx.setXmTypeZm("完税证明");
+				//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
 				if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeZm())) {
 					rfxmsfxx.setShowNameZm(rfxmsfxx.getXmTypeZm()+"."+rfxmsfxx.getAttachTypeZm());
 				} else {
 					rfxmsfxx.setShowNameZm("");
 				}
 			}
-
-				}
-			}
 		}catch (Exception e) {
 			logger.error("保存附件失败", e);
 		}
@@ -1074,6 +1103,26 @@ public class RfxmAction extends BaseAction
 			}
 		}
 
+		if(rfxmsfxx == null) {
+			status = false;
+			message = "请添加信息";
+		} else if(rfxmsfxx.getYjjemx() != null) {
+			try {
+				Double.parseDouble(rfxmsfxx.getYjjemx());
+			} catch (Exception e) {
+				status = false;
+				message = "请输入正确的金额";
+			}
+		} else if(!TextUtils.isEmpty(rfxmsfxx.getSfxmlxdbh())) {
+			Map<String, Object> paraMap = new HashMap<>();
+			paraMap.put("sfxmlxdbh", rfxmsfxx.getSfxmlxdbh());
+			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap);
+			if(rfxmSfxx != null && rfxmSfxx.size() > 0) {
+				status = false;
+				message = "收费项目联系单编号重复";
+			}
+		}
+
 		this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
 	}
 
@@ -1197,6 +1246,7 @@ public class RfxmAction extends BaseAction
 	public void rfyz() throws Exception {
 		Rfxm rfxm = rfxmService.getById(ids);
 		rfxm.setIsRfyz(1);
+		rfxm.setJbr(this.getLoginUser().getDisplayName());//盖章的经办人
 		rfxmService.update(rfxm);
 	}
 
@@ -1309,8 +1359,8 @@ public class RfxmAction extends BaseAction
 				rfxm.setSfxmlxdbh(rfxmsfxx.getSfxmlxdbh());
 				rfxmService.update(rfxm);
 
-				sfxx.setStatus(2);
-				sfxx.setUpdateTime(new Date());
+				sfxx.setStatus(1);
+				sfxx.setJbTime(new Date());
 				rfxmSfxxService.update(sfxx);
 			}
 		}