调整电子档案备考表,调整案卷信息,备考表文件上传下载模板

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -14,6 +14,7 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -542,6 +543,10 @@ public class WorkProjectNotifyController extends BaseController {
 	@Autowired
 	private TaskFlowService taskFlowService;
 
+	private static String template_path = Global.getProjectTemplatePath()+"咨询工作方案.xlsx";
+	private static String template_name = "咨询工作方案.xlsx";
+
+
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
 		WorkProjectNotify entity = null;
@@ -2208,6 +2213,8 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("110")) {    //项目纸质归档
 					String engineeringId = engineeringService.getEngineeringId("202");
 					boolean flag = false;
+					//
+
 					//通过通知信息id获取项目登记对象
 					ProjectPaperFiling projectPaperFiling = projectPaperFilingService.get(workProjectNotify.getNotifyId());
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectPaperFiling.getProjectId());
@@ -9564,4 +9571,18 @@ public class WorkProjectNotifyController extends BaseController {
 		return "modules/businessQuestions/businessQuestionsForm";
 	}
 
+	/**
+	 * 下载档案备考表模板（废除）
+	 */
+	@RequestMapping(value = "downloadTemplate")
+	public void downloadTemplate(HttpServletRequest request,HttpServletResponse response) {
+		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("档案备考表.docx",request,response);
+		} catch (Exception e) {
+			logger.error("档案备考表下载失败！",e);
+		}
+	}
+
+
 }

src/main/webapp/webpage/modules/iframeView/reference.jsp

@@ -16,7 +16,7 @@
             <div class="form-group layui-row">
                 <div class="layui-item layui-col-sm8 lw6 with-textarea">
                     <div class="layui-input-block" style="margin-left:10px;position: relative">
-                        <textarea placeholder="请输入备考表内容：" path="" id="opinion" class="form-control" rows="4" style="width: 100%;height: 80%;border: 1px solid #f1f1f1;padding: 5px;" maxlength="245"></textarea>
+                        <textarea placeholder="请输入电子档案备考表内容：" path="" id="opinion" class="form-control" rows="4" style="width: 100%;height: 80%;border: 1px solid #f1f1f1;padding: 5px;" maxlength="245"></textarea>
                         <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                         <input type="file" name="upload_files" style="display: none;">
                     </div>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAudit.jsp

@@ -152,6 +152,10 @@
             $("#attachment_file").click();
         }
 
+        function addRefence() {
+			$()
+		}
+
         function addRow(list, idx, tpl, row){
             // var idx1 = $("#workClientLinkmanList tr").length;
             bornTemplete(list, idx, tpl, row, idx);
@@ -1727,7 +1731,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>提交说明</h2></div>
+				<div class="form-group-label"><h2>案卷信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
@@ -1742,6 +1746,121 @@
 				</div>
 			</div>
 
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>备考表文件上传   <a style="color: red;font-size: 12px;">此处上传文件为档案备考表</a></h2></div>
+				<div class="layui-item nav-btns">
+					<a id="reference_btn" class="nav-btn nav-btn-add" title="添加备考表"><i class="fa fa-plus"></i>&nbsp;文件上传</a>
+					<a class="nav-btn nav-btn-export" title="下载备考表模板"  onclick="window.location.href='${ctx}/workprojectnotify/workProjectNotify/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>
+				</div>
+				<div id="addFile_reference" style="display: none" class="upload-progress">
+					<span id="fileName_reference" ></span>
+					<b><span id="baifenbi_reference" ></span></b>
+					<div class="progress">
+						<div id="jindutiao_reference" class="progress-bar" style="width: 0%" aria-valuenow="0">
+						</div>
+					</div>
+				</div>
+				<input id="reference_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertMonthlyTitle(this.value);"/>
+				<span id="reference_title"></span>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="upReferenceTable" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+							<th>文件名称</th>
+							<th>上传人</th>
+							<th>上传时间</th>
+							<th width="150px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_reference">
+						<c:forEach items="${projectcontentinfo.projectContentData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType =='_reference'}">
+								<tr>
+									<c:choose>
+										<c:when test="${projectcontentinfo.projectContentData.uploadMode == 2}">
+											<c:choose>
+												<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+													<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+
+												</c:otherwise>
+											</c:choose>
+										</c:when>
+										<c:otherwise>
+											<c:choose>
+												<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+													<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:otherwise>
+											</c:choose>
+										</c:otherwise>
+									</c:choose>
+
+									<td>${workClientAttachment.createBy.name}</td>
+									<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+											<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+												<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addMonthlyFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i> 删除</a>
+											</c:if>
+										</div>
+									</td>
+								</tr>
+							</c:if>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
 			<script>
 				layui.use(['form', 'layer'], function () {
 					var form = layui.form;
@@ -1750,6 +1869,7 @@
 					// window.parent.document.getElementById('opinion').value = row;
 					$("#opinion").val(row)
 				}
+
 				function openDialogre(title,url,width,height,target,buttons) {
 					if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 						width = 'auto';

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -49,7 +49,7 @@
 					var referenceRemarks =  $("#referenceRemarks").val();
 					if(${type != '1'}) {
 						if (referenceRemarks == '' || referenceRemarks == undefined) {
-							top.layer.msg('请填写备考表内容！', {icon: 0});
+							top.layer.msg('请填写电子档案备考表内容！', {icon: 0});
 							return;
 						}
 					}
@@ -327,14 +327,14 @@
 							<c:if test="${type != '1'}">
 								<div class="form-group layui-row">
 									<div class="form-group-label">
-										<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=referenceRemarks&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
-										<h2>备考表</h2>
+										<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=referenceRemarks&name=电子档案备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 电子档案备考表模板列表</a></div>
+										<h2>电子档案备考表</h2>
 									</div>
 									<div class="layui-item layui-col-sm11 with-textarea">
-										<label class="layui-form-label "><span class="require-item">*</span>备考表：</label>
+										<label class="layui-form-label "><span class="require-item">*</span>电子档案备考表：</label>
 										<div class="layui-input-block">
 											<iframe id="referenceView" src="${ctx}/auditTemplate/auditTemplate/referenceView?identification=referenceRemarks" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-											<form:hidden placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
+											<form:hidden placeholder="请输入电子档案备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
 										</div>
 									</div>
 								</div>