批量归档

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

@@ -220,7 +220,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
 
             //项目名称不为空则进行所有项目的查询和处理
             for (Workattachment attachment: attachmentList) {
-                ProjectFilingBatchTree treeData = getAttachmentInfo(attachment,batch.getProjectId());
+                ProjectFilingBatchTree treeData = getAttachmentInfo(attachment,batch.getId());
                 dataList.add(treeData);
 
             }
@@ -248,7 +248,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             treeData.setBoxNum("");
             treeData.setStatusStr("已作废");
         }else{
-            if(2 == filingBatch.getFilingStatus()){
+            if(2 == filingBatch.getFilingStatus() || 3 == filingBatch.getFilingStatus()){
                 treeData.setBoxNum("");
                 treeData.setStatusStr("审批中");
             }else if(5 == filingBatch.getFilingStatus() || 4 == filingBatch.getFilingStatus()){
@@ -289,7 +289,27 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         return treeData;
     }
 
-
+    /**
+     * 根据项目id查询附件信息
+     * @param projectId  项目id
+     * @return
+     */
+    public Map<String,Object> getAttachmentList(String projectId) {
+        Map<String,Object> map = new HashMap<>();
+        //获取子项目信息
+        Workattachment workattachment = new Workattachment();
+        workattachment.setAttachmentId(projectId);
+        workattachment.setDivIdType("_filingBatch");
+        //查询对应子项目数据
+        List<Workattachment> attachmentList = workattachmentService.findList(workattachment);
+        if(attachmentList.size()>0){
+            map.put("result",true);
+        }else{
+            map.put("result",false);
+        }
+        map.put("data",attachmentList);
+        return map;
+    }
 
 
     public List<ProjectFilingBatch> findProjectIdByFiling(String id){

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

@@ -173,6 +173,16 @@ public class ProjectFilingBatchController extends BaseController {
     }
 
     /**
+     * 根据项目id查询附件信息
+     */
+    @RequestMapping(value = "getAttachmentList")
+    @ResponseBody
+    public Map<String,Object> getAttachmentList(String projectId) {
+        Map<String, Object> map = projectFilingBatchService.getAttachmentList(projectId);
+        return map;
+    }
+
+    /**
      * 添加
      *
      * @param projectFilingBatch

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

@@ -1499,8 +1499,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			//获取项目信息
 			RuralProjectRecords records = this.getQueryProjectUsers(projectId);
 			//根据项目id查询项目报告信息
-			ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
-			projectReportData = projectReportDataService.get(projectReportData.getId());
+			//ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+			//projectReportData = projectReportDataService.get(projectReportData.getId());
 			ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
 
 			//添加项目类型
@@ -1508,8 +1508,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
 
 			//查看送审金额是否为500w以上金额
-			Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-			approvalMoney = 2;
+			//Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+			Integer approvalMoney = 2;
 			switch (approvalMoney){
 				case 0:
 					//金额为0

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1378,7 +1378,7 @@
 		left join sys_user su on su.id = w1.user_id
 		left join sys_office so on so.id = su.office_id
 		<where>
-			and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
+			and a.del_flag = 0 and project_type in (1,2) and prr.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
 		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="projectName != null and projectName != ''">
@@ -1412,7 +1412,7 @@
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
 
-			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
+			and a.del_flag = 0 and a.project_type in (1,2) and prr.`status`=5
 			/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">

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

@@ -7,6 +7,7 @@
     <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;
@@ -289,7 +290,7 @@
                             if(0 == d.pid){
                                 return "<font style = 'font-size:14px;font-weight:500;'>"+d.number+"</font>";
                             }else{
-                                return "<font>"+d.number+"</font>";
+                                return "<a class=\"attention-info\" title=\"" + d.number + "\" href=\"javascript:void(0);\" onclick=\"preview('预览', '"+d.url+"','80%', '80%')\">" + d.number + "</a>";
                             }
                         }},
                     {field: 'filingName', align:'center', title: '项目名称',templet:function(d){