新增文件上产

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

@@ -398,6 +398,9 @@
 									<th width="15">附件:</th>
 									<td width="35%">
 										<a class='' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showName}<b></b></a>&nbsp;
+										<a class='' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showNameFq}<b></b></a>&nbsp;
+										<a class='' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showNameSq}<b></b></a>&nbsp;
+										<a class='' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >${rfxmsfxx.showNameZm}<b></b></a>&nbsp;
 									</td>
 								</tr>
 							</table>

src/com/jshx/rfxm/entity/RfxmSfxx.java

@@ -91,34 +91,9 @@ public class RfxmSfxx extends BaseModel {
      */
     private Integer statusCnjfhj;
 
-    /**
-     * 上传文件地址
-     */
-    private String urldz;
-
-    /**
-     * 页面显示名称
-     */
-    private String showName;
 
-    /**
-     * 文件名称
-     */
-    private String attachname;
 
-    /**
-     * 绝对路径
-     */
-    private String filePath;
 
-    /**
-     * 附件类型
-     */
-    private String attachType;
-    /**
-     *
-     */
-    private String xmType;
 
     /**
      * rfxmjktzs表关联字段,缴费代码唯一编号
@@ -239,8 +214,65 @@ public class RfxmSfxx extends BaseModel {
      */
     private Integer statusJBFH;
 
+
     //----- 2019-6-27 end -----------------------------------
 
+
+//    文件上传start
+    //征收联系单
+    /**
+     * 上传文件地址
+     */
+    private String urldz;
+
+    /**
+     * 文件名称
+     */
+    private String attachname;
+
+    /**
+     * 绝对路径
+     */
+    private String filePath;
+
+    /**
+     * 附件类型
+     */
+    private String attachType;
+    /**
+     *
+     */
+    private String xmType;
+    /**
+     * 页面显示名称
+     */
+    private String showName;
+
+    //税务反馈单
+    private String urldzFk;
+    private String attachnameFk;
+    private String filePathFk;
+    private String attachTypeFk;
+    private String xmTypeFk;
+    private String showNameFk;
+
+    //先行缴纳配套费申请
+    private String urldzSq;
+    private String attachnameSq;
+    private String filePathSq;
+    private String attachTypeSq;
+    private String xmTypeSq;
+    private String showNameSq;
+
+    //完税证明
+    private String urldzZm;
+    private String attachnameZm;
+    private String filePathZm;
+    private String attachTypeZm;
+    private String xmTypeZm;
+    private String showNameZm;
+//    文件上传end
+
     public RfxmSfxx() {}
 
     // 2019-6-27 v4
@@ -742,4 +774,148 @@ public class RfxmSfxx extends BaseModel {
     public void setJfdwmc(String jfdwmc) {
         this.jfdwmc = jfdwmc;
     }
+
+    public String getUrldzFk() {
+        return urldzFk;
+    }
+
+    public void setUrldzFk(String urldzFk) {
+        this.urldzFk = urldzFk;
+    }
+
+    public String getAttachnameFk() {
+        return attachnameFk;
+    }
+
+    public void setAttachnameFk(String attachnameFk) {
+        this.attachnameFk = attachnameFk;
+    }
+
+    public String getFilePathFk() {
+        return filePathFk;
+    }
+
+    public void setFilePathFk(String filePathFk) {
+        this.filePathFk = filePathFk;
+    }
+
+    public String getAttachTypeFk() {
+        return attachTypeFk;
+    }
+
+    public void setAttachTypeFk(String attachTypeFk) {
+        this.attachTypeFk = attachTypeFk;
+    }
+
+    public String getXmTypeFk() {
+        return xmTypeFk;
+    }
+
+    public void setXmTypeFk(String xmTypeFk) {
+        this.xmTypeFk = xmTypeFk;
+    }
+
+    public String getUrldzSq() {
+        return urldzSq;
+    }
+
+    public void setUrldzSq(String urldzSq) {
+        this.urldzSq = urldzSq;
+    }
+
+    public String getAttachnameSq() {
+        return attachnameSq;
+    }
+
+    public void setAttachnameSq(String attachnameSq) {
+        this.attachnameSq = attachnameSq;
+    }
+
+    public String getFilePathSq() {
+        return filePathSq;
+    }
+
+    public void setFilePathSq(String filePathSq) {
+        this.filePathSq = filePathSq;
+    }
+
+    public String getAttachTypeSq() {
+        return attachTypeSq;
+    }
+
+    public void setAttachTypeSq(String attachTypeSq) {
+        this.attachTypeSq = attachTypeSq;
+    }
+
+    public String getXmTypeSq() {
+        return xmTypeSq;
+    }
+
+    public void setXmTypeSq(String xmTypeSq) {
+        this.xmTypeSq = xmTypeSq;
+    }
+
+    public String getUrldzZm() {
+        return urldzZm;
+    }
+
+    public void setUrldzZm(String urldzZm) {
+        this.urldzZm = urldzZm;
+    }
+
+    public String getAttachnameZm() {
+        return attachnameZm;
+    }
+
+    public void setAttachnameZm(String attachnameZm) {
+        this.attachnameZm = attachnameZm;
+    }
+
+    public String getFilePathZm() {
+        return filePathZm;
+    }
+
+    public void setFilePathZm(String filePathZm) {
+        this.filePathZm = filePathZm;
+    }
+
+    public String getAttachTypeZm() {
+        return attachTypeZm;
+    }
+
+    public void setAttachTypeZm(String attachTypeZm) {
+        this.attachTypeZm = attachTypeZm;
+    }
+
+    public String getXmTypeZm() {
+        return xmTypeZm;
+    }
+
+    public void setXmTypeZm(String xmTypeZm) {
+        this.xmTypeZm = xmTypeZm;
+    }
+
+    public String getShowNameZm() {
+        return showNameZm;
+    }
+
+    public void setShowNameZm(String showNameZm) {
+        this.showNameZm = showNameZm;
+    }
+
+    public String getShowNameFk() {
+        return showNameFk;
+    }
+
+    public void setShowNameFk(String showNameFk) {
+        this.showNameFk = showNameFk;
+    }
+
+    public String getShowNameSq() {
+        return showNameSq;
+    }
+
+    public void setShowNameSq(String showNameSq) {
+        this.showNameSq = showNameSq;
+    }
 }

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

@@ -2051,26 +2051,53 @@ public class RfxmAction extends BaseAction
 				{
 					fileName = FileUtils.uploadFile(file1.get(i),file1FileName.get(i), path,UUID.randomUUID().toString());
 					String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
-                    /*paraMapfj.put("attachType", attachType);
-                    paraMapfj.put("bizrowid", rfxm.getId()+"-"+rfxmsfxx.getSfxmmc());//无项目编号主键,先用手动建档的ID
-                    paraMapfj.put("xmType", "收费信息");
+					if(i == 0) {
+						rfxmsfxx.setAttachname(file1FileName.get(i));
+						rfxmsfxx.setUrldz(fileName);
+						rfxmsfxx.setFilePath(path);
+						rfxmsfxx.setAttachType(attachType);
+						rfxmsfxx.setXmType("征收联系单");
+						//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
+						if (StringUtils.isNotBlank(rfxmsfxx.getAttachType())) {
+							rfxmsfxx.setShowName(rfxmsfxx.getXmType()+"."+rfxmsfxx.getAttachType());
+						} else {
+							rfxmsfxx.setShowName("");
+						}
+					} else if(i == 1) {
+						rfxmsfxx.setAttachnameFk(file1FileName.get(i));
+						rfxmsfxx.setUrldzFk(fileName);
+						rfxmsfxx.setFilePathFk(path);
+						rfxmsfxx.setAttachTypeFk(attachType);
+						rfxmsfxx.setXmTypeFk("税务反馈单");
+						if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeFk())) {
+							rfxmsfxx.setShowNameFk(rfxmsfxx.getXmTypeFk()+"."+rfxmsfxx.getAttachTypeFk());
+						} else {
+							rfxmsfxx.setShowNameFk("");
+						}
+					} else if(i == 2) {
+						rfxmsfxx.setAttachnameSq(file1FileName.get(i));
+						rfxmsfxx.setUrldzSq(fileName);
+						rfxmsfxx.setFilePathSq(path);
+						rfxmsfxx.setAttachTypeSq(attachType);
+						rfxmsfxx.setXmTypeSq("先行缴纳配套费申请");
+						if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeSq())) {
+							rfxmsfxx.setShowNameSq(rfxmsfxx.getXmTypeSq()+"."+rfxmsfxx.getAttachTypeSq());
+						} else {
+							rfxmsfxx.setShowNameSq("");
+						}
+					} else if(i == 3) {
+						rfxmsfxx.setAttachnameZm(file1FileName.get(i));
+						rfxmsfxx.setUrldzZm(fileName);
+						rfxmsfxx.setFilePathZm(path);
+						rfxmsfxx.setAttachTypeZm(attachType);
+						rfxmsfxx.setXmTypeZm("完税证明");
+						if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeZm())) {
+							rfxmsfxx.setShowNameZm(rfxmsfxx.getXmTypeZm()+"."+rfxmsfxx.getAttachTypeZm());
+						} else {
+							rfxmsfxx.setShowNameZm("");
+						}
+					}
 
-                    FawenAttach att = new FawenAttach();
-                    att.setDelFlag(0);*/
-					//					att.setAttachname(file1FileName.get(i));
-					rfxmsfxx.setAttachname(file1FileName.get(i));
-
-					//					att.setAttachpath(fileName);
-					rfxmsfxx.setUrldz(fileName);
-					//					att.setBizrowid(rfxmid+"-"+rfxmsfxx.getSfxmmc());
-					rfxmsfxx.setFilePath(path);
-					//					att.setCreateTime(new Date());
-					rfxmsfxx.setAttachType(attachType);
-					//				att.setAttachType(attachType);
-					//				att.setXmType("收费信息");
-					rfxmsfxx.setXmType("收费信息");
-					//								att.setWdno(jsonObject1.getString(file1FileName.get(i)));
-					//				fawenAttachService.save(att);
 				}
 			}
 		}catch (Exception e) {
@@ -2146,12 +2173,7 @@ public class RfxmAction extends BaseAction
 		//代收单位
 		rfxmsfxx.setDsdw(yzssfgl.getDsdw());*/
 
-		//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
-        if (StringUtils.isNotBlank(rfxmsfxx.getAttachType())) {
-            rfxmsfxx.setShowName(rfxmsfxx.getSfxmmc()+"."+rfxmsfxx.getAttachType());
-        } else {
-            rfxmsfxx.setShowName("");
-        }
+
         if (rfxmsfxx.getYjjemx().contains(",")/* || rfxmsfxx.getYjjemx().contains("，")*/) {
 			String replaceAll = rfxmsfxx.getYjjemx().replaceAll(",", "");
 			rfxmsfxx.setYjjemx(replaceAll);