修改问题

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

@@ -202,10 +202,10 @@
                     {field:'jbTime',title:'录入时间',width:fixWidth(0.16)},
                     {field:'status',title:'是否复核',width:160,formatter:function (value, rec) {
 							if (rec.status==0) {
-							    return "否";
+							    return "待复核";
 							}
 							if (rec.status==1 || rec.status == 2) {
-							    return "是";
+								return "是";
 							}
                         }},
                 ]],

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

@@ -50,6 +50,51 @@
 
                 }
             });
+
+			$("input[name=file2]").each(function(){
+				if($(this).val()!="") {
+					var name =  $(this).parent().siblings().find("input").val();
+					flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
+					if(!flag1)
+					{
+						boolean1= false;
+						// $.messager.alert('提示',"请在"+name+"选中复选框");
+						message = "请选中复选框";
+						return;
+					}
+
+				}
+			});
+
+			$("input[name=file3]").each(function(){
+				if($(this).val()!="") {
+					var name =  $(this).parent().siblings().find("input").val();
+					flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
+					if(!flag1)
+					{
+						boolean1= false;
+						// $.messager.alert('提示',"请在"+name+"选中复选框");
+						message = "请选中复选框";
+						return;
+					}
+
+				}
+			});
+
+			$("input[name=file4]").each(function(){
+				if($(this).val()!="") {
+					var name =  $(this).parent().siblings().find("input").val();
+					flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
+					if(!flag1)
+					{
+						boolean1= false;
+						// $.messager.alert('提示',"请在"+name+"选中复选框");
+						message = "请选中复选框";
+						return;
+					}
+
+				}
+			});
             $("input[name=id]:checked").each(function(){
                 var name = $(this).val();
                 value = $(this).parent().siblings().find("input").val();
@@ -355,21 +400,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>

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

@@ -157,7 +157,7 @@ public class JfzmAction extends BaseAction {
 
                 if(r.getIsRfyz() != null && r.getIsRfyz() == 1) {//人防用章后可以同步
                     r.setEnableTb(1);
-                } else if(sfxx != null && sfxx.getTqjn() != null &&  sfxx.getTqjn() == 1 && sfxx.getStatus() == 1) {//显示补录时可以同步
+                } else if(sfxx != null && sfxx.getTqjn() != null &&  sfxx.getTqjn() == 1 && sfxx.getStatus() != 0) {//显示补录时可以同步
                     r.setEnableTb(1);
                 } else {
                     r.setEnableTb(0);

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

@@ -405,7 +405,7 @@ public class RfxmAction extends BaseAction
 			sfxx.setUpdateTime(paymentItemHis.getUpdateTime());
 			sfxx.setCnjfhj(rfxm.getPaymentLink() != null && rfxm.getPaymentLink() == 3 ? "30日内" : "施工许可前");
 			sfxx.setStatus(2);
-			sfxx.setSfxxjbr(paymentItemHis.getJbr());
+			sfxx.setSfxxjbr("系统");
 			sfxx.setPaymentHisId(paymentItemHis.getId());
 			pagination.list.add(0,sfxx);
 			pagination.totalCount ++;
@@ -514,7 +514,9 @@ public class RfxmAction extends BaseAction
 				rfxm.setEnableRfyz(0);
 			} else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
 				rfxm.setEnableRfyz(0);
-			} else if(rfxmSfxx == null || rfxmSfxx.size() == 0) {
+			} else if(rfxm.getIsSbj() == 0) {
+				rfxm.setEnableRfyz(1);
+			} else if((rfxmSfxx == null || rfxmSfxx.size() == 0)) {
 				rfxm.setEnableRfyz(0);
 			} else if(rfxmSfxx.get(0).getStatus() != 2) {
 				rfxm.setEnableRfyz(0);
@@ -1106,20 +1108,23 @@ 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.getYjjemx())) {
+				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 = "收费项目联系单编号重复";
+			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 = "收费项目联系单编号重复";
+				}
 			}
 		}
 
@@ -1485,6 +1490,54 @@ public class RfxmAction extends BaseAction
 		this.file1FileName = file1FileName;
 	}
 
+	public List<File> getFile2() {
+		return file2;
+	}
+
+	public void setFile2(List<File> file2) {
+		this.file2 = file2;
+	}
+
+	public List<File> getFile3() {
+		return file3;
+	}
+
+	public void setFile3(List<File> file3) {
+		this.file3 = file3;
+	}
+
+	public List<File> getFile4() {
+		return file4;
+	}
+
+	public void setFile4(List<File> file4) {
+		this.file4 = file4;
+	}
+
+	public List<String> getFile2FileName() {
+		return file2FileName;
+	}
+
+	public void setFile2FileName(List<String> file2FileName) {
+		this.file2FileName = file2FileName;
+	}
+
+	public List<String> getFile3FileName() {
+		return file3FileName;
+	}
+
+	public void setFile3FileName(List<String> file3FileName) {
+		this.file3FileName = file3FileName;
+	}
+
+	public List<String> getFile4FileName() {
+		return file4FileName;
+	}
+
+	public void setFile4FileName(List<String> file4FileName) {
+		this.file4FileName = file4FileName;
+	}
+
 	public String getAllFileName() {
 		return allFileName;
 	}
@@ -1668,4 +1721,12 @@ public class RfxmAction extends BaseAction
 	public void setPaymentItemHis(PaymentItemHis paymentItemHis) {
 		this.paymentItemHis = paymentItemHis;
 	}
+
+	public int getDownloadIndex() {
+		return downloadIndex;
+	}
+
+	public void setDownloadIndex(int downloadIndex) {
+		this.downloadIndex = downloadIndex;
+	}
 }