批量归档查看页面展示

src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchProInfoDao.java

@@ -12,4 +12,6 @@ import java.util.List;
 public interface ProjectFilingBatchProInfoDao extends CrudDao<ProjectFilingBatchProInfo> {
      ProjectFilingBatchProInfo findProInfo(ProjectFilingBatchProInfo proInfo);
      Integer proInfoInsert(ProjectFilingBatchProInfo proInfo);
+
+     List<ProjectFilingBatchProInfo> getListByFilingBatchId(String filingBatchId);
 }

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

@@ -8,8 +8,10 @@ import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchProInfoDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchTree;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
@@ -86,6 +88,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
     private SerialNumTplService serialNumTplService;
     @Autowired
     private WorkattachmentService workattachmentService;
+    @Autowired
+    private ProjectFilingBatchProInfoDao projectFilingBatchProInfoDao;
     @Override
     public ProjectFilingBatch get(String id) {
         return super.get(id);
@@ -199,7 +203,9 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
 
 
     @Transactional(readOnly = false)
-    public Map<String,List> getFilingBatchById(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
+    public Map<String,List> getFilingBatchById(ProjectFilingBatch projectFilingBatch) {
+        //查询批次下所有数据
+        List<ProjectFilingBatchProInfo> attachmentList = projectFilingBatchProInfoDao.getListByFilingBatchId(projectFilingBatch.getId());
         //查询批次项目信息
         List<ProjectFilingbatchRelation> relationList = dao.getRelationList(projectFilingBatch);
 
@@ -211,17 +217,13 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
 
             batchData = getRelationInfo(batch,projectFilingBatch);
             dataList.add(batchData);
-            //获取子项目信息
-            Workattachment workattachment = new Workattachment();
-            workattachment.setAttachmentId(batch.getProjectId());
-            workattachment.setDivIdType("_filingBatch");
-            //查询对应子项目数据
-            List<Workattachment> attachmentList = workattachmentService.findList(workattachment);
 
             //项目名称不为空则进行所有项目的查询和处理
-            for (Workattachment attachment: attachmentList) {
-                ProjectFilingBatchTree treeData = getAttachmentInfo(attachment,batch.getId());
-                dataList.add(treeData);
+            for (ProjectFilingBatchProInfo info: attachmentList) {
+                if(info.getProId().equals(batch.getProjectId())){
+                    ProjectFilingBatchTree treeData = getAttachmentInfo(info,batch.getId());
+                    dataList.add(treeData);
+                }
 
             }
         }
@@ -271,15 +273,13 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         return treeData;
     }
 
-    private ProjectFilingBatchTree getAttachmentInfo(Workattachment attachment,String pId){
+    private ProjectFilingBatchTree getAttachmentInfo(ProjectFilingBatchProInfo proInfo,String pId){
         ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
         //将界面需要展示数据放入类中
         //项目编号
-        treeData.setProjectNum(attachment.getRemarks());
+        treeData.setProjectNum(proInfo.getProInfoType());
         //报告号
-        treeData.setNumber(attachment.getAttachmentName());
-        //文件路径
-        treeData.setUrl(attachment.getUrl());
+        treeData.setNumber(proInfo.getProInfoName());
         //项目名称
         treeData.setFilingName("");
         //案卷号
@@ -765,12 +765,14 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             //审批通过，处理归档项目状态
             List<ProjectFilingbatchRelation> projectFilingbatchRelationList = projectFilingBatch.getProjectFilingbatchRelations();
             for (ProjectFilingbatchRelation info: projectFilingbatchRelationList) {
-                if(4 == info.getStatus()){
-                    info.setDelFlag("1");
-                    info.setBoxNum("");
-                    info.setReBoxNum("");
+                if(StringUtils.isNotBlank(info.getId())){
+                    if(4 == info.getStatus()){
+                        info.setDelFlag("1");
+                        info.setBoxNum("");
+                        info.setReBoxNum("");
+                    }
+                    this.updateByid(info);
                 }
-                this.updateByid(info);
             }
             //审核完成提示框
             String title = "归档批次号【"+projectFilingBatch.getFilingBatch()+"】归档成功";

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -164,8 +164,8 @@ public class ProjectFilingBatchController extends BaseController {
      */
     @RequestMapping(value = "getFilingBatchById")
     @ResponseBody
-    public Map<String,List> getFilingBatchById(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
-        Map<String, List> map = projectFilingBatchService.getFilingBatchById(projectFilingBatch, request, response);
+    public Map<String,List> getFilingBatchById(ProjectFilingBatch projectFilingBatch) {
+        Map<String, List> map = projectFilingBatchService.getFilingBatchById(projectFilingBatch);
         return map;
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -19,17 +19,21 @@ import com.jeeplus.modules.projectAccessory.dao.ProjectTemplateDao;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectClientLinkmanDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
@@ -72,6 +76,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
@@ -1895,4 +1900,29 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		return list;
 	}
+
+	@Transactional(readOnly = false)
+	public Map<String,List> getTemplateList(List<ProjectTemplateInfo> fileAttachmentList) {
+		Map map = new HashMap();
+		List<ProjectTemplateInfo> treeList = Lists.newArrayList();
+		for (int i = 0; i < fileAttachmentList.size(); i++) {
+			ProjectTemplateInfo parentData = fileAttachmentList.get(i);
+			parentData.setParentId("0");
+			parentData.setFlag(0);
+			treeList.add(parentData);
+			for (WorkClientAttachment info: parentData.getWorkAttachments()) {
+				ProjectTemplateInfo childrenData = new ProjectTemplateInfo();
+				childrenData.setParentId(parentData.getId());
+				childrenData.setId(info.getId());
+				childrenData.setMustFlag(0);
+				childrenData.setFlag(1);
+				childrenData.setAttachName(info.getAttachmentName());
+				childrenData.setUrl(info.getUrl());
+				childrenData.setAttachTypes(info.getType());
+				treeList.add(childrenData);
+			}
+		}
+		map.put("data",treeList);
+		return map;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -17,6 +17,7 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
@@ -928,4 +929,53 @@ public class RuralProjectRecordsController extends BaseController {
 		}
 		return "modules/ruralprojectrecords/projectAccessoryForm";
 	}
+
+
+	/**
+	 *查询成果文件树形信息
+	 */
+	@RequestMapping(value = "getOutcomeAccessoryInfo")
+	@ResponseBody
+	public Map<String,List> getOutcomeAccessoryInfo(RuralProjectRecords projectRecords) {
+		Map map =new HashMap();
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+			RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+			List<ProjectTemplateInfo> fileAttachmentList = ruralProjectcontentinfo.getFileAttachmentList();
+			map = projectRecordsService.getTemplateList(fileAttachmentList);
+		}
+		return map;
+	}
+
+	/**
+	 *查询依据性文件树形信息
+	 */
+	@RequestMapping(value = "getGistAccessoryInfo")
+	@ResponseBody
+	public Map<String,List> getGistAccessoryInfo(RuralProjectRecords projectRecords) {
+		Map map =new HashMap();
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+			RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+			List<ProjectTemplateInfo> fileAttachmentList = ruralProjectcontentinfo.getFileGistdataList();
+			map = projectRecordsService.getTemplateList(fileAttachmentList);
+		}
+		return map;
+	}
+
+	/**
+	 * 查询其他文件树形信息
+	 */
+	@RequestMapping(value = "getOtherAccessoryInfo")
+	@ResponseBody
+	public Map<String,List> getOtherAccessoryInfo(RuralProjectRecords projectRecords) {
+		Map map =new HashMap();
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+			RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+			List<ProjectTemplateInfo> fileAttachmentList = ruralProjectcontentinfo.getFileOtherList();
+			map = projectRecordsService.getTemplateList(fileAttachmentList);
+		}
+		return map;
+	}
 }

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

@@ -40,8 +40,11 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchProInfoDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchTree;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectFilingBatch.service.ProjectFilingBatchService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
@@ -464,6 +467,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private ProjectFilingbatchRelationDao projectFilingbatchRelationDao;
 	@Autowired
 	private WorkattachmentService workattachmentService;
+	@Autowired
+	private ProjectFilingBatchProInfoDao projectFilingBatchProInfoDao;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -2739,31 +2744,33 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取详细信息
 					List<RuralProjectRecords> ruralProjectRecordsList = new ArrayList<>();
 					List<ProjectFilingBatch> projectFilingBatches = projectFilingBatchService.findProjectIdByFiling(projectFilingBatch.getId());
+					//查询批次下所有数据
+					List<ProjectFilingBatchProInfo> attachmentList = projectFilingBatchProInfoDao.getListByFilingBatchId(projectFilingBatch.getId());
+
 					for (ProjectFilingBatch filingBatch : projectFilingBatches) {
 						RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
 						ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
 						ruralProjectRecords.setId(filingBatch.getRelationId());
 						ruralProjectRecords.setParentId("0");
 						ruralProjectRecordsList.add(ruralProjectRecords);
-						//获取子项目信息
-						Workattachment workattachmentInfo = new Workattachment();
-						workattachmentInfo.setAttachmentId(filingBatch.getProjectId());
-						workattachmentInfo.setDivIdType("_filingBatch");
-						//查询对应子项目数据
-						List<Workattachment> attachmentList = workattachmentService.findList(workattachmentInfo);
-						for (Workattachment attachment:attachmentList) {
-							//查询附件信息
-							RuralProjectRecords workattachment = new RuralProjectRecords();
-							//附件文件类型
-							workattachment.setProjectId(attachment.getRemarks());
-							//附件文件名称
-							workattachment.setProjectReportNumber(attachment.getAttachmentName());
-							//文件路径
-							workattachment.setUrl(attachment.getUrl());
-							//项目名称
-							workattachment.setFilingName("");
-							workattachment.setParentId(ruralProjectRecords.getId());
-							ruralProjectRecordsList.add(workattachment);
+
+						//项目名称不为空则进行所有项目的查询和处理
+						for (ProjectFilingBatchProInfo info: attachmentList) {
+							if(info.getProId().equals(filingBatch.getProjectId())){
+								RuralProjectRecords treeData = new RuralProjectRecords();
+								//将界面需要展示数据放入类中
+								//项目编号
+								treeData.setProjectId(info.getProInfoType());
+								//报告号
+								treeData.setProjectReportNumber(info.getProInfoName());
+								//项目名称
+								treeData.setFilingName("");
+								//案卷号
+								treeData.setBoxNum("");
+								treeData.setParentId(ruralProjectRecords.getId());
+								ruralProjectRecordsList.add(treeData);
+							}
+
 						}
 					}
 					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getId());

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

@@ -25,4 +25,15 @@
 		from project_filingbatch_proinfo
 		where filing_batch=#{proInfofilingBatch} and project_id=#{proId}
 	</select>
+
+	<select id="getListByFilingBatchId" resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo">
+		select id As "id",
+			   filing_batch As "proInfofilingBatch",
+			   project_id AS "proId",
+			   proInfo_type AS "proInfoType",
+			   proInfo_name as "proInfoName"
+		from project_filingbatch_proinfo
+		where filing_batch=#{filingBatchId}
+	</select>
+
 </mapper>

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

@@ -305,17 +305,16 @@
 										<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>
+										<td  style="background-color: #f1f1f1;">
 											<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"/>--%>
 										</td>
 										<td>
-											<input id="projectFilingbatchRelations${index.index}_projectName" type="text" value="${project.projectName}" readonly="readonly"  class="form-control"/>
+											<input id="projectFilingbatchRelations${index.index}_projectName" type="text" value="${project.projectName}" readonly="readonly" style="text-align: center" class="form-control"/>
 										</td>
 										<td>
-											<input type="text" value="${project.projectReportNumber}" readonly="readonly"  class="form-control"/>
+											<input type="text" value="${project.projectReportNumber}" readonly="readonly" style="text-align: center" class="form-control"/>
 										</td>
 										<td>
 											<input id="projectFilingbatchRelations${index.index}_boxNum"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
@@ -338,10 +337,10 @@
 											<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"/>
+											<input type="text" title="${project.projectId}" readonly value="${project.projectId}" style="text-align: center" class="form-control"/>
 										</td>
 										<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>
+											<input type="text" title="${project.projectReportNumber}" readonly value="${project.projectReportNumber}" style="text-align: center" class="form-control"/>
 										</td>
 										<td>
 											<input type="text" readonly value="" class="form-control"/>
@@ -350,8 +349,8 @@
 										<td>
 											<input type="text" readonly value="" class="form-control"/>
 										</td>
-										<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>
+											<input type="text" readonly value="" class="form-control"/>
 										</td>
 									</tr>
 								</c:otherwise>

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

@@ -279,18 +279,18 @@
                 url: '${ctx}/projectFilingBatch/projectFilingBatchInfo/getFilingBatchById?id='+id,
                 page: false,
                 cols: [[
-                    {field: 'projectNum', title: '项目编号/文件类型',templet:function(d){
+                    {field: 'projectNum', title: '项目编号/审定单',templet:function(d){
                             if(0 == d.pid){
                                 return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectNum+"</font>";
                             }else{
                                 return "<font>"+d.projectNum+"</font>";
                             }
                         }},
-                    {field: 'number', align:'center', title: '报告号/文件名',templet:function(d){
+                    {field: 'number', align:'center', title: '报告号/文件描述',templet:function(d){
                             if(0 == d.pid){
                                 return "<font style = 'font-size:14px;font-weight:500;'>"+d.number+"</font>";
                             }else{
-                                return "<a class=\"attention-info\" title=\"" + d.number + "\" href=\"javascript:void(0);\" onclick=\"preview('预览', '"+d.url+"','80%', '80%')\">" + d.number + "</a>";
+                                return "<font>"+d.number+"</font>";
                             }
                         }},
                     {field: 'filingName', align:'center', title: '项目名称',templet:function(d){
@@ -311,7 +311,7 @@
                             if(0 == d.pid){
                                 return "<font style = 'font-size:14px;font-weight:500;'>"+d.statusStr+"</font>";
                             }else{
-                                return "<a href=\"javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('"+d.url+"');\" class=\"op-btn op-btn-add\"> 下载 </a>"
+                                return "<font></font>"
                             }
                         }}
                 ]],