Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectEngineering/entity/EngineeringTree.java

@@ -0,0 +1,46 @@
+package com.jeeplus.modules.projectEngineering.entity;
+
+import java.util.List;
+
+/**
+ * 工程类型树形实体类
+ */
+public class EngineeringTree {
+
+    private String title; //工程类型名称
+    private String id;  //工程类型Id
+    private String type; //是否有子集
+    private List<EngineeringTree> child;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public List<EngineeringTree> getChild() {
+        return child;
+    }
+
+    public void setChild(List<EngineeringTree> child) {
+        this.child = child;
+    }
+}

src/main/java/com/jeeplus/modules/projectEngineering/service/ProjectEngineeringService.java

@@ -104,6 +104,9 @@ public class ProjectEngineeringService extends TreeService<ProjectEngineeringInf
                 projectEngineeringInfo.setParentIds("0,");
                 projectEngineeringInfo.setParentId("0");
                 orderNum = this.selectOrderNum("0");
+                if (null == orderNum){
+                    orderNum="0";
+                }
                 projectEngineeringInfo.setCompanyId("0");
             }
             //判断是否有数据，没有数据则默认给编号01，有则在最大数据上递增1

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

@@ -179,6 +179,11 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String projectMasterId;		//项目负责人id
 	private List<User> projectMasterIds; //项目负责人list
 
+	private String engineeringType;	//工程类型id
+	private String engineeringName;	//工程类型名称
+	private String submitMoney;		//送审金额
+
+
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
@@ -1249,4 +1254,28 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setProjectMasterIds(List<User> projectMasterIds) {
 		this.projectMasterIds = projectMasterIds;
 	}
+
+	public String getEngineeringType() {
+		return engineeringType;
+	}
+
+	public void setEngineeringType(String engineeringType) {
+		this.engineeringType = engineeringType;
+	}
+
+	public String getEngineeringName() {
+		return engineeringName;
+	}
+
+	public void setEngineeringName(String engineeringName) {
+		this.engineeringName = engineeringName;
+	}
+
+	public String getSubmitMoney() {
+		return submitMoney;
+	}
+
+	public void setSubmitMoney(String submitMoney) {
+		this.submitMoney = submitMoney;
+	}
 }

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

@@ -1688,14 +1688,21 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//添加项目类型
 		relateInfo.setAttachmentProjectType(projectRecords.getProjectType());
 		relateInfo.setAttachmentProjectSort(projectRecords.getAttachmentProjectSort());
-		Integer approvalMoney = 0;
-		if(null != projectReportData){
+//		Integer approvalMoney = 0;
+//		if(null != projectReportData){
 			//查看送审金额是否为500w以上金额
-			approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//			approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
 
-		}
+//		}
 		//设置默认值为500w以上的展示数据
-		approvalMoney = 2;
+//		approvalMoney = 2;
+		String money=projectcontentinfo.getProject().getSubmitMoney();
+		Integer approvalMoney=null;
+		if(null==money){
+			approvalMoney=1;
+		}else{
+			approvalMoney=Integer.parseInt(money);
+		}
 		switch (approvalMoney){
 			case 0:
 				//金额为0

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

@@ -189,8 +189,15 @@ public class RuralCostProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
-        approvalMoney = 2;
+//                Integer appsrovalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
+//        approvalMoney = 2;
+        String money=projectcontentinfo.getProject().getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -473,8 +480,15 @@ public class RuralCostProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -666,8 +680,15 @@ public class RuralCostProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=records.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -935,8 +956,15 @@ public class RuralCostProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -1032,8 +1060,15 @@ public class RuralCostProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0

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

@@ -15,6 +15,8 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
@@ -87,6 +89,8 @@ public class RuralCostProjectRecordsController extends BaseController {
 	private RuralProjectMessageService ruralProjectMessageService;
 	@Autowired
 	private WorkProjectNotifyService workProjectNotifyService;
+	@Autowired
+	private ProjectEngineeringService engineeringService;
 
 	private static String template_path = Global.getProjectTemplatePath()+"咨询工作方案.xlsx";
 	private static String template_name = "咨询工作方案.xlsx";
@@ -201,6 +205,9 @@ public class RuralCostProjectRecordsController extends BaseController {
 			projectRecords.setLeaderIds(UserUtils.getUser().getId());
 			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
         }
+		//获取所有工程类型
+		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+		model.addAttribute("engineeringInfo", engineeringInfos);
 		model.addAttribute("ruralProjectRecords", projectRecords);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm";
 	}
@@ -397,7 +404,9 @@ public class RuralCostProjectRecordsController extends BaseController {
             act.setTask(taskInfok);
             projectRecords.setAct(act);
         }
-
+		//获取所有工程类型
+		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+		model.addAttribute("engineeringInfo", engineeringInfos);
         projectRecordsService.queryProjectDetail(projectRecords);
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify";

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

@@ -212,8 +212,15 @@ public class RuralProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
-        approvalMoney = 2;
+//                Integer appsrovalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
+//        approvalMoney = 2;
+        String money=projectcontentinfo.getProject().getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -492,8 +499,15 @@ public class RuralProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -688,8 +702,15 @@ public class RuralProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=records.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -963,8 +984,15 @@ public class RuralProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -1059,8 +1087,15 @@ public class RuralProjectMessageController extends BaseController {
             //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
-                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-        approvalMoney = 2;
+//                Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0

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

@@ -18,6 +18,8 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
@@ -49,6 +51,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -77,7 +80,8 @@ public class RuralProjectRecordsController extends BaseController {
 
 	@Autowired
 	private RuralProjectRecordsService projectRecordsService;
-
+	@Autowired
+	private ProjectEngineeringService engineeringService;
 	@Autowired
 	private WorkContractInfoService contractInfoService;
 	@Autowired
@@ -196,6 +200,9 @@ public class RuralProjectRecordsController extends BaseController {
 			projectRecords.setLeaderIds(UserUtils.getUser().getId());
 			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
         }
+		//查询所有的工程分类
+		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+		model.addAttribute("engineeringInfo", engineeringInfos);
 		model.addAttribute("ruralProjectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsForm";
 	}
@@ -360,6 +367,9 @@ public class RuralProjectRecordsController extends BaseController {
             act.setTask(taskInfok);
             projectRecords.setAct(act);
         }
+		//查询所有的工程分类
+		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+		model.addAttribute("engineeringInfo", engineeringInfos);
         projectRecordsService.queryProjectDetail(projectRecords);
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/ruralProjectRecordsModify";
@@ -1055,4 +1065,19 @@ public class RuralProjectRecordsController extends BaseController {
 		}
 		return map;
 	}
+
+//	/**
+//	 * 查询其他文件树形信息
+//	 */
+//	@RequestMapping(value = "engineeringTreeMenu")
+//	@ResponseBody
+//	public JSONObject engineeringTreeMenu(){
+////		List<>
+//		//查询所有工程分类的父类
+//		List<ProjectEngineeringInfo> parents=engineeringService.getParentInfo();
+//		for(ProjectEngineeringInfo engineeringInfo:parents){
+//			ProjectEngineeringInfo child=engineeringService.get(engineeringInfo.getId());
+//		}
+//		return null;
+//	}
 }

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

@@ -12,6 +12,8 @@ import com.jeeplus.modules.act.service.ActTaskService;
 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.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
@@ -97,6 +99,8 @@ public class RuralProjectViewController extends BaseController {
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private ActTaskService actTaskService;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
 
     /**
      * 项目查看
@@ -159,6 +163,9 @@ public class RuralProjectViewController extends BaseController {
         if (null!=reported){
             model.addAttribute("reportedId",reported.getId());
         }
+        //查询所有的工程类型
+        List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+        model.addAttribute("engineeringInfo",engineeringInfos);
         return "modules/ruralprojectrecords/view/ruralProjectRecordsView";
     }
 
@@ -251,8 +258,15 @@ public class RuralProjectViewController extends BaseController {
         //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
         /*if(0 == projectSort){*/
         //查看送审金额是否为500w以上金额
-        Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-        approvalMoney = 2;
+//        Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0
@@ -534,8 +548,15 @@ public class RuralProjectViewController extends BaseController {
         //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
         //if(0 == projectSort){
         //查看送审金额是否为500w以上金额
-        Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-        approvalMoney = 2;
+//        Integer appsrovalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(null==money){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
         switch (approvalMoney){
             case 0:
                 //金额为0

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

@@ -40,6 +40,8 @@ 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.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchProInfoDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
@@ -470,6 +472,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private ProjectFilingBatchProInfoDao projectFilingBatchProInfoDao;
 	@Autowired
 	private RuralProjectRecordsReportedDao ruralProjectRecordsReportedDao;
+	@Autowired
+	private ProjectEngineeringService engineeringService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -1311,6 +1315,9 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				} else if (workProjectNotify.getType().equals("39")) {    //项目登记
 					boolean flag = false;
+					//获取全部工程类型
+					List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("engineeringInfo", engineeringInfos);
 					//通过通知信息id获取项目登记对象
 					ProjectRecords projectRecords = projectRecordsService.get(workProjectNotify.getNotifyId());
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(workProjectNotify.getNotifyId());
@@ -1885,9 +1892,16 @@ public class WorkProjectNotifyController extends BaseController {
 						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
 						//if(0 == projectSort){
 							//查看送审金额是否为500w以上金额
-							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
+//							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
 					//设置默认值为500w以上的展示数据
-					approvalMoney = 2;
+//					approvalMoney = 2;
+					String money=ruralProjectRecords.getSubmitMoney();
+					Integer approvalMoney=null;
+					if(null==money){
+						approvalMoney=1;
+					}else{
+						approvalMoney=Integer.parseInt(money);
+					}
 					switch (approvalMoney){
 						case 0:
 							//金额为0
@@ -2117,9 +2131,16 @@ public class WorkProjectNotifyController extends BaseController {
 						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
 						//if(0 == projectSort){
 							//查看送审金额是否为500w以上金额
-							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+//							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
 							//设置默认值为500w以上的展示数据
-							approvalMoney = 2;
+//							approvalMoney = 2;
+							String money=ruralProjectRecords.getSubmitMoney();
+							Integer approvalMoney=null;
+							if(null==money){
+								approvalMoney=1;
+							}else{
+								approvalMoney=Integer.parseInt(money);
+							}
 							switch (approvalMoney){
 								case 0:
 									//金额为0
@@ -3727,9 +3748,17 @@ public class WorkProjectNotifyController extends BaseController {
 					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
 					//if(0 == projectSort){
 						//查看送审金额是否为500w以上金额
-						Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-						//设置默认值为500w以上的展示数据
-						approvalMoney = 2;
+//						Integer appsrovalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//						//设置默认值为500w以上的展示数据
+//						approvalMoney = 2;
+						String money=ruralProjectRecords.getSubmitMoney();
+						Integer approvalMoney=null;
+						if(null==money){
+							approvalMoney=1;
+						}else{
+							approvalMoney=Integer.parseInt(money);
+						}
+
 						switch (approvalMoney){
 							case 0:
 								//金额为0

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

@@ -68,6 +68,8 @@
 		,prd.number AS "projectReportNumber"
 		,prr.id As "prrid"
 		,a.project_master_id as "projectMasterId"
+		,a.submit_money as "submitMoney"
+		,a.engineering_type as "engineeringType"
 		,supmi.name as "projectMasterName"
         FROM rural_project_records a
         <include refid="projectRecordsJoins"/>
@@ -430,7 +432,9 @@
 			construction_unit,
 			construction_linkman,
 			attachment_project_sort,
-			project_master_id
+			project_master_id,
+			submit_money,
+			engineering_type
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -476,7 +480,9 @@
 			#{constructionUnit},
 			#{constructionLinkman},
 			#{attachmentProjectSort},
-			#{projectMasterId}
+			#{projectMasterId},
+		    #{submitMoney},
+		    #{engineeringType}
 		)
 	</insert>
 	
@@ -524,6 +530,8 @@
 			<if test="projectMasterId != null and projectMasterId != ''">
 				,project_master_id = #{projectMasterId}
 			</if>
+			,submit_money =#{submitMoney},
+			engineering_type =#{engineeringType}
 		WHERE id = #{id}
 	</update>
 	<update id="updateDate">

src/main/webapp/webpage/modules/oa/oaNotifyListMyself.jsp

@@ -113,8 +113,13 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -164,7 +169,10 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>

src/main/webapp/webpage/modules/oa/oaNotifyListReadMyself.jsp

@@ -83,8 +83,13 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -135,7 +140,10 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>

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

@@ -878,6 +878,27 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程类型：</label>
+                    <div class="layui-input-block">
+                        <select name="engineeringType">
+                            <option value=""></option>
+                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">
+                                <option value="${info.id}" <c:if test="${info.id == ruralProjectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
+                            </c:forEach>
+                        </select>
+                    </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="submitMoney" class="form-control required simple-select">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -872,7 +872,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                        cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
@@ -885,6 +885,33 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">项目负责人：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
+                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程类型：</label>
+                    <div class="layui-input-block">
+                        <select name="engineeringType">
+                            <option value=""></option>
+                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">
+                                <option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
+                            </c:forEach>
+                        </select>
+                    </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="submitMoney" class="form-control required simple-select">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -269,6 +269,26 @@
 											   title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">工程类型：</label>
+					<div class="layui-input-block">
+						<select name="engineeringType" disabled="true">
+							<option value=""></option>
+							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
+								<option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
+							</c:forEach>
+						</select>
+					</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="submitMoney" class="form-control required simple-select">
+							<form:option value=""/>
+							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">

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

@@ -6,8 +6,8 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
-    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -100,8 +100,12 @@
                 ccname=$("#contractClientName").val();
                 cptype=$("#constructionProjectType").val();
             }
-            layui.use(['form', 'layer'], function () {
+            layui.use(['dropdown', 'util','form', 'layer'], function () {
                 var form = layui.form;
+                var dropdown = layui.dropdown
+                    ,util = layui.util
+                    ,layer = layui.layer
+                    ,$ = layui.jquery;
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
                     var span=data.value;
@@ -125,6 +129,45 @@
                         $("#divv3").hide();
                     }
                 });
+                //工程类型树形菜单
+                layui.dropdown.render({
+                    elem: '#demo100'
+                    ,data: ''
+                    // ,data: [
+                    //     {
+                    //         title: 'menu item 4'
+                    //         ,id: 4
+                    //     },{
+                    //         title: 'menu item 5'
+                    //         ,id: 5
+                    //         ,type:'group'
+                    //         ,child: [{
+                    //             title: 'menu item 5-1'
+                    //             ,type:'group'
+                    //             ,id: 55
+                    //             ,child: [{
+                    //                 title: 'menu item 5-1-1'
+                    //                 ,id: 5555
+                    //             },{
+                    //                 title: 'menu item 5-1-2'
+                    //                 ,id: 55555
+                    //             },{
+                    //                 title: 'menu item 5-1-3'
+                    //                 ,id: 555555
+                    //             }]
+                    //         },{
+                    //             title: 'menu item 5-2'
+                    //             ,id: 52
+                    //         },{
+                    //             title: 'menu item 5-3'
+                    //             ,id: 53
+                    //         }]
+                    //
+                    //     }]
+                    ,click: function(item){
+                        layer.msg(util.escape(JSON.stringify(item)));
+                    }
+                });
             });
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -890,6 +933,29 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程类型：</label>
+                    <div class="layui-input-block">
+<%--                        <select name="engineeringType">--%>
+<%--                            <option value=""></option>--%>
+<%--                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
+<%--                                <option value="${info.id}" <c:if test="${info.id == ruralProjectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>--%>
+<%--                            </c:forEach>--%>
+<%--                        </select>--%>
+                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%" id="demo100">
+                            <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
+                        </button>
+                    </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="submitMoney" class="form-control required simple-select">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -737,7 +737,7 @@
                     </div>
                     <div id="divv3">
                         <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label">工程分类：</label>
+                            <label class="layui-form-label">合同类型：</label>
                             <div class="layui-input-block">
                                 <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
                             </div>
@@ -883,6 +883,26 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程类型：</label>
+                    <div class="layui-input-block">
+                        <select name="engineeringType">
+                            <option value=""></option>
+                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">
+                                <option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
+                            </c:forEach>
+                        </select>
+                    </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="submitMoney" class="form-control required simple-select">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -79,8 +79,13 @@
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -133,7 +138,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1"></table>

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

@@ -79,8 +79,13 @@
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -133,7 +138,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1"></table>

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

@@ -219,6 +219,26 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">工程类型：</label>
+					<div class="layui-input-block">
+						<form:select path="engineeringType" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+							<form:options items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>
+<%--							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
+<%--								<form:option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</form:option>--%>
+<%--							</c:forEach>--%>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">送审金额：</label>
+					<div class="layui-input-block">
+						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+							<form:option value=""/>
+							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -148,7 +148,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目负责人：</label>
+					<label class="layui-form-label">项目责任人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
@@ -160,6 +160,32 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectMasterName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">工程类型：</label>
+					<div class="layui-input-block">
+						<form:select path="engineeringType" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+							<form:options items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>
+							<%--							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
+							<%--								<form:option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</form:option>--%>
+							<%--							</c:forEach>--%>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">送审金额：</label>
+					<div class="layui-input-block">
+						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+							<form:option value=""/>
+							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyBacklogListByMine.jsp

@@ -406,8 +406,13 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -432,7 +437,10 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -518,8 +518,13 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -544,7 +549,10 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

@@ -406,8 +406,13 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -432,7 +437,10 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadShowList.jsp

@@ -160,8 +160,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button style="margin-right: 0px;" id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -172,7 +174,10 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyShowList.jsp

@@ -160,8 +160,12 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button style="margin-right: 0px;" id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button style="margin-right: 0px;" id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery layui-btn layui-btn-sm fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -172,9 +176,13 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<button id="readAll" class="nav-btn nav-btn-delete"><i class="fa fa-eye"> 全部标记已读</i></button>
-					<button id="readRows" class="nav-btn nav-btn-edit"><i class="fa fa-eye"> 标记为已读</i></button>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group">
+						<button id="readAll" class="layui-btn  layui-btn-sm layui-bg-blue">全部标记已读</button>
+						<button id="readRows" class="layui-btn  layui-btn-sm layui-bg-blue">标记为已读</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>