新增报告上传附件列表变更

src/main/java/com/jeeplus/modules/projectAccessory/dao/ProjectTemplateDao.java

@@ -41,9 +41,15 @@ public interface ProjectTemplateDao extends CrudDao<ProjectTemplateInfo>,TreeDao
      * @param parentId
      * @return
      */
-    List<ProjectTemplateInfo> projectAccessoryListByParentId(@Param("parentId") String parentId,@Param("projectType") String projectType);
+    List<ProjectTemplateInfo> projectAccessoryListByParentIdAndprojectType(@Param("parentId") String parentId,@Param("projectType") String projectType);
 
     /**
+     * 根据父id获取子信息
+     * @param parentId
+     * @return
+     */
+    List<ProjectTemplateInfo> projectAccessoryListByParentId(ProjectAccessoryRelationInfo projectTemplateInfo);
+    /**
      * 根据父id获取子信息并保留当前id项
      * @param parentId
      * @return

src/main/java/com/jeeplus/modules/projectAccessory/entity/ProjectAccessoryRelationInfo.java

@@ -26,6 +26,11 @@ public class ProjectAccessoryRelationInfo extends TreeEntity<ProjectAccessoryRel
 	private String requiredStageStr;		// 必填阶段(1.上传报告,2.归档)
 	private List<ProjectTemplateInfo> projectTemplateList;
 
+	private String attachmentProjectType;		// 项目类型
+	private String attachmentProjectSort;		// 项目类别
+	private String attachmentProjectApprovalMoney;		// 送审金额
+	private String attachmentProjectPack;		// 打包类别
+
 	public String getAttachName() {
 		return attachName;
 	}
@@ -129,4 +134,36 @@ public class ProjectAccessoryRelationInfo extends TreeEntity<ProjectAccessoryRel
 	public void setRequiredStageStr(String requiredStageStr) {
 		this.requiredStageStr = requiredStageStr;
 	}
+
+	public String getAttachmentProjectSort() {
+		return attachmentProjectSort;
+	}
+
+	public void setAttachmentProjectSort(String attachmentProjectSort) {
+		this.attachmentProjectSort = attachmentProjectSort;
+	}
+
+	public String getAttachmentProjectApprovalMoney() {
+		return attachmentProjectApprovalMoney;
+	}
+
+	public void setAttachmentProjectApprovalMoney(String attachmentProjectApprovalMoney) {
+		this.attachmentProjectApprovalMoney = attachmentProjectApprovalMoney;
+	}
+
+	public String getAttachmentProjectType() {
+		return attachmentProjectType;
+	}
+
+	public void setAttachmentProjectType(String attachmentProjectType) {
+		this.attachmentProjectType = attachmentProjectType;
+	}
+
+	public String getAttachmentProjectPack() {
+		return attachmentProjectPack;
+	}
+
+	public void setAttachmentProjectPack(String attachmentProjectPack) {
+		this.attachmentProjectPack = attachmentProjectPack;
+	}
 }

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

@@ -53,6 +53,30 @@ public class ProjectAccessoryRelationService extends TreeService<ProjectAccessor
     }
 
     /**
+     * 获取项目类别
+     * @return
+     */
+	public static List<MainDictDetail> attachmentProjectSortList(){
+	    return  DictUtils.getMainDictList("attachment_project_sort");
+    }
+
+    /**
+     * 获取项目送审金额
+     * @return
+     */
+	public static List<MainDictDetail> attachmentProjectApprovalMoneyList(){
+	    return  DictUtils.getMainDictList("attachment_project_approval_money");
+    }
+
+    /**
+     * 获取项目打包类别
+     * @return
+     */
+	public static List<MainDictDetail> attachmentProjectPackList(){
+	    return  DictUtils.getMainDictList("attachment_project_pack");
+    }
+
+    /**
      * 获取项目必填阶段
      * @return
      */
@@ -68,66 +92,49 @@ public class ProjectAccessoryRelationService extends TreeService<ProjectAccessor
 	public Map<String,List> findListTree(ProjectAccessoryRelationInfo projectTemplateInfo) {
         Map<String,List> map = new HashMap<>();
         //获取项目类型
-        List<MainDictDetail> attachmentProjectList = attachmentProjectList();
+        //List<MainDictDetail> attachmentProjectList = attachmentProjectList();
         //新建树形列表集合
         List<ProjectAccessoryRelationTree> treeList=new ArrayList<>();
-        if(attachmentProjectList.size()>0){
-            for (MainDictDetail projectDict:attachmentProjectList) {
-                //将项目类型放入树形列表集合中
-                ProjectAccessoryRelationTree recordTreeData = new ProjectAccessoryRelationTree();
-                //将界面需要展示数据放入类中
-                recordTreeData.setId(projectDict.getValue());
-                recordTreeData.setAttachName(projectDict.getLabel());
-                recordTreeData.setPid("0");
-                //将项目类型设置为第一级数据
-                recordTreeData.setCondition(1);
-                //将项目类型信息放入
-                treeList.add(recordTreeData);
-
-                //获取项目附件模板类型
-                List<MainDictDetail> attachmentTemplateList = attachmentTemplateList();
-                if(attachmentTemplateList.size()>0){
-                    //遍历项目中的项目附件模板类型信息
-                    for (MainDictDetail mainDict:attachmentTemplateList) {
-                        ProjectAccessoryRelationTree mainDictData = new ProjectAccessoryRelationTree();
-                        //将第一级id添加到二级id中，解决三级数据重复展示问题
-                        mainDictData.setId(recordTreeData.getId()+","+mainDict.getValue());
-                        mainDictData.setAttachName(mainDict.getLabel());
-                        mainDictData.setPid(recordTreeData.getId());
-
-                        //将项目附件模板类型设置为第二级数据
-                        mainDictData.setCondition(2);
-                        //将项目附件模板类型信息放入
-                        treeList.add(mainDictData);
-
-                        //根据条件查询第三级数据集合
-                        projectTemplateInfo.setProjectType(projectDict.getValue());
-                        projectTemplateInfo.setAttachType(mainDict.getValue());
-                        List<ProjectAccessoryRelationInfo> relationlist = super.findList(projectTemplateInfo);
-                        for (int j=0;j<relationlist.size();j++){
-                            ProjectAccessoryRelationTree contentData=new ProjectAccessoryRelationTree();
-                            ProjectAccessoryRelationInfo data=relationlist.get(j);
-
-                            for (MainDictDetail mainDictInfo: attachmentRequiredStageList()) {
-                                if(data.getRequiredStage() == Integer.parseInt(mainDictInfo.getValue())){
-                                    contentData.setRequiredStageStr(mainDictInfo.getLabel());
-                                    contentData.setRequiredStage(Integer.parseInt(mainDictInfo.getValue()));
-                                }
-                            }
-
-                            contentData.setPid(mainDictData.getId());
-                            contentData.setId(data.getId());
-                            contentData.setAttachName(data.getAttachName());
-
-                            //将具体类型设置为第三级数据
-                            contentData.setCondition(3);
-                            treeList.add(contentData);
+        //获取项目附件模板类型
+        List<MainDictDetail> attachmentTemplateList = attachmentTemplateList();
+        if(attachmentTemplateList.size()>0){
+            //遍历项目中的项目附件模板类型信息
+            for (MainDictDetail mainDict:attachmentTemplateList) {
+                ProjectAccessoryRelationTree mainDictData = new ProjectAccessoryRelationTree();
+                //将第一级id添加到二级id中，解决三级数据重复展示问题
+                mainDictData.setId(mainDict.getValue());
+                mainDictData.setAttachName(mainDict.getLabel());
+                mainDictData.setPid("0");
+
+                //将项目附件模板类型设置为第二级数据
+                mainDictData.setCondition(1);
+                //将项目附件模板类型信息放入
+                treeList.add(mainDictData);
+
+                //根据条件查询第三级数据集合
+                projectTemplateInfo.setAttachType(mainDict.getValue());
+                List<ProjectAccessoryRelationInfo> relationlist = super.findList(projectTemplateInfo);
+                for (int j=0;j<relationlist.size();j++){
+                    ProjectAccessoryRelationTree contentData=new ProjectAccessoryRelationTree();
+                    ProjectAccessoryRelationInfo data=relationlist.get(j);
+
+                    for (MainDictDetail mainDictInfo: attachmentRequiredStageList()) {
+                        if(data.getRequiredStage() == Integer.parseInt(mainDictInfo.getValue())){
+                            contentData.setRequiredStageStr(mainDictInfo.getLabel());
+                            contentData.setRequiredStage(Integer.parseInt(mainDictInfo.getValue()));
                         }
-
                     }
+
+                    contentData.setPid(mainDictData.getId());
+                    contentData.setId(data.getId());
+                    contentData.setAttachName(data.getAttachName());
+
+                    //将具体类型设置为第三级数据
+                    contentData.setCondition(2);
+                    treeList.add(contentData);
                 }
-            }
 
+            }
         }
         map.put("data",treeList);
         return map;
@@ -157,4 +164,46 @@ public class ProjectAccessoryRelationService extends TreeService<ProjectAccessor
         dao.delete(projectTemplateInfo);
 	}
 
+
+
+    /**
+     * 项目类别是否为打包项目判定
+     * @param attachmentProjectSort
+     * @return
+     */
+    public Integer decideAttachmentProjectSort(String attachmentProjectSort){
+        String name = "";
+        //获取项目类别
+        List<MainDictDetail> attachmentProjectSortList = attachmentProjectSortList();
+        for (MainDictDetail dict: attachmentProjectSortList) {
+            if(dict.getValue().equals(attachmentProjectSort)){
+                name = dict.getLabel();
+                break;
+            }
+        }
+        //获取打包类别
+        List<MainDictDetail> attachmentProjectPackList = attachmentProjectPackList();
+        if(StringUtils.isNotBlank(name)){
+            for (MainDictDetail info: attachmentProjectPackList) {
+                if(info.getLabel().equals(name)){
+                    return 1;
+                }
+            }
+        }else{
+            return 2;
+        }
+        return 0;
+    }
+
+    public Integer decideAttachmentProjectApprovalMoney(Double attachmentProjectApprovalMoney){
+        if(null != attachmentProjectApprovalMoney){
+            if(attachmentProjectApprovalMoney < 5000000){
+                return 1;
+            }else {
+                return 2;
+            }
+        }
+        return 0;
+    }
+
 }

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

@@ -10,6 +10,8 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.projectAccessory.dao.ProjectTemplateDao;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.utils.DictUtils;
@@ -33,6 +35,10 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
 
     @Autowired
     private WorkClientAttachmentDao workClientAttachmentDao;
+    @Autowired
+    private RuralProjectRecordsService projectRecordsService;
+    @Autowired
+    private ProjectAccessoryRelationService projectAccessoryRelationService;
 
 	public ProjectTemplateInfo get(String id) {
 		return super.get(id);
@@ -191,12 +197,11 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
 
     /**
      * 根据parentId获取数据集
-     * @param parentId
-     * @param projectType
+     * @param projectAccessoryRelationInfo
      * @return
      */
-	public List<ProjectTemplateInfo> getProjectTemplateList(String parentId,String projectType){
-	    return dao.projectAccessoryListByParentId(parentId,projectType);
+	public List<ProjectTemplateInfo> getProjectTemplateListByForm(ProjectAccessoryRelationInfo projectAccessoryRelationInfo){
+	    return dao.projectAccessoryListByParentId(projectAccessoryRelationInfo);
     }
 
     /**
@@ -205,8 +210,31 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
      * @param projectType
      * @return
      */
-    public List<ProjectTemplateInfo> getProjectTemplateAndOtherList(String parentId,String projectType,String projectId){
-        List<ProjectTemplateInfo> templateInfoList = dao.projectAccessoryListByParentId(parentId, projectType);
+    public List<ProjectTemplateInfo> getProjectTemplateAndOtherList(String parentId,String projectType,String projectId,Double reviewFee){
+        //获取项目信息
+        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectId);
+        ProjectAccessoryRelationInfo projectTemplateInfo = new ProjectAccessoryRelationInfo();
+        projectTemplateInfo.setAttachType(parentId);
+        projectTemplateInfo.setAttachmentProjectType(projectType);
+        projectTemplateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(records.getAttachmentProjectSort());
+
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        if(0 == projectSort){
+            //查看送审金额是否为500w以上金额
+            Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reviewFee);
+            if(1 == approvalMoney){
+                //500w以下金额状态
+                projectTemplateInfo.setAttachmentProjectApprovalMoney("1");
+            }else{
+                //500w以上金额状态
+                projectTemplateInfo.setAttachmentProjectApprovalMoney("2");
+            }
+        }else{
+            projectTemplateInfo.setAttachmentProjectApprovalMoney(null);
+        }
+        List<ProjectTemplateInfo> templateInfoList = dao.projectAccessoryListByParentId(projectTemplateInfo);
         Iterator<ProjectTemplateInfo> iterator = templateInfoList.iterator();
         //查询是否已经含有附件信息，如果含有说明已经使用 无需再次展示（删除）
         while(iterator.hasNext()){
@@ -250,7 +278,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             }
         }
         //查询没有被选择必填项的数据并查询是否已经上传附件，若有则添加到展示列中
-        List<ProjectTemplateInfo> otherProjectTemplateList = dao.projectAccessoryListByParentId(projectTemplateInfo.getAttachType(),projectTemplateInfo.getProjectType());
+        List<ProjectTemplateInfo> otherProjectTemplateList = dao.projectAccessoryListByParentId(projectTemplateInfo);
         for (ProjectTemplateInfo otherInfo: otherProjectTemplateList) {
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setProjectId(projectTemplateInfo.getId());

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryRelationController.java

@@ -3,43 +3,20 @@
  */
 package com.jeeplus.modules.projectAccessory.web;
 
-import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
-import com.jeeplus.common.json.AjaxJson;
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
-import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationTree;
-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.projectConstruction.entity.ConstructionContract;
-import com.jeeplus.modules.projectVisa.entity.VisaTreeData;
-import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
-import com.jeeplus.modules.sys.entity.MainDictDetail;
-import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.utils.DictUtils;
-import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
 import java.util.*;
 
 /**
@@ -84,7 +61,19 @@ public class ProjectAccessoryRelationController extends BaseController {
 	@RequestMapping(value = "getAccessoryRelationList")
 	@ResponseBody
 	public Map<String,List> getAccessoryRelationList(ProjectAccessoryRelationInfo projectAccessoryRelationInfo){
-		return projectAccessoryRelationService.findListTree(projectAccessoryRelationInfo);
+		Map map = new HashMap();
+		if(StringUtils.isBlank(projectAccessoryRelationInfo.getAttachmentProjectType()) || StringUtils.isBlank(projectAccessoryRelationInfo.getAttachmentProjectSort())){
+			map.put("data",new ArrayList<ProjectAccessoryRelationInfo>());
+			return map;
+		}
+		if(StringUtils.isNotBlank(projectAccessoryRelationInfo.getAttachmentProjectSort())){
+			Integer decide = projectAccessoryRelationService.decideAttachmentProjectSort(projectAccessoryRelationInfo.getAttachmentProjectSort());
+			if(1 == decide || StringUtils.isNotBlank(projectAccessoryRelationInfo.getAttachmentProjectApprovalMoney())){
+				return projectAccessoryRelationService.findListTree(projectAccessoryRelationInfo);
+			}
+		}
+		map.put("data",new ArrayList<ProjectAccessoryRelationInfo>());
+		return map;
 	}
 
 
@@ -108,10 +97,9 @@ public class ProjectAccessoryRelationController extends BaseController {
 			if (StringUtils.isNotBlank(projectAccessoryRelationInfo.getParentIds())) {
 				String[] parentIds = projectAccessoryRelationInfo.getParentIds().split(",");
 				List<String> parentIdList = Arrays.asList(parentIds);
-				projectAccessoryRelationInfo.setProjectType(parentIdList.get(0));
-				projectAccessoryRelationInfo.setAttachType(parentIdList.get(1));
+				projectAccessoryRelationInfo.setAttachType(parentIdList.get(0));
 			}
-			projectAccessoryRelationInfo.setProjectTemplateList(projectTemplateService.getProjectTemplateList(projectAccessoryRelationInfo.getAttachType(), projectAccessoryRelationInfo.getProjectType()));
+			projectAccessoryRelationInfo.setProjectTemplateList(projectTemplateService.getProjectTemplateListByForm(projectAccessoryRelationInfo));
 			//获取项目阶段 并进行处理展示数据信息
 			/*List<MainDictDetail> mainDictDetails = projectAccessoryRelationService.attachmentProjectList();
 			if (mainDictDetails.size() > 0) {
@@ -164,7 +152,7 @@ public class ProjectAccessoryRelationController extends BaseController {
 			projectAccessoryRelationService.save(projectAccessoryInfo);//保存
 		}
 		addMessage(redirectAttributes, "保存项目类型附件设置成功");
-		return "redirect:"+Global.getAdminPath()+"/projectAccessoryRelation/projectAccessoryRelation/?repage";
+		return "redirect:"+Global.getAdminPath()+"/projectAccessoryRelation/projectAccessoryRelation/?repage&attachmentProjectType="+projectAccessoryInfo.getAttachmentProjectType()+"&attachmentProjectSort="+projectAccessoryInfo.getAttachmentProjectSort()+"&attachmentProjectApprovalMoney="+projectAccessoryInfo.getAttachmentProjectApprovalMoney();
 	}
 
 	/**
@@ -178,7 +166,7 @@ public class ProjectAccessoryRelationController extends BaseController {
 	public String delete(ProjectAccessoryRelationInfo projectAccessoryInfo, RedirectAttributes redirectAttributes) {
 		projectAccessoryRelationService.delete(projectAccessoryInfo);
 		addMessage(redirectAttributes, "删除项目类型附件设置成功");
-		return "redirect:"+Global.getAdminPath()+"/projectAccessoryRelation/projectAccessoryRelation/?repage";
+		return "redirect:"+Global.getAdminPath()+"/projectAccessoryRelation/projectAccessoryRelation/?repage&attachmentProjectType="+projectAccessoryInfo.getAttachmentProjectType()+"&attachmentProjectSort="+projectAccessoryInfo.getAttachmentProjectSort()+"&attachmentProjectApprovalMoney="+projectAccessoryInfo.getAttachmentProjectApprovalMoney();
 	}
 
 	/**
@@ -189,13 +177,13 @@ public class ProjectAccessoryRelationController extends BaseController {
 	 */
 	@RequiresPermissions("projectAccessoryRelation:projectAccessoryRelation:del")
 	@RequestMapping(value = "deleteAll")
-	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
+	public String deleteAll(String ids,ProjectAccessoryRelationInfo projectAccessoryInfo, RedirectAttributes redirectAttributes) {
 		String idArray[] =ids.split(",");
 		for(String id : idArray){
 			projectAccessoryRelationService.delete(projectAccessoryRelationService.get(id));
 		}
 		addMessage(redirectAttributes, "删除项目类型附件设置成功");
-		return "redirect:"+Global.getAdminPath()+"/projectAccessoryRelation/projectAccessoryRelation/?repage";
+		return "redirect:"+Global.getAdminPath()+"/projectAccessoryRelation/projectAccessoryRelation/?repage&attachmentProjectType="+projectAccessoryInfo.getAttachmentProjectType()+"&attachmentProjectSort="+projectAccessoryInfo.getAttachmentProjectSort()+"&attachmentProjectApprovalMoney="+projectAccessoryInfo.getAttachmentProjectApprovalMoney();
 	}
 
 	/**
@@ -204,9 +192,9 @@ public class ProjectAccessoryRelationController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value = "formAttachment")
-	public String formAttachment(Model model,String parentId,String projectType,String projectId) {
+	public String formAttachment(Model model,String parentId,String projectType,String projectId,Double reviewFee) {
 		ProjectAccessoryRelationInfo projectAccessoryRelationInfo = new ProjectAccessoryRelationInfo();
-		projectAccessoryRelationInfo.setProjectTemplateList(projectTemplateService.getProjectTemplateAndOtherList(parentId, projectType,projectId));
+		projectAccessoryRelationInfo.setProjectTemplateList(projectTemplateService.getProjectTemplateAndOtherList(parentId, projectType,projectId,reviewFee));
 		model.addAttribute("projectAccessoryRelationInfo", projectAccessoryRelationInfo);
 		return "modules/projectAccessory/projectAccessoryRelation/fileAttachForm";
 	}
@@ -217,4 +205,18 @@ public class ProjectAccessoryRelationController extends BaseController {
 		return projectTemplateService.getAttachmentCount(attachmentId,projectId);
 	}
 
+	/**
+	 * 项目类别是否为打包项目判定
+	 * @param attachmentProjectSort
+	 * @return
+	 */
+	@RequestMapping("decideAttachmentProjectSort")
+	@ResponseBody
+	public Map<String,Integer> decideAttachmentProjectSort(@RequestParam("attachmentProjectSort") String attachmentProjectSort){
+		Map map = new HashMap();
+		Integer result = projectAccessoryRelationService.decideAttachmentProjectSort(attachmentProjectSort);
+		map.put("result",result);
+		return map;
+	}
+
 }

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -123,6 +123,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private String projectType; //类型 1.工程咨询 2.造价审核
 	private String constructionUnit; //施工单位
 	private String constructionLinkman; //施工方联系人
+	private String attachmentProjectSort;   //项目类别
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
@@ -746,4 +747,12 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setEstimateTotalFees(Double estimateTotalFees) {
 		this.estimateTotalFees = estimateTotalFees;
 	}
+
+	public String getAttachmentProjectSort() {
+		return attachmentProjectSort;
+	}
+
+	public void setAttachmentProjectSort(String attachmentProjectSort) {
+		this.attachmentProjectSort = attachmentProjectSort;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -135,6 +135,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Date BaoGaoShuQianFaDate;  //出具报告日期
 	private String ZiXunShouRu;   //咨询收入
 	private String zaoJiaShiZhengHao;   //造价师注册证号
+	private String attachmentProjectSort;   //项目类别
 
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
@@ -902,4 +903,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setFlagArchive(String flagArchive) {
 		this.flagArchive = flagArchive;
 	}
+
+	public String getAttachmentProjectSort() {
+		return attachmentProjectSort;
+	}
+
+	public void setAttachmentProjectSort(String attachmentProjectSort) {
+		this.attachmentProjectSort = attachmentProjectSort;
+	}
 }

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

@@ -20,6 +20,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -186,6 +187,15 @@ public class RuralCostProjectRecordsController extends BaseController {
 			List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
 			projectRecords.setProjectPlanList(projectPlanList);
 			projectRecords.setWorkAttachments(projectPlanAttachment);
+
+			//处理项目类别
+			List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+			for (MainDictDetail info: mainDictList) {
+				if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+					projectRecords.setAttachmentProjectSort(info.getLabel());
+					break;
+				}
+			}
 		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsView";

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

@@ -11,6 +11,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.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
@@ -89,6 +90,8 @@ public class RuralProjectMessageController extends BaseController {
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private HistoricalService historicalService;
+    @Autowired
+    private ProjectAccessoryRelationService projectAccessoryRelationService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -165,7 +168,7 @@ public class RuralProjectMessageController 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();
@@ -187,31 +190,63 @@ public class RuralProjectMessageController 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) {
-            ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
-            //添加项目类型
-            relateInfo.setProjectType("1");
-            //添加报告类型
-            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;
+
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(records.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        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");
+                    }
+                }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;
+                }
+
             }
         }
 
         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/ruralporjectmessage/projectcontentinfo/reportForm";
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {

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

@@ -20,6 +20,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -162,6 +163,14 @@ public class RuralProjectRecordsController extends BaseController {
 			List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
 			projectRecords.setProjectPlanList(projectPlanList);
 			projectRecords.setWorkAttachments(projectPlanAttachment);
+			//处理项目类别
+			List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+			for (MainDictDetail info: mainDictList) {
+				if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+					projectRecords.setAttachmentProjectSort(info.getLabel());
+					break;
+				}
+			}
 		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsView";

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

@@ -1305,8 +1305,24 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
 						model.addAttribute("projectRecords", ruralProjectRecords);
 						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+							//处理项目类别
+							List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+							for (MainDictDetail info: mainDictList) {
+								if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+									ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+									break;
+								}
+							}
 							return "modules/ruralprojectrecords/ruralProjectRecordsView";
 						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+							//处理项目类别
+							List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+							for (MainDictDetail info: mainDictList) {
+								if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+									ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+									break;
+								}
+							}
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							return "modules/ruralprojectrecords/ruralProjectRecordsModify";

src/main/resources/mappings/modules/projectAccessory/ProjectAccessoryRelationDao.xml

@@ -13,7 +13,10 @@
 		a.project_type AS "projectType",
 		a.attach_type AS "attachType",
 		a.attach_id AS "attachId",
-		a.required_stage AS "requiredStage"
+		a.required_stage AS "requiredStage",
+		a.attachment_project_type as "attachmentProjectType",
+		a.attachment_project_sort as "attachmentProjectSort",
+		a.attachment_project_approval_money as "attachmentProjectApprovalMoney"
 	</sql>
 	
     
@@ -32,14 +35,17 @@
 		left join project_template_structure_info ptsi on ptsi.id = a.attach_id
 		<where>
 		a.del_flag = 0
-			<if test="projectType!=null and projectType != ''">
-				and a.project_type = #{projectType}
-			</if>
 			<if test="attachType!=null and attachType != ''">
 				and a.attach_type = #{attachType}
 			</if>
-			<if test="attachName!=null and attachName != ''">
-				and ptsi.attach_name like concat('%',#{attachName},'%')
+			<if test="attachmentProjectType!=null and attachmentProjectType != ''">
+				and a.attachment_project_type = #{attachmentProjectType}
+			</if>
+			<if test="attachmentProjectSort!=null and attachmentProjectSort != ''">
+				and a.attachment_project_sort = #{attachmentProjectSort}
+			</if>
+			<if test="attachmentProjectApprovalMoney!=null and attachmentProjectApprovalMoney != ''">
+				and a.attachment_project_approval_money = #{attachmentProjectApprovalMoney}
 			</if>
 		</where>
 		<choose>
@@ -88,7 +94,13 @@
 			project_type,
 			attach_type,
 			attach_id,
-			required_stage
+			required_stage,
+			attachment_project_type,
+			attachment_project_sort
+			<if test="attachmentProjectApprovalMoney!=null and attachmentProjectApprovalMoney != ''">
+				,attachment_project_approval_money
+			</if>
+
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -100,7 +112,13 @@
 			#{projectType},
 			#{attachType},
 			#{attachId},
-			#{requiredStage}
+			#{requiredStage},
+			#{attachmentProjectType},
+			#{attachmentProjectSort}
+			<if test="attachmentProjectApprovalMoney!=null and attachmentProjectApprovalMoney != ''">
+				,#{attachmentProjectApprovalMoney}
+			</if>
+
 		)
 	</insert>
 	

src/main/resources/mappings/modules/projectAccessory/ProjectTemplateDao.xml

@@ -67,14 +67,34 @@
 		where a.parent_id ="0"
 	</select>
 
-	<select id="projectAccessoryListByParentId" resultType="com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo" >
+
+	<select id="projectAccessoryListByParentIdAndprojectType" resultType="com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo" >
 		SELECT
-			<include refid="workReviewStandardColumns"/>
+		<include refid="workReviewStandardColumns"/>
 		FROM project_template_structure_info a
 		where a.parent_id =#{parentId}
 		and a.id not in(select attach_id from project_accessory_relation_info where project_type = #{projectType} and attach_type = #{parentId} )
 	</select>
 
+	<select id="projectAccessoryListByParentId" resultType="com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo" >
+		SELECT
+			<include refid="workReviewStandardColumns"/>
+		FROM project_template_structure_info a
+		where a.parent_id =#{attachType}
+		and a.id not in(select attach_id from project_accessory_relation_info b
+		<where>
+			b.attachment_project_type = #{attachmentProjectType}
+			and b.attach_type = #{attachType}
+			<if test="attachmentProjectSort != null and attachmentProjectSort!=''">
+				and b.attachment_project_sort = #{attachmentProjectSort}
+			</if>
+			<if test="attachmentProjectApprovalMoney != null and attachmentProjectApprovalMoney!=''">
+				and b.attachment_project_approval_money = #{attachmentProjectApprovalMoney}
+			</if>
+		</where>
+		)
+	</select>
+
 	<select id="getProjectTemplateListById" resultType="com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo" >
 		SELECT
 			a.id as "id", a.attach_name as "attachName",a.parent_id as "parentId"
@@ -255,8 +275,17 @@
 		,b.required_stage as "requiredStage"
 		from project_template_structure_info a
 		left join project_accessory_relation_info b on b.attach_id = a.id
-		WHERE b.project_type = #{projectType}
-		and b.attach_type = #{attachType}
+		<where>
+			b.attachment_project_type = #{attachmentProjectType}
+			and b.attach_type = #{attachType}
+			<if test="attachmentProjectSort != null and attachmentProjectSort!=''">
+				and b.attachment_project_sort = #{attachmentProjectSort}
+			</if>
+			<if test="attachmentProjectApprovalMoney != null and attachmentProjectApprovalMoney!=''">
+				and b.attachment_project_approval_money = #{attachmentProjectApprovalMoney}
+			</if>
+		</where>
+
 		<choose>
 			<when test="requiredStage!=null and requiredStage != '' and requiredStage == 1">
 				order by b.required_stage asc , a.index_num asc

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

@@ -48,7 +48,8 @@
 		a.construction_unit as "constructionUnit",
 		a.construction_linkman as "constructionLinkman",
 		a.project_type as "projectType",
-		a.over_due_status as "overDueStatus"
+		a.over_due_status as "overDueStatus",
+		a.attachment_project_sort as "attachmentProjectSort"
 	</sql>
 	
 	<sql id="projectRecordsJoins">
@@ -413,7 +414,8 @@
 		    ending_date,
 		    estimate_total_fees,
 			construction_unit,
-			construction_linkman
+			construction_linkman,
+			attachment_project_sort
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -457,7 +459,8 @@
 			#{endingDate},
 			#{estimateTotalFees},
 			#{constructionUnit},
-			#{constructionLinkman}
+			#{constructionLinkman},
+			#{attachmentProjectSort}
 		)
 	</insert>
 	
@@ -500,7 +503,8 @@
 		    ending_date =  #{endingDate},
 		    estimate_total_fees = #{estimateTotalFees},
 			construction_unit = #{constructionUnit},
-			construction_linkman = #{constructionLinkman}
+			construction_linkman = #{constructionLinkman},
+			attachment_project_sort = #{attachmentProjectSort}
 		WHERE id = #{id}
 	</update>
 
@@ -540,7 +544,8 @@
 		    total_fees =  #{totalFees},
 		    start_date =  #{startDate},
 		    ending_date =  #{endingDate},
-		    estimate_total_fees = #{estimateTotalFees}
+		    estimate_total_fees = #{estimateTotalFees},
+		    attachment_project_sort = #{attachmentProjectSort}
 		WHERE id = #{id}
 	</update>
 	

src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationForm.jsp

@@ -54,6 +54,9 @@
 		<form:hidden path="id"/>
 		<input type="hidden" id="attachType" name="attachType" value="${projectAccessoryRelationInfo.attachType}">
 		<input type="hidden" id="projectType" name="projectType" value="${projectAccessoryRelationInfo.projectType}">
+		<input type="hidden" id="attachmentProjectType" name="attachmentProjectType" value="${projectAccessoryRelationInfo.attachmentProjectType}">
+		<input type="hidden" id="attachmentProjectSort" name="attachmentProjectSort" value="${projectAccessoryRelationInfo.attachmentProjectSort}">
+		<input type="hidden" id="attachmentProjectApprovalMoney" name="attachmentProjectApprovalMoney" value="${projectAccessoryRelationInfo.attachmentProjectApprovalMoney}">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>附件结构信息</h2></div>
 

src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -42,6 +42,33 @@
 				type : 'date'
 , trigger: 'click'
 			});
+
+
+			var attachmentProjectSort = $("#attachmentProjectSort").val()
+			if(undefined != attachmentProjectSort && null != attachmentProjectSort && "" != attachmentProjectSort){
+				$.ajax({
+					type:"post",
+					url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/decideAttachmentProjectSort',
+					data:{"attachmentProjectSort":attachmentProjectSort},
+					dataType:"json",
+					success:function(data){
+						if(data.result == 0) {
+							document.getElementById("attachmentProjectApprovalMoney").disabled=false;
+							document.getElementById("attachmentProjectApprovalMoney").style="background-color:#FFFFFF";
+						}else if(data.result == 1){
+							document.getElementById("attachmentProjectApprovalMoney").disabled=true;
+							document.getElementById("attachmentProjectApprovalMoney").style="background-color:#e2e2e2";
+							$("#attachmentProjectApprovalMoney").val("");
+						}else{
+							top.layer.msg("该项目类别不存在！", {icon: 0});
+							window.location.reload();
+						}
+					}
+				})
+			}else{
+				document.getElementById("attachmentProjectApprovalMoney").disabled=false;
+				document.getElementById("attachmentProjectApprovalMoney").style="background-color:#FFFFFF"
+			}
 		});
 
 		function reset() {
@@ -144,6 +171,38 @@
 				}
 			});
 		}
+
+		/**
+		 * 项目类别变更进行处理
+		 */
+		function projectSortChange() {
+			var attachmentProjectSort = $("#attachmentProjectSort").val()
+			if(undefined != attachmentProjectSort && null != attachmentProjectSort && "" != attachmentProjectSort){
+				$.ajax({
+					type:"post",
+					url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/decideAttachmentProjectSort',
+					data:{"attachmentProjectSort":attachmentProjectSort},
+					dataType:"json",
+					success:function(data){
+						if(data.result == 0) {
+							document.getElementById("attachmentProjectApprovalMoney").disabled=false;
+							document.getElementById("attachmentProjectApprovalMoney").style="background-color:#FFFFFF";
+						}else if(data.result == 1){
+							document.getElementById("attachmentProjectApprovalMoney").disabled=true;
+							document.getElementById("attachmentProjectApprovalMoney").style="background-color:#e2e2e2";
+							$("#attachmentProjectApprovalMoney").val("");
+							$("#searchForm").submit();
+						}else{
+							top.layer.msg("该项目类别不存在！", {icon: 0});
+							window.location.reload();
+						}
+					}
+				})
+			}else{
+				document.getElementById("attachmentProjectApprovalMoney").disabled=false;
+				document.getElementById("attachmentProjectApprovalMoney").style="background-color:#FFFFFF"
+			}
+		}
 	</script>
 	<style>
 		body{
@@ -164,11 +223,23 @@
 				<form:form id="searchForm" modelAttribute="projectAccessoryRelationInfo" action="${ctx}/projectAccessoryRelation/projectAccessoryRelation/list" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-					<div class="commonQuery lw14">
-						<div class="layui-item query athird">
-							<label class="layui-form-label">附件名称：</label>
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目类型：</label>
 							<div class="layui-input-block">
-								<form:input path="attachName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:select path="attachmentProjectType" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目类别：</label>
+							<div class="layui-input-block">
+								<form:select path="attachmentProjectSort" class=" form-control  simple-select" onchange="projectSortChange()">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
 							</div>
 						</div>
 
@@ -181,6 +252,18 @@
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">送审金额：</label>
+							<div class="layui-input-block">
+								<form:select path="attachmentProjectApprovalMoney" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getMainDictList('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div style="clear:both;"></div>
+					</div>
 				</form:form>
 			</div>
 		</div>
@@ -230,9 +313,17 @@
 
 		// 渲染表格
 		var renderTable = function () {
-			var attachName = $("#attachName").val();
-			if(undefined == attachName){
-				attachName = "";
+			var attachmentProjectType = $("#attachmentProjectType").val();
+			if(undefined == attachmentProjectType){
+				attachmentProjectType = "";
+			}
+			var attachmentProjectSort = $("#attachmentProjectSort").val();
+			if(undefined == attachmentProjectSort){
+				attachmentProjectSort = "";
+			}
+			var attachmentProjectApprovalMoney = $("#attachmentProjectApprovalMoney").val();
+			if(undefined == attachmentProjectApprovalMoney){
+				attachmentProjectApprovalMoney = "";
 			}
 			layer.load(2);
 			treetable.render({
@@ -243,21 +334,19 @@
 				treeDefaultClose: false,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
-				url: '${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAccessoryRelationList?attachName='+attachName,
+				url: '${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAccessoryRelationList?attachmentProjectType='+attachmentProjectType +'&attachmentProjectSort='+attachmentProjectSort +'&attachmentProjectApprovalMoney='+attachmentProjectApprovalMoney,
 				page: false,
 				cols: [[
 					{type: 'numbers', align:'center', title: '序号' ,width:80},
 					{field: 'attachName', title: '附件结构名称',templet:function(d){
 							if(d.condition ==1){
 								return "<font>"+d.attachName+"</font>";
-							}else if(d.condition ==2){
-								return "<font>"+d.attachName+"</font>";
 							}else{
 								return "<font>"+d.attachName+"</font>";
 							}
 						}},
 					{field: 'requiredStageStr', title: '必填阶段',templet:function(d){
-							if(d.condition ==1 || d.condition ==2){
+							if(d.condition ==1){
 
 								return "";
 							}else{
@@ -293,15 +382,23 @@
 
 
 		function complain(d){//操作中显示的内容
+			var attachmentProjectType = $("#attachmentProjectType").val();
+			if(undefined == attachmentProjectType){
+				attachmentProjectType = "";
+			}
+			var attachmentProjectSort = $("#attachmentProjectSort").val();
+			if(undefined == attachmentProjectSort){
+				attachmentProjectSort = "";
+			}
+			var attachmentProjectApprovalMoney = $("#attachmentProjectApprovalMoney").val();
+			if(undefined == attachmentProjectApprovalMoney){
+				attachmentProjectApprovalMoney = "";
+			}
 			if(d.condition ==1) {
 				return [
-					'',
-				].join('');
-			} else if(d.condition ==2) {
-				return [
-					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?parentIds='+d.id+' \',\'80%\',\'60%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增附件关系</a>',
+					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?attachmentProjectType='+attachmentProjectType +'&attachmentProjectSort='+attachmentProjectSort +'&attachmentProjectApprovalMoney='+attachmentProjectApprovalMoney+'&parentIds='+d.id+' \',\'80%\',\'60%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增附件关系</a>',
 				].join('');
-			} else if (d.condition ==3){
+			} else if (d.condition ==2){
 				return [
 					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
 					'<a href="${ctx}/projectAccessoryRelation/projectAccessoryRelation/delete?id='+d.id+'" onclick="return confirmx(\'确认要删除该必填阶段吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>'

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -830,6 +830,15 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
+                    <div class="layui-input-block">
+                        <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -853,6 +853,15 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
+                    <div class="layui-input-block">
+                        <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -226,6 +226,13 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类别：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+					</div>
+				</div>
 				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -275,6 +275,12 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类别：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+					</div>
+				</div>
 				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -851,51 +851,51 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
-                <%--<div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程结构：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
                     <div class="layui-input-block">
-                        <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
+                        <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('project_structure')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">地上层数：</label>
-                    <div class="layui-input-block">
-                        <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">底下层数：</label>
-                    <div class="layui-input-block">
-                        <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">地上层数：</label>
+                        <div class="layui-input-block">
+                            <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">建筑面积或规模：</label>
-                    <div class="layui-input-block">
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" onchange="getBudlingFees()"/>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">底下层数：</label>
+                        <div class="layui-input-block">
+                            <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">计量单位：</label>
-                    <div class="layui-input-block">
-                        <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line">建筑面积或规模：</label>
+                        <div class="layui-input-block">
+                            <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" onchange="getBudlingFees()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程用途：</label>
-                    <div class="layui-input-block">
-                        <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">计量单位：</label>
+                        <div class="layui-input-block">
+                            <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
                     </div>
-                </div>--%>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">工程用途：</label>
+                        <div class="layui-input-block">
+                            <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -843,6 +843,15 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
+                    <div class="layui-input-block">
+                        <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -226,6 +226,12 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类别：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+					</div>
+				</div>
 				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">

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

@@ -342,6 +342,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();
@@ -456,6 +467,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>
@@ -499,7 +511,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">
@@ -561,7 +573,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=${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=1&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>
@@ -651,7 +663,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=${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=1&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>
@@ -740,7 +752,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=${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=1&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>
@@ -865,6 +877,10 @@
 
 			},
 			cancel: function(index){
+			},
+			end:function () {
+				var reviewFee = $("#reviewFee").val();
+				$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
 			}
 		});
 	}
@@ -893,7 +909,8 @@
 					if(d.str.length>0){
 						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)
 				}