项目新增报告和归档调用所属附件列表

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectAccessoryRelationService.java

@@ -195,6 +195,11 @@ public class ProjectAccessoryRelationService extends TreeService<ProjectAccessor
         return 0;
     }
 
+    /**
+     * 判断送审金额是否大于500w
+     * @param attachmentProjectApprovalMoney
+     * @return
+     */
     public Integer decideAttachmentProjectApprovalMoney(Double attachmentProjectApprovalMoney){
         if(null != attachmentProjectApprovalMoney){
             if(attachmentProjectApprovalMoney < 5000000){

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

@@ -14,6 +14,7 @@ import com.jeeplus.modules.historical.entity.HistoricalData;
 import com.jeeplus.modules.historical.service.HistoricalService;
 import com.jeeplus.modules.isignature.service.ISignatureDocumentService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
@@ -1150,49 +1151,6 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     public ProjectRecords getMasters(String id) {
         ProjectRecords projectRecords = dao.getRuralProjectRecords(id);
         List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
@@ -1533,13 +1491,23 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
      * @param projectReportData
      */
     @Transactional(readOnly = false)
-    public void deleteReport(ProjectReportData projectReportData){
+    public void deleteReport(ProjectReportData projectReportData, List<ProjectTemplateInfo> attachmentList){
         dao.deleteReport(projectReportData);
         //删除流程表信息
         workProjectNotifyService.deleteActivityProcess(projectReportData.getProcessInstanceId());
         //删除流程人员表信息
         workProjectNotifyService.deleteActivityProcessUser(projectReportData.getProcessInstanceId());
-
+        //删除附件信息
+        if(null != attachmentList){
+            WorkClientAttachment workattachment = new WorkClientAttachment();
+            //附件添加项目id
+            workattachment.setProjectId(projectReportData.getProject().getId());
+            for (ProjectTemplateInfo attachment: attachmentList) {
+                workattachment.setAttachmentId(attachment.getId());
+                //删除对应附件信息
+                workClientAttachmentDao.deleteByattachmentIdAndProjectId(workattachment);
+            }
+        }
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.ruralprojectrecords.web;
 
+import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
@@ -11,6 +12,8 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.historical.entity.HistoricalData;
 import com.jeeplus.modules.historical.service.HistoricalService;
 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.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
@@ -88,6 +91,8 @@ public class RuralCostProjectMessageController extends BaseController {
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private HistoricalService historicalService;
+    @Autowired
+    private ProjectAccessoryRelationService projectAccessoryRelationService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -164,7 +169,7 @@ public class RuralCostProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = {"form"})
-    public String form(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+    public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -186,32 +191,64 @@ public class RuralCostProjectMessageController extends BaseController {
         if (StringUtils.isBlank(projectReportData.getStatus())){
             projectReportData.setFileStatus("1");
         }
+        if(null != reviewFee){
+            projectReportData.setReviewFee(reviewFee);
+        }
+        projectcontentinfo.setProjectReportData(projectReportData);
 
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(records.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectcontentinfo.getProjectReportData().getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("2");
+            relateInfo.setAttachmentProjectType(records.getProjectType());
+            relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
             //添加报告类型
             relateInfo.setRequiredStage(1);
             relateInfo.setId(records.getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
 
-        projectcontentinfo.setProjectReportData(projectReportData);
         model.addAttribute("projectcontentinfo", projectcontentinfo);
+        model.addAttribute("projectSort", projectSort);
         if (projectReportData != null && projectReportData.getCreateBy() != null && StringUtils.isNotBlank(projectReportData.getCreateBy().getId()) && projectReportData.getCreateBy().getId().equals(UserUtils.getUser().getId())) {
             return "modules/ruralprojectrecords/cost/projectcontentinfo/reportForm";
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
@@ -411,28 +448,57 @@ public class RuralCostProjectMessageController extends BaseController {
         System.out.println(status);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("2");
+            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
             //添加报告类型
             relateInfo.setRequiredStage(1);
-            relateInfo.setId(projectcontent.getProject().getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            relateInfo.setId(ruralProjectRecords.getId());
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
         model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
@@ -554,11 +620,51 @@ public class RuralCostProjectMessageController extends BaseController {
     public String deleteReport(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        //获取项目信息
+        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(records.getAttachmentProjectSort());
+        List<ProjectTemplateInfo> attachmentList = Lists.newArrayList();
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+            //添加项目类型
+            relateInfo.setAttachmentProjectType(records.getProjectType());
+            relateInfo.setRequiredStage(1);
+            relateInfo.setId(records.getId());
+            relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+            for (MainDictDetail mainDict : mainDictDetails) {
+                //添加报告类型
+                relateInfo.setAttachType(mainDict.getValue());
+                attachmentList.addAll(projectTemplateService.getProjectTemplateList(relateInfo));
+            }
+        }
+
         //修改工作内容中的信息（将工作内容的info_id清空）
         ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
         if(null != projectReportData){
             //删除报告信息
-            ruralProjectMessageService.deleteReport(projectReportData);
+            ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
@@ -768,27 +874,54 @@ public class RuralCostProjectMessageController extends BaseController {
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
 
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != reportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("2");
-            //添加归档类型
+            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
+            //添加报告类型
             relateInfo.setRequiredStage(2);
-            //添加项目id
             relateInfo.setId(ruralProjectRecords.getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
 
@@ -828,27 +961,56 @@ public class RuralCostProjectMessageController extends BaseController {
             projectReportRecord.setCreateBy(UserUtils.getUser());
         }
 
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("2");
-            //添加归档类型
+            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
+            //添加报告类型
             relateInfo.setRequiredStage(2);
-            //添加项目id
-            relateInfo.setId(projectReportRecord.getReport().getProject().getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            relateInfo.setId(ruralProjectRecords.getId());
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
 

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.ruralprojectrecords.web;
 
+import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
@@ -11,6 +12,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.historical.entity.HistoricalData;
 import com.jeeplus.modules.historical.service.HistoricalService;
 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.projectcontentinfo.entity.ProjectReportData;
@@ -200,35 +202,36 @@ public class RuralProjectMessageController extends BaseController {
         Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(records.getAttachmentProjectSort());
 
         Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
         if(1 == projectSort || null != projectcontentinfo.getProjectReportData().getReviewFee()){
             flag = true;
         }
         if(flag) {
-            //查询报告文件、依据性文件、其他文件必填列表以及数据
-            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-            for (MainDictDetail mainDict : mainDictDetails) {
-                ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-                //添加项目类型
-                relateInfo.setAttachmentProjectType("1");
-                relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
-                //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-                if(0 == projectSort){
-                    //查看送审金额是否为500w以上金额
-                    Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
-                    if(1 == approvalMoney){
-                        //500w以下金额状态
-                        relateInfo.setAttachmentProjectApprovalMoney("1");
-                    }else{
-                        //500w以上金额状态
-                        relateInfo.setAttachmentProjectApprovalMoney("2");
-                    }
+            ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+            //添加项目类型
+            relateInfo.setAttachmentProjectType(records.getProjectType());
+            relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
                 }else{
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
                 }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
 
-                //添加报告类型
-                relateInfo.setRequiredStage(1);
-                relateInfo.setId(records.getId());
+            //添加报告类型
+            relateInfo.setRequiredStage(1);
+            relateInfo.setId(records.getId());
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
                 relateInfo.setAttachType(mainDict.getValue());
                 switch (mainDict.getValue()) {
                     case "11":
@@ -444,28 +447,57 @@ public class RuralProjectMessageController extends BaseController {
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("1");
+            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
             //添加报告类型
             relateInfo.setRequiredStage(1);
-            relateInfo.setId(projectcontent.getProject().getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            relateInfo.setId(ruralProjectRecords.getId());
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
         model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
@@ -586,11 +618,52 @@ public class RuralProjectMessageController extends BaseController {
     public String deleteReport(RuralProjectcontentinfo projectcontentinfo, RedirectAttributes redirectAttributes) {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        //获取项目信息
+        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(records.getAttachmentProjectSort());
+        List<ProjectTemplateInfo> attachmentList = Lists.newArrayList();
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+            //添加项目类型
+            relateInfo.setAttachmentProjectType(records.getProjectType());
+            relateInfo.setRequiredStage(1);
+            relateInfo.setId(records.getId());
+            relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+            for (MainDictDetail mainDict : mainDictDetails) {
+                //添加报告类型
+                relateInfo.setAttachType(mainDict.getValue());
+                attachmentList.addAll(projectTemplateService.getProjectTemplateList(relateInfo));
+            }
+        }
+
+
         //修改工作内容中的信息（将工作内容的info_id清空）
         ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
         if(null != projectReportData){
             //删除报告信息
-            ruralProjectMessageService.deleteReport(projectReportData);
+            ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
@@ -805,28 +878,54 @@ public class RuralProjectMessageController extends BaseController {
             }
         }
 
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
 
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != reportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("1");
-            //添加归档类型
+            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
+            //添加报告类型
             relateInfo.setRequiredStage(2);
-            //添加项目id
             relateInfo.setId(ruralProjectRecords.getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
 
@@ -862,30 +961,56 @@ public class RuralProjectMessageController extends BaseController {
             projectReportRecord.setCreateBy(UserUtils.getUser());
         }
         projectReportRecord.setView("modify");
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
 
-
-
-        //查询报告文件、依据性文件、其他文件必填列表以及数据
-        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-        for (MainDictDetail mainDict:mainDictDetails) {
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
+            flag = true;
+        }
+        if(flag) {
             ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
             //添加项目类型
-            relateInfo.setProjectType("1");
-            //添加归档类型
+            relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+            relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+            //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+            if(0 == projectSort){
+                //查看送审金额是否为500w以上金额
+                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+                if(1 == approvalMoney){
+                    //500w以下金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("1");
+                }else{
+                    //500w以上金额状态
+                    relateInfo.setAttachmentProjectApprovalMoney("2");
+                }
+            }else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }
+
+            //添加报告类型
             relateInfo.setRequiredStage(2);
-            //添加项目id
-            relateInfo.setId(projectReportRecord.getReport().getProject().getId());
-            relateInfo.setAttachType(mainDict.getValue());
-            switch(mainDict.getValue()){
-                case "11" :
-                    projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "12" :
-                    projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-                case "13" :
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
+            relateInfo.setId(ruralProjectRecords.getId());
+            //查询报告文件、依据性文件、其他文件必填列表以及数据
+            List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+            for (MainDictDetail mainDict : mainDictDetails) {
+                relateInfo.setAttachType(mainDict.getValue());
+                switch (mainDict.getValue()) {
+                    case "11":
+                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "12":
+                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                    case "13":
+                        projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        break;
+                }
+
             }
         }
 

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientAttachmentDao.java

@@ -26,4 +26,11 @@ public interface WorkClientAttachmentDao extends CrudDao<WorkClientAttachment> {
      * @param attchment
      */
     void insertWorkAttachment(WorkClientAttachment attchment);
+
+    /**
+     * 根据关联字段和项目id删除附件信息
+     * @param attchment
+     * @return
+     */
+    Integer deleteByattachmentIdAndProjectId(WorkClientAttachment attchment);
 }

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

@@ -37,6 +37,8 @@ import com.jeeplus.modules.oaperformance.entity.OaPerformance;
 import com.jeeplus.modules.oaperformance.service.OaPerformanceService;
 import com.jeeplus.modules.officeintroduce.dao.OfficeintroduceDao;
 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.projectcontentinfo.entity.ProjectContentData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
@@ -442,6 +444,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private RuralProjectMessageService ruralProjectMessageService;
 	@Autowired
 	private HistoicFlowUtil histoicFlowUtil;
+	@Autowired
+	private ProjectAccessoryRelationService projectAccessoryRelationService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -1724,26 +1728,54 @@ public class WorkProjectNotifyController extends BaseController {
                         }
                     }
 
-					//查询报告文件、依据性文件、其他文件必填列表以及数据
-					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-					for (MainDictDetail mainDict:mainDictDetails) {
+					//根据条件查询附件必填项
+					//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+					Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+					Boolean flag = false;
+					//如果是打包项目或者报告送审价不为null则可进行查询附件类型
+					if(1 == projectSort || null != projectcontentinfo.getProjectReportData().getReviewFee()){
+						flag = true;
+					}
+					if(flag) {
 						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
 						//添加项目类型
-						relateInfo.setProjectType(ruralProjectRecords.getProjectType());
+						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+						if(0 == projectSort){
+							//查看送审金额是否为500w以上金额
+							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
+							if(1 == approvalMoney){
+								//500w以下金额状态
+								relateInfo.setAttachmentProjectApprovalMoney("1");
+							}else{
+								//500w以上金额状态
+								relateInfo.setAttachmentProjectApprovalMoney("2");
+							}
+						}else{
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+						}
+
 						//添加报告类型
 						relateInfo.setRequiredStage(1);
-						relateInfo.setId(projectReportData.getProject().getId());
-						relateInfo.setAttachType(mainDict.getValue());
-						switch(mainDict.getValue()){
-							case "11" :
-								projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-								break;
-							case "12" :
-								projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-								break;
-							case "13" :
-								projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-								break;
+						relateInfo.setId(ruralProjectRecords.getId());
+						//查询报告文件、依据性文件、其他文件必填列表以及数据
+						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+						for (MainDictDetail mainDict : mainDictDetails) {
+							relateInfo.setAttachType(mainDict.getValue());
+							switch (mainDict.getValue()) {
+								case "11":
+									projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+									break;
+								case "12":
+									projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+									break;
+								case "13":
+									projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+									break;
+							}
+
 						}
 					}
 
@@ -1881,32 +1913,61 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/processProjectReportRecord/projectReportRecordView";
 						}
 					}
+					//获取项目信息
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportRecord.getReport().getProject().getId());
 					Act act = getByAct(projectReportRecord.getProcessInstanceId());
 					projectReportRecord.setAct(act);
 					projectReportRecord.setHome("home");
 
-					//查询报告文件、依据性文件、其他文件必填列表以及数据
-					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-					for (MainDictDetail mainDict:mainDictDetails) {
+
+					//根据条件查询附件必填项
+					//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+					Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+					Boolean flag = false;
+					//如果是打包项目或者报告送审价不为null则可进行查询附件类型
+					if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
+						flag = true;
+					}
+					if(flag) {
 						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
 						//添加项目类型
-						relateInfo.setProjectType(ruralProjectRecords.getProjectType());
-						//添加归档类型
+						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+						if(0 == projectSort){
+							//查看送审金额是否为500w以上金额
+							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+							if(1 == approvalMoney){
+								//500w以下金额状态
+								relateInfo.setAttachmentProjectApprovalMoney("1");
+							}else{
+								//500w以上金额状态
+								relateInfo.setAttachmentProjectApprovalMoney("2");
+							}
+						}else{
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+						}
+
+						//添加报告类型
 						relateInfo.setRequiredStage(2);
-						//添加项目id
-						relateInfo.setId(projectReportRecord.getReport().getProject().getId());
-						relateInfo.setAttachType(mainDict.getValue());
-						switch(mainDict.getValue()){
-							case "11" :
-								projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
-								break;
-							case "12" :
-								projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
-								break;
-							case "13" :
-								projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-								break;
+						relateInfo.setId(ruralProjectRecords.getId());
+						//查询报告文件、依据性文件、其他文件必填列表以及数据
+						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+						for (MainDictDetail mainDict : mainDictDetails) {
+							relateInfo.setAttachType(mainDict.getValue());
+							switch (mainDict.getValue()) {
+								case "11":
+									projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+									break;
+								case "12":
+									projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+									break;
+								case "13":
+									projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+									break;
+							}
+
 						}
 					}
 
@@ -3364,8 +3425,49 @@ public class WorkProjectNotifyController extends BaseController {
 				workProjectNotifyService.deleteActivityProcessUser(projectReportData.getProcessInstanceId());
 				//删除流程待办信息
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
+
+				//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+				Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+				List<ProjectTemplateInfo> attachmentList = Lists.newArrayList();
+				Boolean flag = false;
+				//如果是打包项目或者报告送审价不为null则可进行查询附件类型
+				if(1 == projectSort || null != projectReportData.getReviewFee()){
+					flag = true;
+				}
+				if(flag) {
+					//查询报告文件、依据性文件、其他文件必填列表以及数据
+					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+					//添加项目类型
+					relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+					relateInfo.setRequiredStage(1);
+					relateInfo.setId(ruralProjectRecords.getId());
+					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+					if(0 == projectSort){
+						//查看送审金额是否为500w以上金额
+						Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+						if(1 == approvalMoney){
+							//500w以下金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("1");
+						}else{
+							//500w以上金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("2");
+						}
+					}else{
+						relateInfo.setAttachmentProjectApprovalMoney(null);
+					}
+					for (MainDictDetail mainDict : mainDictDetails) {
+						//添加报告类型
+						relateInfo.setAttachType(mainDict.getValue());
+						attachmentList.addAll(projectTemplateService.getProjectTemplateList(relateInfo));
+					}
+				}
+
+
+
 				//删除报告信息
-				ruralProjectMessageService.deleteReport(projectReportData);
+				ruralProjectMessageService.deleteReport(projectReportData, attachmentList);
 				map.put("code",1);
 				map.put("msg","新增报告删除成功");
 			}else{

src/main/resources/mappings/modules/workclientinfo/WorkClientAttachmentDao.xml

@@ -173,4 +173,12 @@
 
         ORDER BY a.update_date DESC
     </select>
+
+
+    <!--物理删除-->
+    <update id="deleteByattachmentIdAndProjectId">
+        DELETE FROM work_attachment
+        WHERE attachment_id = #{attachmentId}
+        and project_id = #{projectId}
+    </update>
 </mapper>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -336,7 +336,7 @@
 								</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
@@ -387,7 +387,7 @@
 								</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
@@ -438,7 +438,7 @@
 								</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -291,7 +291,7 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -379,7 +379,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -468,7 +468,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -324,7 +324,7 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -412,7 +412,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -501,7 +501,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -339,6 +339,17 @@
 			}
 		}
 
+		function getAttachment() {
+			var projectSort = $("#projectSort").val();
+			//0为非打包项目
+			if(projectSort == 0){
+				var reviewFee = $("#reviewFee").val();
+				$("#upTable").load(location.href+"&reviewFee="+reviewFee + " #upTable");
+				$("#gistdata_upTable").load(location.href+"&reviewFee="+reviewFee + " #gistdata_upTable");
+				$("#upTable_other").load(location.href+"&reviewFee="+reviewFee + " #upTable_other");
+			}
+		}
+
 		function getApprovalFee() {
 			var rf = $("#reviewFee").val();
 			var af = $("#approvalFee").val();
@@ -453,6 +464,7 @@
 		<form:hidden path="projectReportData.id"/>
 		<form:hidden path="projectReportData.createBy.id"/>
 		<form:hidden path="project.id"/>
+		<input type="hidden" id="projectSort" value="${projectSort}">
 		<sys:message content="${message}"/>
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>基本信息</h2></div>
@@ -496,7 +508,7 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
+							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -559,7 +571,7 @@
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectRecords.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -647,7 +659,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectRecords.id}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -736,7 +748,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectRecords.id}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
@@ -861,6 +873,10 @@
 
 			},
 			cancel: function(index){
+			},
+			end:function () {
+				var reviewFee = $("#reviewFee").val();
+				$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
 			}
 		});
 	}
@@ -890,7 +906,8 @@
 						parent.layer.msg(d.str,{icon:1});
 					}
 					//刷新当前模块
-					$("#"+tableId).load(location.href + " #"+tableId);
+					var reviewFee = $("#reviewFee").val();
+					$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
 					//关闭当前页
 					top.layer.close(index)
 				}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -544,7 +544,7 @@
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectId}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -633,7 +633,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectId}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -722,7 +722,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectId}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -292,7 +292,7 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -380,7 +380,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -469,7 +469,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -192,6 +192,7 @@
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
 			<form:hidden path="report.name"/>
+			<form:hidden path="report.project.id"/>
 			<input type="hidden" name="saveAuditFlag" value="1">
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -322,7 +323,7 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -410,7 +411,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -499,7 +500,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -288,19 +288,19 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" readonly="true" onchange="getFee()"/>
+                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true" onchange="getApprovalFee()"/>
+                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
+                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -324,13 +324,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">土建造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true" onchange="getBuildingFee()"/>
+                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">安装造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true" onchange="getInstallFee()"/>
+                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -385,7 +385,7 @@
                                     </td>
                                     <td class="op-td">
                                         <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
                                     </td>
                                 </tr>
@@ -433,7 +433,7 @@
                                     </td>
                                     <td class="op-td">
                                         <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
                                     </td>
                                 </tr>
@@ -481,7 +481,7 @@
                                     </td>
                                     <td class="op-td">
                                     <div class="op-btn-box" >
-                                        <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                        <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                     </div>
                                 </td>
                                 </tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportModify.jsp

@@ -544,7 +544,7 @@
 				<div class="form-group-label"><h2>报告文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectId}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
@@ -633,7 +633,7 @@
 				<div class="form-group-label"><h2>依据性资料</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${projectId}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
@@ -722,7 +722,7 @@
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${projectId}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
+					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>