批量上传线下归档员收不到代办修改

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -401,7 +401,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             WorkProjectNotify workProjectNotify = UtilNotify
                     .saveNotify(projectFilingBatch.getId(),
                             projectFilingBatch.getCreateBy(),
-                            office.getParent().getId(),
+                            projectFilingBatch.getCompany().getId(),
                             titleStr,
                             contentStr,
                             "100",

src/main/resources/mappings/modules/projectGuidang/ProjectFilingbatchRelationDao.xml

@@ -26,26 +26,24 @@
 	<update id="update">
 		update project_flingbatch_relation
 		<set>
+			del_flag=#{delFlag}
 			<if test="updateBy!=null and updateBy.id!=null and updateBy.id!=''">
-				update_by = #{updateBy.id},
+				,update_by = #{updateBy.id}
 			</if>
 			<if test="updateDate!=null and updateDate!=''">
-				update_date = #{updateDate},
+				,update_date = #{updateDate}
 			</if>
 			<if test="filingBatch!=null and filingBatch!=''">
-				filing_batch=#{filingBatch},
+				,filing_batch=#{filingBatch}
 			</if>
 			<if test="status!=null and status!=''">
-				`status`=#{status},
+				,`status`=#{status}
 			</if>
 			<if test="boxNum!=null">
-				box_num=#{boxNum},
+				,box_num=#{boxNum}
 			</if>
 			<if test="reBoxNum!=null">
-				re_box_num=#{reBoxNum}
-			</if>
-			<if test="delFlag!=null">
-				,del_flag=#{delFlag}
+				,re_box_num=#{reBoxNum}
 			</if>
 		</set>
 		where id=#{id}

src/main/webapp/webpage/modules/projectFilingBatch/projectChoiceLink.jsp

@@ -112,7 +112,7 @@
 				</c:when>
 					<c:otherwise>
 						<tr>
-							<td colspan="4" align="center">
+							<td colspan="7" align="center">
 								暂无数据
 							</td>
 						</tr>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -27,23 +27,26 @@
 					for(var i = 0;i < tdlen;i++){
 						var status = $("#projectFilingbatchRelations"+i+"_status").val();
 						var boxNum = $("#projectFilingbatchRelations"+i+"_boxNum").val();
-						var reboxNum = $("#projectFilingbatchRelations"+i+"_reBoxNum").val();
+						var parentId = $("#projectFilingbatchRelations"+i+"_parentId").val();
+						//var reboxNum = $("#projectFilingbatchRelations"+i+"_reBoxNum").val();
 						var projectName = $("#projectFilingbatchRelations"+i+"_projectName").val();
-						if(undefined != status && null !=status && ''!= status){
-							if(5 == status){
-								if('' != boxNum && undefined!= boxNum && null != boxNum){
-									if(boxNum != reboxNum){
-										layer.msg(projectName +"：两次案卷号不相同，请重新填写", { icon: 2, offset: "error", time:1000 });
+						if("0" == parentId){
+							if(undefined != status && null !=status && ''!= status){
+								if(5 == status){
+									if('' != boxNum && undefined!= boxNum && null != boxNum){
+										/*if(boxNum != reboxNum){
+                                            layer.msg(projectName +"：两次案卷号不相同，请重新填写", { icon: 2, offset: "error", time:1000 });
+                                            return false;
+                                        }*/
+									}else{
+										layer.msg("请输入项目 "+projectName+" 的案卷号", { icon: 2, offset: "error", time:1000 });
 										return false;
 									}
-								}else{
-									layer.msg("请输入项目 "+projectName+" 的案卷号", { icon: 2, offset: "error", time:1000 });
-									return false;
 								}
+							}else{
+								layer.msg("请给项目 "+projectName+" 选择审批状态", { icon: 2, offset: "error", time:1000 });
+								return false;
 							}
-						}else{
-							layer.msg("请给项目 "+projectName+" 选择审批状态", { icon: 2, offset: "error", time:1000 });
-							return false;
 						}
 					}
 				}
@@ -280,12 +283,12 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit">
 						<thead>
 						<tr>
-							<th style="text-align: center">归档项目编号</th>
-							<th style="text-align: center" >归档项目名称</th>
-							<th style="text-align: center">报告号</th>
-							<th style="text-align: center" >案卷号</th>
+							<th width="20%" style="text-align: center">归档项目编号</th>
+							<th width="20%" style="text-align: center" >归档项目名称</th>
+							<th width="20%" style="text-align: center">报告号</th>
+							<th width="20%" style="text-align: center" >案卷号</th>
 <%--							<th style="text-align: center" >确认案卷号</th>--%>
-							<th style="text-align: center" >审批</th>
+							<th width="20%" style="text-align: center" >审批</th>
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
@@ -297,11 +300,13 @@
 										<td class="hide">
 											<input id="projectFilingbatchRelations${index.index}_id" name="projectFilingbatchRelations[${index.index}].id" type="hidden" value="${project.id}"/>
 											<input id="projectFilingbatchRelations${index.index}_delFlag" name="projectFilingbatchRelations[${index.index}].delFlag" type="hidden" value="0"/>
+											<input id="projectFilingbatchRelations${index.index}_parentId" type="hidden" value="${project.parentId}"/>
 										</td>
 										<td class="hide">
 											<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
 										</td>
 										<td style="background-color: #f1f1f1;">
+											<div></div>
 											<span class="treeTable-icon open" style="padding-left: 10px;"><i class="layui-icon layui-icon-triangle-d"></i></span>  ${project.projectId}
 <%--											<span style="padding-left: 10px;padding-right: 10px;float: left">-</span>${project.projectId}--%>
 <%--											<input style="cursor:Pointer" type="text" value="  -  ${project.projectId}" readonly="readonly"  class="form-control"/>--%>
@@ -330,12 +335,13 @@
 								<c:otherwise>
 									<tr class="${project.parentId}" id="workAccountList${index.index}">
 										<td class="hide">
+											<input id="projectFilingbatchRelations${index.index}_parentId" type="hidden" value="${project.parentId}"/>
 										</td>
 										<td>
 											<input type="text" readonly value="${project.projectId}" style="text-align: center" class="form-control"/>
 										</td>
-										<td>
-											<input type="text" readonly value="${project.projectReportNumber}" style="text-align: center" class="form-control"/>
+										<td style="background-color: #f1f1f1;display:table-cell; vertical-align:middle;text-align: center">
+											<a class="attention-info" title="${project.projectReportNumber}" href="javascript:void(0);" onclick="preview('预览', '${project.url}','80%', '80%')">${project.projectReportNumber}</a>
 										</td>
 										<td>
 											<input type="text" readonly value="" class="form-control"/>
@@ -344,8 +350,8 @@
 										<td>
 											<input type="text" readonly value="" class="form-control"/>
 										</td>
-										<td>
-											<input type="text" readonly value="" class="form-control"/>
+										<td style="background-color: #f1f1f1;display:table-cell; vertical-align:middle;text-align: center">
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${project.url}');" class="op-btn op-btn-add"> 下载 </a>
 										</td>
 									</tr>
 								</c:otherwise>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchView.jsp

@@ -311,7 +311,7 @@
                             if(0 == d.pid){
                                 return "<font style = 'font-size:14px;font-weight:500;'>"+d.statusStr+"</font>";
                             }else{
-                                return "<font>"+d.statusStr+"</font>";
+                                return "<a href=\"javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('"+d.url+"');\" class=\"op-btn op-btn-add\"> 下载 </a>"
                             }
                         }}
                 ]],