流程草稿增加附件保存

src/main/bpm/com/yw/bpm/core/service/CoreServiceImpl.java

@@ -127,6 +127,7 @@ public class CoreServiceImpl implements CoreService {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		bpmFlowDao.deleteFileById(flowInstance.getInsId());
 		// 保存上传的附件
 		for (FileInfo info : fileList) {
 			bpmFlowDao.createFileInfo(info);
@@ -3092,6 +3093,7 @@ public class CoreServiceImpl implements CoreService {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		bpmFlowDao.deleteFileById(flowInstance.getInsId());
 		// 保存上传的附件
 		for (FileInfo info : fileList) {
 			bpmFlowDao.createFileInfo(info);

src/main/bpm/com/yw/bpm/instance/action/FlowAction.java

@@ -2670,7 +2670,7 @@ public class FlowAction extends BaseAction {
 
 		String[] fileIds = request.getParameterValues("fileId");
 		List<FileInfo> fileList = new ArrayList<FileInfo>();
-		/*if (fileIds != null) {
+		if (fileIds != null) {
 			for (String file : fileIds) {
 				if (!"".equals(file)) {
 					FileInfo info = new FileInfo();
@@ -2683,7 +2683,7 @@ public class FlowAction extends BaseAction {
 					fileList.add(info);
 				}
 			}
-		}*/
+		}
 		List<TacheInstance> nextTinstanceList = new ArrayList<TacheInstance>();
 		Set<String> keySet = map.keySet();
 		for (String key : keySet) {
@@ -2806,12 +2806,12 @@ public class FlowAction extends BaseAction {
 		request.setAttribute("insId", insId);
 		request.setAttribute("flow", result.get("flow"));
 		request.setAttribute("fileList", result.get("fileList"));
-		/*List<FileInfo> fileList = (List) result.get("fileList");
+		List<FileInfo> fileList = (List) result.get("fileList");
 		StringBuffer files = new StringBuffer("");
 		for(FileInfo file : fileList){
-			files.append(file.getIfileId()+",");
+			files.append(file.getFileId().getUniversalid()+",");
 		}
-		request.setAttribute("fileId", files.toString());*/
+		request.setAttribute("fileId", files.toString());
 		String n_control = flow.getN_control();
 		if(n_control != null && n_control.equals("1")) {
 			this.path = "/yw/bpm/instance/editDraftFlow_v_2_1.jsp";

src/main/bpm/com/yw/bpm/instance/dao/FlowDao.java

@@ -634,4 +634,6 @@ public interface FlowDao {
 	public int updateInsSubName2OfFlowInstance(FlowInstance finstance);
 
 	public int deleteById(String flowInsId);
+
+	public int deleteFileById(String insId);
 }

src/main/bpm/com/yw/bpm/instance/dao/FlowDaoImpl.java

@@ -2696,4 +2696,10 @@ public class FlowDaoImpl implements FlowDao {
 		String sql = "DELETE FROM bpm_flow_instance WHERE l_ins_id=?";
 		return jdbcTemplate.update(sql, new Object[] { flowInsId });
 	}
+
+	@Override
+	public int deleteFileById(String insId) {
+		String sql = "DELETE FROM bpm_file WHERE l_ins_id=?";
+		return jdbcTemplate.update(sql, new Object[] { insId });
+	}
 }

src/main/webapp/yw/bpm/customfrom/customEditDraft.jsp

@@ -215,6 +215,9 @@
 											<jsp:param name="isView" value="1" />
 											<jsp:param name="size" value="20" />
 											<jsp:param name="definedCss" value="fileUploadCss" />
+											<jsp:param name="documentId" value="${requestScope.fileId }"/>
+											<jsp:param name="isDownload" value="1"/>
+											<jsp:param name="isDelFile" value="1"/>
 										</jsp:include>
 									</td>
 								</tr>

src/main/webapp/yw/bpm/instance/editDraftFlow_v_2_1.jsp

@@ -260,62 +260,13 @@ span[id$="_filespan"] ul{
 							<tr>
 								<td class="l-table-edit-text">附件<span id="delLink"><% if(delfileList.size()>0) {%>(<a id="ahide" onclick="delfileshownhide();">查看已删除附件</a>)<%} %></span>：
 								</td>
-								<td class="l-table-edit-td">
-
-								<% if(allfileList.size()>0) {%>
-										<table>
-											<tr>
-												<td width="20%">上传环节</td>
-												<td width="30%">上传人</td>
-												<td width="50%">附件</td>
-											</tr>
-									    <% if(fileList.size()>0) {%>
-											<%
-											   for(FileInfo file:fileList){%>
-												   <tr id="<%=file.getIfileId()%>">
-														<td width="20%"><%=file.getTinsId().getTmodelId().getTmodelName() %></td>
-														<td width="30%"><%=file.getCreator().getUsername() %>(<%=file.getTinsId().getFinishdate().toString().substring(0, 19) %>)</td>
-														<td width="50%">
-															<% if(file.getCreator().getUserId().equals(String.valueOf(oasession.getLoginID()))){%>
-																<span id="<%=file.getIfileId()%>_filespan" class="l-file" len="15"><%=file.getFileId().getUniversalid() %></span>
-																<span id="<%=file.getIfileId()%>_span">
-																	&nbsp;&nbsp;<img width="12" height="12" title="删除" style="cursor: pointer;margin-bottom:-3px;" onclick="delFile('<%=file.getIfileId()%>')" src="/shares/images/no.png" complete="complete"/>
-																</span>
-															<%}else {%>
-															<span class="l-file" len="15"><%=file.getFileId().getUniversalid() %></span>
-															<%} %>
-															<%if(file.getTinsId().getTmodelId().getTmodelId().equals(tacheModel.getTmodelId())){ %>
-																<input type="hidden" id="<%=file.getIfileId()%>_tache" class="tache_file" value="<%=file.getIfileId() %>">
-															<%} %>
-													 	</td>
-												   </tr>
-											 <% }%>
-										<%} %>
-										</table>
-										<div id="delfiles" style="display: none;">
-										<table id="delfiletable">
-										 <% if(delfileList.size()>0) {%>
-											<% for(FileInfo file:delfileList){%>
-												   <tr id="<%=file.getIfileId()%>">
-														<td width="20%"><%=file.getTinsId().getTmodelId().getTmodelName() %></td>
-														<td width="30%"><%=file.getCreator().getUsername() %>(<%=file.getTinsId().getFinishdate().toString().substring(0, 19) %>)</td>
-														<td width="50%">
-															<span class="l-file" len="15"><%=file.getFileId().getUniversalid() %></span>
-															<span id="<%=file.getIfileId()%>_span">
-															<font color="red">(已删除，删除时间：<%=file.getDelTime().toString().substring(0, 19) %>)</font>
-															</span>
-													 	</td>
-												   </tr>
-											 <% }%>
-										 <% }%>
-										 </table>
-										</div>
-									<% }%>
+								<td class="l-table-edit-td"> 
 									<c:if test="${requestScope.tmodel.isOffice.value == 1 }">
 										<jsp:include page="/include/file.jsp">
 											<jsp:param name="fieldName" value="fileId"/>
 											<jsp:param name="folder" value="flow"/>
-											<jsp:param name="documentId" value=""/>
+											<jsp:param name="documentId" value="${requestScope.fileId }"/>
+											<jsp:param name="isDownload" value="1"/>
 											<jsp:param name="size" value="20"/>
 											<jsp:param name="isDelFile" value="1"/>
 										</jsp:include>