修改下载入参

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

@@ -23,11 +23,12 @@
             return curTabWin;
         }
         <%-- 下载缴费信息附件 --%>
-        function opendoc(id)
+        function opendoc(index,id)
         {
             console.log(id);
+            console.log("hello");
             console.log($("#id").val());
-            window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id;
+            window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id + "&downloadIndex=" + index;
         }
         var index4Sf = 1;
        /* $(document).ready(function () {
@@ -398,10 +399,10 @@
 								<tr>
 									<th width="15">附件:</th>
 									<td width="35%">
-										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showName}<b></b></a>&nbsp;
-										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showNameFq}<b></b></a>&nbsp;
-										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showNameSq}<b></b></a>&nbsp;
-										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showNameZm}<b></b></a>&nbsp;
+										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(0,'"+rfxmsfxx.id+"') >${rfxmsfxx.showName}<b></b></a>&nbsp;
+										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(1,'"+rec.id+"') >${rfxmsfxx.showNameFk}<b></b></a>&nbsp;
+										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(2,'"+rec.id+"') >${rfxmsfxx.showNameSq}<b></b></a>&nbsp;
+										<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(3,'"+rec.id+"') >${rfxmsfxx.showNameZm}<b></b></a>&nbsp;
 									</td>
 								</tr>
 							</table>

src/com/jshx/paymentItemHis/entity/PaymentItemHis.java

@@ -9,8 +9,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import com.jshx.rfdz.entity.Rfdz;
-
 import com.jshx.core.base.entity.BaseModel;
 import com.jshx.module.admin.entity.User;
 import com.jshx.xmxxb.entity.Xmxxb;
@@ -44,13 +42,6 @@ public class PaymentItemHis extends BaseModel
 	
 	private Xmxxb xmxxb;
 
-	/**
-	 * 人防到账表主键
-	 */
-	private String rfdzzj;
-
-	private Rfdz rfdz;
-
 	/**
 	 * 受理编号
 	 */
@@ -949,23 +940,4 @@ public class PaymentItemHis extends BaseModel
 	public void setIsCwyz(String isCwyz) {
 		this.isCwyz = isCwyz;
 	}
-
-	@Column(name="RFDZZJ")
-	public String getRfdzzj() {
-		return rfdzzj;
-	}
-
-	public void setRfdzzj(String rfdzzj) {
-		this.rfdzzj = rfdzzj;
-	}
-
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity= Rfdz.class)
-	@JoinColumn(name = "RFDZZJ",updatable=false,insertable=false)
-	public Rfdz getRfdz() {
-		return rfdz;
-	}
-
-	public void setRfdz(Rfdz rfdz) {
-		this.rfdz = rfdz;
-	}
 }

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

@@ -1551,32 +1551,11 @@ public class RfxmAction extends BaseAction
 			paraMap.put("rfxmid", id);
 			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap);
 			//设置满7个缴费信息记录,没有数据的添加备注 start 2019-6-25
-			Map<String,Object> tempMap = new HashMap<>();
-			tempMap.put("考古调查、勘探、发掘费用", "考古调查、勘探、发掘费用");
-			tempMap.put("城市基础设施配套费", "城市基础设施配套费");
-			tempMap.put("防空地下室易地建设费", "防空地下室易地建设费");
-			tempMap.put("水土保持补偿费", "水土保持补偿费");
-			tempMap.put("城镇垃圾处理费-工程渣土", "城镇垃圾处理费-工程渣土");
-			tempMap.put("城市道路占用挖掘费", "城市道路占用挖掘费");
-			tempMap.put("城市市政公用设施园林绿化损坏赔偿费-树木砍伐、移植补偿费", "城市市政公用设施园林绿化损坏赔偿费-树木砍伐、移植补偿费");
-			tempMap.put("城市道路占用费-次干道挖掘、堆放", "城市道路占用费-次干道挖掘、堆放");
-			for (RfxmSfxx sfxx : rfxmSfxx) {
-				if (tempMap.containsKey(sfxx.getSfxmmc())) {
-					tempMap.remove(sfxx.getSfxmmc());
-				}
-			}
 			Map<String, Object> paramMap = new HashMap<>();
 			List<String> remarks = yzssfglService.getJktzsRemarks(paramMap);
 			String remark = StringUtils.isBlank(remarks.get(0))?"此轮不涉及":remarks.get(0);
 			//将已存在的复制到打印用的list中
 			rfxmSfxx4Print.addAll(rfxmSfxx);
-			//得到不包含的Map,遍历
-			for (String s : tempMap.keySet()) {
-				RfxmSfxx emptyObject = new RfxmSfxx();
-				emptyObject.setSfxmmc(s);
-				emptyObject.setBeizhu(remark);
-				rfxmSfxx4Print.add(emptyObject);
-			}
 
 			//end 2019-6-25
 			if (this.getLoginUser() == null) {