Jelajahi Sumber

批量归档数据展示在纸质归档列表中

user5 3 tahun lalu
induk
melakukan
e0571e69a0
20 mengubah file dengan 566 tambahan dan 33 penghapusan
  1. 14 1
      src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchDao.java
  2. 7 2
      src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchProInfoDao.java
  3. 76 0
      src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java
  4. 14 12
      src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java
  5. 48 6
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java
  6. 42 0
      src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml
  7. 11 0
      src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchProInfoDao.xml
  8. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp
  9. 2 1
      src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp
  10. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp
  11. 341 0
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectFilingBatchView.jsp
  12. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPaperFilingView.jsp
  13. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPlanView.jsp
  14. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp
  15. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp
  16. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp
  17. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp
  18. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp
  19. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/selectiveSearchView.jsp
  20. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

+ 14 - 1
src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchDao.java

@@ -4,7 +4,6 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,6 +15,13 @@ public interface ProjectFilingBatchDao extends CrudDao<ProjectFilingBatch> {
 
     List<ProjectFilingBatch> getProjectFilingBatchRelationList(@Param("id") String id);
 
+    /**
+     * 根据项目id查询批量归档中项目的信息
+     * @param projectId
+     * @return
+     */
+    ProjectFilingBatch getProjectFilingBatchRelationByProjectId(@Param("projectId") String projectId);
+
     void updateProcessIdAndStatus(ProjectFilingBatch projectFilingBatch);
     ProjectFilingBatch findByFilingBatch(@Param("filingBatch") String filingBatch);
 
@@ -32,4 +38,11 @@ public interface ProjectFilingBatchDao extends CrudDao<ProjectFilingBatch> {
      * @return
      */
     List<ProjectFilingbatchRelation> getRelationList(ProjectFilingBatch childrenBatch);
+
+    /**
+     * 根据批次id查询项目信息
+     * @param projectId
+     * @return
+     */
+    List<ProjectFilingbatchRelation> getRelationListByProjectId(@Param("projectId") String projectId);
 }

+ 7 - 2
src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchProInfoDao.java

@@ -1,9 +1,7 @@
 package com.jeeplus.modules.projectFilingBatch.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
-import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
-import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,5 +13,12 @@ public interface ProjectFilingBatchProInfoDao extends CrudDao<ProjectFilingBatch
      Integer proInfoInsert(ProjectFilingBatchProInfo proInfo);
 
      List<ProjectFilingBatchProInfo> getListByFilingBatchId(String filingBatchId);
+
+     /**
+      * 根据项目id查询项目关联信息
+      * @param projectId
+      * @return
+      */
+     List<ProjectFilingBatchProInfo> getListByProjectId(String projectId);
      Integer deleteById(@Param("id")String id);
 }

+ 76 - 0
src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -245,6 +245,37 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         return map;
     }
 
+
+    @Transactional(readOnly = false)
+    public Map<String,List> getFilingBatchByProjectId(String projectId) {
+        //查询批次下所有数据
+        List<ProjectFilingBatchProInfo> attachmentList = projectFilingBatchProInfoDao.getListByProjectId(projectId);
+        //查询批次项目信息
+        List<ProjectFilingbatchRelation> relationList = dao.getRelationListByProjectId(projectId);
+
+        List<ProjectFilingBatchTree> dataList = new ArrayList<>();
+        Map<String,List> map = new HashMap<>();
+        for (int i = 0; i < relationList.size(); i++) {
+            ProjectFilingBatchTree batchData = new ProjectFilingBatchTree();
+            ProjectFilingbatchRelation batch = relationList.get(i);
+
+            batchData = getRelationInfoByProjectId(batch);
+            dataList.add(batchData);
+
+            //项目名称不为空则进行所有项目的查询和处理
+            for (ProjectFilingBatchProInfo info: attachmentList) {
+                if(info.getProId().equals(batch.getProjectId())){
+                    ProjectFilingBatchTree treeData = getAttachmentInfo(info,batch.getId());
+                    dataList.add(treeData);
+                }
+
+            }
+        }
+
+        map.put("data",dataList);
+        return map;
+    }
+
     private ProjectFilingBatchTree getRelationInfo(ProjectFilingbatchRelation relation,ProjectFilingBatch filingBatch){
         ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
         //将界面需要展示数据放入类中
@@ -286,6 +317,47 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         return treeData;
     }
 
+    private ProjectFilingBatchTree getRelationInfoByProjectId(ProjectFilingbatchRelation relation){
+        ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
+        //将界面需要展示数据放入类中
+        //项目id
+        treeData.setId(relation.getId());
+        //项目id
+        treeData.setProjectId(relation.getProjectId());
+        //项目编号
+        treeData.setProjectNum(relation.getProjectNum());
+        //项目名称
+        treeData.setFilingName(relation.getProjectName());
+        //报告号
+        treeData.setNumber(relation.getNumber());
+        //案卷号
+        if(7 == relation.getStatus()){
+            treeData.setBoxNum("");
+            treeData.setStatusStr("已作废");
+        }else{
+            if(2 == relation.getStatus() || 3 == relation.getStatus()){
+                treeData.setBoxNum("");
+                treeData.setStatusStr("审批中");
+            }else if(5 == relation.getStatus() || 4 == relation.getStatus()){
+                if(relation.getDelFlag().equals("1")){
+                    treeData.setBoxNum("");
+                    treeData.setStatusStr("驳回");
+                }else{
+                    if(StringUtils.isNotBlank(relation.getBoxNum())){
+                        treeData.setBoxNum(relation.getBoxNum());
+                    }else{
+                        treeData.setBoxNum("");
+                    }
+                    treeData.setStatusStr("通过");
+                }
+            }
+        }
+        //状态
+        treeData.setStatus(relation.getStatus());
+        treeData.setPid("0");
+        return treeData;
+    }
+
     private ProjectFilingBatchTree getAttachmentInfo(ProjectFilingBatchProInfo proInfo,String pId){
         ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
         //将界面需要展示数据放入类中
@@ -356,6 +428,10 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         return projectFilingBatchDao.getProjectFilingBatchRelationList(id);
     }
 
+    public ProjectFilingBatch getProjectFilingBatchRelationByProjectId(String id){
+        return projectFilingBatchDao.getProjectFilingBatchRelationByProjectId(id);
+    }
+
     /**
      * 送审归档批次
      * @param projectFilingBatch

+ 14 - 12
src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -1,25 +1,20 @@
 package com.jeeplus.modules.projectFilingBatch.web;
 
 import com.google.common.collect.Lists;
-import com.google.gson.internal.$Gson$Preconditions;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.utils.*;
-import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.JedisUtils;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.pojectMaterialsWarehouse.entity.ProjectMaterialCollectInfo;
-import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
-import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchProInfoDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchImportInfo;
-import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectFilingBatch.service.ProjectFilingBatchService;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.ImportBRuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
@@ -28,8 +23,6 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
-import com.jeeplus.modules.workengineeringproject.entity.WorkEngineeringProject;
 import net.sf.json.JSONObject;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
@@ -41,7 +34,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import redis.clients.jedis.Jedis;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -193,6 +185,16 @@ public class ProjectFilingBatchController extends BaseController {
     }
 
     /**
+     * 项目列表页面
+     */
+    @RequestMapping(value = "getFilingBatchByProjectId")
+    @ResponseBody
+    public Map<String,List> getFilingBatchByProjectId(String projectId) {
+        Map<String, List> map = projectFilingBatchService.getFilingBatchByProjectId(projectId);
+        return map;
+    }
+
+    /**
      * 根据项目id查询附件信息
      */
     @RequestMapping(value = "getAttachmentList")

+ 48 - 6
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -15,6 +15,8 @@ import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationServ
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.service.ProjectFilingBatchService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
@@ -51,10 +53,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * 项目相关信息查看权限
@@ -108,6 +107,8 @@ public class RuralProjectViewController extends BaseController {
     private ProjectContentDataService projectContentDataService;
     @Autowired
     private RuralWorkProjectUserDao workProjectUserDao;
+    @Autowired
+    private ProjectFilingBatchService projectFilingBatchService;
     /**
      * 项目查看
      * 传参:项目id
@@ -671,7 +672,7 @@ public class RuralProjectViewController extends BaseController {
         //查询项目报告信息
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         model.addAttribute("flagProjectReportData",projectReportData);
-        return "modules/ruralprojectrecords/view/reportedView";
+        return "modules/ruralprojectrecords/view/remodifyportedView";
 
     }
 
@@ -1102,9 +1103,50 @@ public class RuralProjectViewController extends BaseController {
         return "modules/ruralprojectrecords/view/reportIssueView";
     }
     @RequestMapping(value = "paperView")
-    public String paperView(String projectId, Model model) {
+    public String paperView(String projectId,String submitMoney, Model model) {
         RuralProjectRecords projectRecords=new RuralProjectRecords();
         projectRecords=ruralProjectRecordsService.get(projectId);
+        //B类项目查询信息
+        if("1".equals(submitMoney)){
+            List<RuralProjectRecords> ruralProjectRecordsList = new ArrayList<>();
+            //查询归档项目信息
+            ProjectFilingBatch filingBatch = projectFilingBatchService.getProjectFilingBatchRelationByProjectId(projectId);
+            if(null != filingBatch){
+                if(StringUtils.isNotBlank(filingBatch.getProjectId())){
+                    RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
+                    ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
+                    if(7 == filingBatch.getFilingStatus()){
+                        ruralProjectRecords.setBoxNum("");
+                        ruralProjectRecords.setReBoxNum("");
+                        ruralProjectRecords.setDelFlag("已作废");
+                    }else{
+                        if(2 == filingBatch.getStatus()){
+                            ruralProjectRecords.setBoxNum("");
+                            ruralProjectRecords.setReBoxNum("");
+                            ruralProjectRecords.setDelFlag("审批中");
+                        }else if(5 == filingBatch.getStatus() || 4 == filingBatch.getStatus()){
+                            if(1 == filingBatch.getRelationdelFlag()){
+                                ruralProjectRecords.setBoxNum("——");
+                                ruralProjectRecords.setReBoxNum("——");
+                                ruralProjectRecords.setDelFlag("驳回");
+                            }else{
+                                ruralProjectRecords.setBoxNum(filingBatch.getBoxNum());
+                                ruralProjectRecords.setReBoxNum(filingBatch.getReBoxNum());
+                                ruralProjectRecords.setDelFlag("通过");
+                            }
+                        }
+                    }
+                    ruralProjectRecordsList.add(ruralProjectRecords);
+                }
+            }else{
+                filingBatch = new ProjectFilingBatch();
+            }
+
+            model.addAttribute("projectRecords", projectRecords);
+            model.addAttribute("projectFilingBatch", filingBatch);
+            return "modules/ruralprojectrecords/view/projectFilingBatchView";
+
+        }
         ProjectPaperFiling paperFiling=projectPaperFilingService.findByProjectId(projectId);
         if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
             ruralProjectRecordsService.queryProjectDetail(projectRecords);

+ 42 - 0
src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -199,6 +199,20 @@
 		WHERE a.id = #{id}
 		order by g.sort asc,d.number asc,a.create_date desc
 	</select>
+
+	<select id="getProjectFilingBatchRelationByProjectId" resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch">
+		SELECT
+		<include refid="filingBatchRelationColumns"/>
+		,g.del_flag as "relationdelFlag"
+		FROM project_filingbatch a
+		LEFT JOIN project_flingbatch_relation g on(a.id=g.filing_batch)
+		LEFT JOIN rural_project_records r on(g.project_id=r.id)
+		LEFT JOIN project_report_data d on(d.project_id=r.id)
+		WHERE g.project_id = #{projectId}
+		order by g.sort asc,d.number asc,a.create_date desc
+	</select>
+
+
 	<select id="findByFilingBatch"
 			resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch">
 		SELECT
@@ -254,4 +268,32 @@
 		WHERE a.filing_batch = #{id}
 		order by a.sort asc,prd.number asc,a.create_date desc
 	</select>
+
+	<select id="getRelationListByProjectId" resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation">
+		SELECT
+		  a.id as "id",
+		  a.create_by as "createBy.id",
+		  r.create_date as "createDate",
+		  a.update_by as "updateBy.id",
+		  a.update_date as "updateDate",
+		  a.del_flag as "delFlag",
+		  a.filing_batch as "filingBatch",
+		  a.project_id as "projectId",
+		  a.status as "status",
+		  a.box_num as "boxNum",
+		  a.sort as "sort",
+		  a.re_box_num as "reBoxNum",
+		  r.project_name as "projectName",
+		  r.project_id as "projectNum",
+		  r.project_id as "projectRecordsId",
+		  prd.number as "number",
+		  su.name as "createName"
+		FROM project_flingbatch_relation a
+		LEFT JOIN project_filingbatch f on a.id=f.filing_batch
+		LEFT JOIN rural_project_records r on a.project_id=r.id
+		LEFT JOIN project_report_data prd on prd.project_id=r.id
+		LEFT JOIN sys_user su on r.create_by=su.id
+		WHERE a.project_id = #{projectId}
+		order by a.sort asc,prd.number asc,a.create_date desc
+	</select>
 </mapper>

+ 11 - 0
src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchProInfoDao.xml

@@ -40,6 +40,17 @@
 		order by sort asc,proInfo_type asc
 	</select>
 
+	<select id="getListByProjectId" 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 project_id=#{projectId}
+		order by sort asc,proInfo_type asc
+	</select>
+
 	<delete id="delete">
 		delete from project_filingbatch_proinfo
 		where filing_batch=#{proInfofilingBatch} and project_id=#{proId}

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -957,7 +957,7 @@
 				<%--	}}--%>
 				,{align:'center', title: '线下',  width:70,templet:function(d){
 						if (d.submitMoney=="1"){
-							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
 							var st = getRuralProjectArchiveState(d.paperFilingStatus);
 						}

+ 2 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -257,7 +257,8 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 
 		</ul>
 <%--		<ul class="list-tabs" >--%>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -82,7 +82,7 @@
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 
 		</ul>
 	</div>

+ 341 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectFilingBatchView.jsp

@@ -0,0 +1,341 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>新增归档</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <style>
+        #projectDesc-error{
+            left:0;
+            top:82px;
+        }
+        .layui-layer-dialog{
+            background: red;
+        }
+        td input{
+            margin-left:-10px !important;
+            height: 42px !important;
+        }
+        .disables {
+            pointer-events: none;
+        }
+        .notDisables {
+            pointer-events: all;
+        }
+        .forbidden{
+            background-color:#c2c2c2;
+        }
+
+        .notForbidden{
+            background-color:#3ca2e0;
+        }
+    </style>
+    <script type="text/javascript">
+
+        function hasInArr(id,idArr) {
+            for(var i=0;i<idArr.length;i++){
+                if(id==$(idArr[i]).val()){
+                    return true;
+                }
+            }
+            return false;
+        }
+        function existLinkman(id,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workClientLinkmanList'+i+'_id').val();
+                if(id==val){
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        function setClientInfo(obj) {
+            for(var i=0;i<obj.length;i++){
+                var idArr = $("#workConstructionLinkmanList tr:visible .linkmanId");
+                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+                    addRow("#workConstructionLinkmanList",workConstructionLinkmanRowIdx,workConstructionLinkmanTpl,obj[i]);
+                    workConstructionLinkmanRowIdx=workConstructionLinkmanRowIdx+1;
+                }
+            }
+        }
+        function existConstructionLinkman(obj,length) {
+            for (var i=0;i<length;i++) {
+                var val = $('#workConstructionLinkmanList'+i+'_id').val();
+                var cid = $('#workConstructionLinkmanList'+i+'_cid').val();
+                if(obj.id==val&&obj.client.id==cid){
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        function insertTitle(tValue){
+            $("#flagFile").val(false);
+            var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+                var attachmentId = $("#id").val();
+                var attachmentFlag = "82";
+                /*console.log(file);*/
+                var timestamp=new Date().getTime();
+
+                var storeAs = "projectRecords";
+                var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                $("#addFile"+divId).show();
+                multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
+        }
+
+
+        function addFile() {
+            $("#attachment_file").click();
+        }
+
+        function addRow(list, idx, tpl, row){
+            // var idx1 = $("#workClientLinkmanList tr").length;
+            bornTemplete(list, idx, tpl, row, idx);
+        }
+
+        function bornTemplete(list, idx, tpl, row, idx1){
+            $(list).append(Mustache.render(tpl, {
+                idx: idx, delBtn: true, row: row,
+                order:idx1 + 1
+            }));
+            $(list+idx).find("select").each(function(){
+                $(this).val($(this).attr("data-value"));
+            });
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                var ss = $(this).attr("data-value").split(',');
+                for (var i=0; i<ss.length; i++){
+                    if($(this).val() == ss[i]){
+                        $(this).attr("checked","checked");
+                    }
+                }
+            });
+        }
+
+        function delEntrustRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+            if($("#workClientLinkmanList tr").length==0){
+                //按钮禁用
+                $("#addUserButton").addClass("notDisables");
+                //a标签置灰
+                $("#aButton").addClass("notForbidden");
+
+                $("#linkmanDiv").addClass("notDisables");
+                $("#linkmanButton").addClass("notForbidden");
+            }
+        }
+
+        function delRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+        }
+        function formatNum(obj) {
+            var val = $(obj).val();
+            if(val==null||val==''|| isNaN(val))return;
+            var money = parseFloat((val + "").replace(/[^\d\.-]/g, "")).toFixed(2) + "";
+            var l = money.split(".")[0].split("").reverse(),
+                r = money.split(".")[1];
+            t = "";
+            for(i = 0; i < l.length; i ++ )
+            {
+                t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
+            }
+            $(obj).val(t.split("").reverse().join("") + "." + r);
+        }
+        function openBill2(title,url,width,height,target,formId){
+
+            if($("#workClientLinkmanList tr").length>0){
+                top.layer.msg('仅可添加一名委托方联系人!', {icon: 0});
+                return false;
+            }
+            var frameIndex = parent.layer.getFrameIndex(window.name);
+            var urls = url+"&index="+frameIndex;
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+
+
+        }
+
+        function getInstallFee() {
+            var af = $("#estimateTotalFees").val();
+            //安装
+            var inf = $("#installFees").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(rate);
+                $("#buildingFees").val(hf);
+                bf = hf;
+                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installPercent").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#estimateTotalFees").val();
+            //土建
+            var bf = $("#buildingFees").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#buildingPercent").val(rate);
+                $("#installFees").val(hf);
+                inf = hf;
+                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
+                $("#installPercent").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingPercent").val("");
+            }
+        }
+    </script>
+</head>
+<body>
+<div class="tapfixed">
+    <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+        <ul class="list-tabs" >
+            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+        </ul>
+    </div>
+</div>
+<div class="single-form">
+    <div class="container">
+        <sys:message content="${message}"/>
+        <form:form id="inputForm" modelAttribute="projectFilingBatch" action="${ctx}/ruralProject/ruralProjectRecords/save" method="post" class="form-horizontal">
+            <form:hidden path="id"/>
+            <form:hidden path="projectId"/>
+
+        <div class="form-group layui-row">
+            <div class="form-group-label" style="overflow:hidden;"><h2 style="float: left">归档项目信息</h2></div>
+            <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+        </div>
+        </form:form>
+    </div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+<script>
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).extend({
+        treetable: 'treetable-lay/treetable'
+    }).use(['layer', 'table', 'treetable'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var layer = layui.layer;
+        var treetable = layui.treetable;
+        var id =$("#id").val();
+        var projectId =$("#projectId").val();
+        // 渲染表格
+        var renderTable = function () {
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 0,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: false,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/projectFilingBatch/projectFilingBatchInfo/getFilingBatchByProjectId?projectId='+projectId,
+                page: false,
+                cols: [[
+                    {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){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.number+"</font>";
+                            }else{
+                                return "<font>"+d.number+"</font>";
+                            }
+                        }},
+                    {field: 'filingName', align:'center', title: '项目名称',templet:function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.filingName+"</font>";
+                            }else{
+                                return "<font>"+d.filingName+"</font>";
+                            }
+                        }},
+                    {field: 'boxNum', align:'center', title: '案卷号',templet: function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.boxNum+"</font>";
+                            }else{
+                                return "<font>"+d.boxNum+"</font>";
+                            }
+                        }},
+                    {field: 'statusStr', align:'center', title: '状态',width:120,templet: function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.statusStr+"</font>";
+                            }else{
+                                return "<font></font>"
+                            }
+                        }}
+                ]],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+
+        renderTable();
+
+        //触发三个button按钮
+        $('#btn-expand').click(function () {
+            treetable.expandAll('#permissionTable');
+        });
+
+        $('#btn-fold').click(function () {
+            treetable.foldAll('#permissionTable');
+        });
+
+        $('#btn-refresh').click(function () {
+            renderTable();
+        });
+
+        //监听工具条
+        table.on('tool(permissionTable)', function (obj) {
+            var data = obj.data;
+            var layEvent = obj.event;
+            if(data.permissionName!=null){
+                if (layEvent === 'del') {
+                    layer.msg('删除' + data.id);
+                } else if (layEvent === 'edit') {
+                    layer.msg('修改' + data.id);
+                }
+            }
+        });
+    });
+
+</script>
+</body>
+</html>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPaperFilingView.jsp

@@ -105,7 +105,7 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 		</ul>
 	</div>
 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPlanView.jsp

@@ -152,7 +152,7 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
         </ul>
     </div>
     </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp

@@ -198,7 +198,7 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 
 			</ul>
 		</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -174,7 +174,7 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 
 			</ul>
 		</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -308,7 +308,7 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 
 			</ul>
 		</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -124,7 +124,7 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 
         </ul>
 <%--        <ul class="list-tabs" >--%>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -100,7 +100,7 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 		</ul>
 	</div>
 	</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/selectiveSearchView.jsp

@@ -37,7 +37,7 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
 		</ul>
 	</div>
 	</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -31,7 +31,7 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
         </ul>
     </div>
     </div>