合同登记

src/main/java/com/jeeplus/modules/hr/service/UserInfoService.java

@@ -54,6 +54,9 @@ public class UserInfoService extends CrudService<UserInfoDao, UserInfo> {
 	@Autowired
 	private CertificateService certificateService;
 
+	public User findUserById(String id){
+		return userDao.getByUserId(id);
+	}
 	public UserInfo get(String id) {
 		UserInfo userInfo = super.get(id);
 		if(userInfo!=null){

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanConsultingController.java

@@ -76,6 +76,9 @@ public class ProjectPlanConsultingController extends BaseController {
     @RequiresPermissions("project:projectPlanConsulting:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //添加标识
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -195,11 +198,12 @@ public class ProjectPlanConsultingController extends BaseController {
     @RequiresPermissions(value={"project:projectPlanConsulting:add","project:projectPlanConsulting:edit"})
     @RequestMapping(value = "save")
     public String save(ProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception{
+        String flag = projectRecords.getContractType();
         ProjectRecords ProjectRecord = ruralProjectRecordsService.getProjectRecords(projectRecords.getId());
         MyBeanUtils.copyBeanNotNull2Bean(projectRecords, ProjectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
         projectPlanService.saveProjectPlanInfo(ProjectRecord);//保存
         addMessage(redirectAttributes, "保存项目计划成功");
-        return "redirect:"+ Global.getAdminPath()+"/project/projectPlanConsulting/?repage";
+        return "redirect:"+ Global.getAdminPath()+"/project/projectPlanConsulting/?repage&contractType="+flag;
     }
 
     /**
@@ -207,6 +211,7 @@ public class ProjectPlanConsultingController extends BaseController {
      */
     @RequestMapping(value = "export")
     public String exportFile(ProjectRecords projectRecords, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        String flag = projectRecords.getContractType();
         ProjectRecords ProjectRecord = ruralProjectRecordsService.getProjectRecords(projectRecords.getId());
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectRecords, ProjectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -225,7 +230,7 @@ public class ProjectPlanConsultingController extends BaseController {
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出项目计划记录失败！失败信息："+e.getMessage());
         }
-        return "redirect:"+Global.getAdminPath()+"/project/projectPlanConsulting/?repage";
+        return "redirect:"+Global.getAdminPath()+"/project/projectPlanConsulting/?repage&contractType="+flag;
     }
 
 }

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanCostController.java

@@ -77,6 +77,9 @@ public class ProjectPlanCostController extends BaseController {
     @RequiresPermissions("project:projectPlanCost:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //添加标识
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(projectRecords.getToflag())){
             if (projectRecords.getToflag().equals("1")){
@@ -198,6 +201,7 @@ public class ProjectPlanCostController extends BaseController {
     @RequiresPermissions(value={"project:projectPlanCost:add","project:projectPlanCost:edit"})
     @RequestMapping(value = "save")
     public String save(ProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception{
+        String flag = projectRecords.getContractType();
         ProjectRecords ProjectRecord = ruralProjectRecordsService.getProjectRecords(projectRecords.getId());
         MyBeanUtils.copyBeanNotNull2Bean(projectRecords, ProjectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
         projectPlanService.saveProjectPlanInfo(ProjectRecord);//保存

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

@@ -322,6 +322,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	private String reviewerPerson;//审核人名称
 	private String reviewerPersonId;//审核人
+	private Integer contractsNum; //合同数量
 
 	public String getPrrId() {
 		return prrId;
@@ -689,7 +690,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	@ExcelField(title="主委托方", align=2, sort=6)
 	public String getClientName() {
 		if (workContractInfo!=null && workContractInfo.getClient()!=null){
-			return workContractInfo.getClient().getName();
+			return workContractInfo.getClientName();
 		}else {
 			return "";
 		}
@@ -2282,4 +2283,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setCompanyType(String companyType) {
 		this.companyType = companyType;
 	}
+
+	public Integer getContractsNum() {
+		return contractsNum;
+	}
+
+	public void setContractsNum(Integer contractsNum) {
+		this.contractsNum = contractsNum;
+	}
 }

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

@@ -2737,24 +2737,28 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}else if("2".equals(projectRecords.getProjectType())){
 				projectReportData.setConditionType("1003");
 			}*/
-
 			switch (projectRecords.getProjectType()){
 				case "1":
-					if("8".equals(projectRecords.getAttachmentProjectSort())){
-						projectReportData.setConditionType("1006");
-					}else{
-						projectReportData.setConditionType("10");
+					if("1".equals(projectRecords.getCompanyType())){
+						projectReportData.setConditionType("1008");
+					}else if("2".equals(projectRecords.getCompanyType())){
+						projectReportData.setConditionType("1010");
 					}
 					break;
 				case "2":
-					if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
+					if("1".equals(projectRecords.getCompanyType())){
+						projectReportData.setConditionType("1008");
+					}else if("2".equals(projectRecords.getCompanyType())){
+						projectReportData.setConditionType("1009");
+					}
+					/*if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
 						projectReportData.setConditionType("1005");
 					}else if("8".equals(projectRecords.getAttachmentProjectSort())){
 						projectReportData.setConditionType("1007");
 					}
 					else{
 						projectReportData.setConditionType("1003");
-					}
+					}*/
 					break;
 			}
 
@@ -2773,10 +2777,23 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 		}else if(StringUtils.isBlank(reportData.getNumber())){
 			//添加查询报告号模板的bizCode参数
-			if("1".equals(projectRecords.getProjectType())){
+			/*if("1".equals(projectRecords.getProjectType())){
 				reportData.setConditionType("10");
 			}else if("2".equals(projectRecords.getProjectType())){
 				reportData.setConditionType("1003");
+			}*/
+			if("1".equals(projectRecords.getProjectType())){
+				if("1".equals(projectRecords.getCompanyType())){
+					reportData.setConditionType("1008");
+				}else if("2".equals(projectRecords.getCompanyType())){
+					reportData.setConditionType("1010");
+				}
+			}else if("2".equals(projectRecords.getProjectType())){
+				if("1".equals(projectRecords.getCompanyType())){
+					reportData.setConditionType("1008");
+				}else if("2".equals(projectRecords.getCompanyType())){
+					reportData.setConditionType("1009");
+				}
 			}
 			synchronized (SYN_BYTE) {
 				String reportNo = createReportNo(reportData.getConditionType());

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

@@ -18,6 +18,7 @@ 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.alterinfo.entity.AlterInfo;
+import com.jeeplus.modules.hr.service.UserInfoService;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
@@ -69,6 +70,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 造价审核项目登记Controller
@@ -102,13 +104,14 @@ public class RuralCostProjectRecordsController extends BaseController {
     private WorkProjectNotifyService workProjectNotifyService;
     @Autowired
     private ProjectEngineeringService engineeringService;
-
     @Autowired
     private RuralProjectContactPersonService ruralProjectContactPersonService;
     @Autowired
     private WorkInvoiceService workInvoiceService;
     @Autowired
     private WorkReimbursementService workReimbursementService;
+    @Autowired
+    private UserInfoService userInfoService;
 
     private static String template_path = Global.getProjectTemplatePath() + "咨询工作方案.xlsx";
     private static String template_name = "咨询工作方案.xlsx";
@@ -131,6 +134,9 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions("ruralProject:ruralCostProjectRecords:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //添加标识
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(projectRecords.getToflag())) {
             if (projectRecords.getToflag().equals("1")) {
@@ -150,8 +156,8 @@ public class RuralCostProjectRecordsController extends BaseController {
         //添加查询类型(造价审核)
         projectRecords.setProjectType("2");
         //获取项目信息
+        projectRecords.setCompanyType(flag);
         Page<RuralProjectRecords> page = projectRecordsService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
-
         //查询所有和当前登陆人有关的项目的审核
         WorkProjectNotify workProjectNotify = new WorkProjectNotify();
         workProjectNotify.setUser(UserUtils.getUser());
@@ -210,6 +216,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             ProjectEngineeringInfo engineeringInfo = engineeringService.get(projectRecords.getEngineeringType());
             model.addAttribute("engineeringInfo", engineeringInfo);
         }
+
         model.addAttribute("page", page);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsList";
     }
@@ -283,6 +290,8 @@ public class RuralCostProjectRecordsController extends BaseController {
                     projectRecords.getWorkConstructionLinkmanList().add(workClientLinkman);
                 }
             }
+            //根据审核人id获取审核人
+            projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
         } else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());
@@ -368,6 +377,8 @@ public class RuralCostProjectRecordsController extends BaseController {
                 }
             }
         }
+        //根据审核人id获取审核人
+        projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsView";
     }
@@ -379,13 +390,13 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequestMapping(value = "save")
     public String save(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes
             , @RequestParam(value = "belongingDepartmentName") String belongingDepartmentName) throws Exception {
-
+        String flag = projectRecords.getCompanyType();
         if (!beanValidator(model, projectRecords)) {
             return form(projectRecords, model);
         }
         try {
             //审核人编号
-            //projectRecords.setReviewerPerson(projectRecords.getLeaderNameStr());
+            System.out.println("");
             //根据页面传入的归属部门名称查询部门id并放入数据库
             String belongingDepartment = projectRecordsService.getBelongingDepartmentByBelongingDepartmentName(belongingDepartmentName);
 
@@ -431,7 +442,7 @@ public class RuralCostProjectRecordsController extends BaseController {
                 if (null != workContractInfo) {
                     if ("7".equals(workContractInfo.getContractState()) || "1" == workContractInfo.getDelFlag()) {
                         addMessage(redirectAttributes, "该项目选择的合同已被作废或删除");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
                     }
                 }
                 //添加查询类型(造价审核)
@@ -447,7 +458,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             logger.error("保存项目异常：", e);
             addMessage(redirectAttributes, "保存项目异常:" + e.getMessage());
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
     }
 
     /**
@@ -456,6 +467,8 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions(value = {"ruralProject:ruralCostProjectRecords:add", "ruralProject:ruralCostProjectRecords:edit"}, logical = Logical.OR)
     @RequestMapping(value = "tstore")
     public String tStore(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception {
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         if (!beanValidator(model, projectRecords)) {
             return form(projectRecords, model);
         }
@@ -468,10 +481,10 @@ public class RuralCostProjectRecordsController extends BaseController {
                     projectRecordsService.saveProject(t, ProjectStatusEnum.TSTORE);//保存
                 } else if (t.getProjectStatus() == 2) {
                     addMessage(redirectAttributes, "项目已送审，无法暂存");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
                 } else if (t.getProjectStatus() == 5) {
                     addMessage(redirectAttributes, "项目已登记完成，无法暂存");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
                 }
             } else {//新增表单保存
                 // 添加查询类型(工程咨询)
@@ -483,7 +496,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             logger.error("暂存项目异常：", e);
             addMessage(redirectAttributes, "暂存项目异常:" + e.getMessage());
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
     }
 
     /**
@@ -491,6 +504,7 @@ public class RuralCostProjectRecordsController extends BaseController {
      */
     @RequestMapping(value = "adminUpdate")
     public String adminUpdate(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+        String flag = projectRecords.getCompanyType();
         try {
             RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
             MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -500,7 +514,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             logger.error("管理员修改项目异常：", e);
             addMessage(redirectAttributes, "管理员修改项目异常:" + e.getMessage());
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
     }
 
     /**
@@ -553,6 +567,8 @@ public class RuralCostProjectRecordsController extends BaseController {
                 projectRecords.getWorkConstructionLinkmanList().add(workClientLinkman);
             }
         }
+        //根据审核人id获取审核人
+        projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify";
     }
@@ -580,6 +596,7 @@ public class RuralCostProjectRecordsController extends BaseController {
         ProjectEngineeringInfo engineeringInfos = engineeringService.get(projectRecords.getEngineeringType());
         model.addAttribute("engInfo", engineeringInfos);
         projectRecordsService.queryProjectDetail(projectRecords);
+        //根据审核人id获取审核人
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify";
     }
@@ -590,6 +607,7 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions("ruralProject:ruralCostProjectRecords:del")
     @RequestMapping(value = "delete")
     public String delete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+        String flag = projectRecords.getCompanyType();
         //判断该项目是否在发票或者报销中被引用，如果被引用则不允许作废
         //查询报告中调用的次数(若被调用的发票也被作废 则可进行作废)
         Integer cancellationRelationCount = workInvoiceService.getProjectRelationListByProjectId(projectRecords.getId());
@@ -598,9 +616,9 @@ public class RuralCostProjectRecordsController extends BaseController {
         if (cancellationRelationCount > 0 || cancellationReimbursementCount > 0) {
             addMessage(redirectAttributes, "项目在开票或报销中已被使用，无法作废");
             if ("1".equals(projectRecords.getProjectType())) {
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
         }
 
         projectRecordsService.delete(projectRecords);
@@ -609,9 +627,9 @@ public class RuralCostProjectRecordsController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         } else {
             if ("1".equals(projectRecords.getProjectType())) {
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
         }
     }
 
@@ -620,15 +638,16 @@ public class RuralCostProjectRecordsController extends BaseController {
      */
     @RequestMapping(value = "adminDelete")
     public String adminDelete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+        String flag = projectRecords.getCompanyType();
         int status = projectRecords.getProjectStatus();
         if (status == ProjectStatusEnum.SIGNED.getValue()) {
             projectRecordsService.adminDelete(projectRecords);
             addMessage(redirectAttributes, "管理员删除项目成功");
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
         } else {
             addMessage(redirectAttributes, "管理员删除项目失败");
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
     }
 
     /**
@@ -1145,7 +1164,6 @@ public class RuralCostProjectRecordsController extends BaseController {
     /**
      * 对压缩文件进行处理
      *
-     * @param subProjectInfo
      * @param file
      * @return
      * @throws IllegalStateException

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

@@ -15,6 +15,7 @@ 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.hr.service.UserInfoService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectEngineering.entity.EngineeringTree;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
@@ -25,9 +26,11 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectContactPerson;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectContactPersonService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.*;
@@ -97,11 +100,14 @@ public class RuralProjectRecordsController extends BaseController {
 	private RuralProjectMessageService ruralProjectMessageService;
 	@Autowired
 	private WorkProjectNotifyService workProjectNotifyService;
-
+	@Autowired
+	private UserInfoService userInfoService;
 	@Autowired
 	private WorkInvoiceService workInvoiceService;
 	@Autowired
 	private WorkReimbursementService workReimbursementService;
+	@Autowired
+	private RuralProjectContactPersonService ruralProjectContactPersonService;
 
 	private static String template_path = Global.getProjectTemplatePath()+"咨询工作方案.xlsx";
 	private static String template_name = "咨询工作方案.xlsx";
@@ -124,6 +130,9 @@ public class RuralProjectRecordsController extends BaseController {
 	@RequiresPermissions("ruralProject:ruralProjectRecords:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+		//添加标识
+		String flag = projectRecords.getCompanyType();
+		model.addAttribute("companyType",flag);
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -234,6 +243,30 @@ public class RuralProjectRecordsController extends BaseController {
 				model.addAttribute("projectStartDate", "");
 				model.addAttribute("projectEndDate", "");
 			}
+			List<RuralProjectContactPerson> projectContactPersonByProjectIdList = ruralProjectContactPersonService.findProjectContactPersonByProjectId(projectRecords.getProjectId());
+			projectRecords.setWorkClientLinkmanList(new ArrayList<>());
+			for (RuralProjectContactPerson person : projectContactPersonByProjectIdList) {
+				WorkClientLinkman workClientLinkman = new WorkClientLinkman();
+				WorkClientInfo workClientInfo = new WorkClientInfo();
+				workClientLinkman.setClientId(workClientInfo);
+				if (person.getType() == 1) {
+					workClientLinkman.setProjectPersonId(person.getId());
+					workClientLinkman.getClientId().setName(person.getUnitName());
+					workClientLinkman.setName(person.getContactPersonName());
+					workClientLinkman.setLinkPhone(person.getPhone1());
+					workClientLinkman.setLinkMobile(person.getPhone2());
+					projectRecords.getWorkClientLinkmanList().add(workClientLinkman);
+				} else {
+					workClientLinkman.setProjectPersonId(person.getId());
+					workClientLinkman.getClientId().setName(person.getUnitName());
+					workClientLinkman.setName(person.getContactPersonName());
+					workClientLinkman.setLinkPhone(person.getPhone1());
+					workClientLinkman.setLinkMobile(person.getPhone2());
+					projectRecords.getWorkConstructionLinkmanList().add(workClientLinkman);
+				}
+			}
+			//根据审核人id获取审核人
+			projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
 		}else {
 		    projectRecords.setCreateBy(UserUtils.getUser());
 		    projectRecords.setCreateDate(new Date());
@@ -297,6 +330,8 @@ public class RuralProjectRecordsController extends BaseController {
 				}
 			}
 		}
+		//根据审核人id获取审核人
+		projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsView";
 	}
@@ -307,6 +342,7 @@ public class RuralProjectRecordsController extends BaseController {
 	@RequiresPermissions(value={"ruralProject:ruralProjectRecords:add","ruralProject:ruralProjectRecords:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public String save(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception {
+		String flag = projectRecords.getCompanyType();
 		if (!beanValidator(model, projectRecords)){
 			return form(projectRecords, model);
 		}
@@ -345,19 +381,20 @@ public class RuralProjectRecordsController extends BaseController {
 				if (null != workContractInfo){
 					if ( "7".equals(workContractInfo.getContractState()) || "1"==workContractInfo.getDelFlag()){
 						addMessage(redirectAttributes, "该项目选择的合同已被作废或删除");
-						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
 					}
 				}
 				//添加查询类型(工程咨询)
 				projectRecords.setProjectType("1");
                 projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.SIGNED);//保存
             }
+			ruralProjectContactPersonService.addNewProjectContactPerson(projectRecords);
 			addMessage(redirectAttributes, "保存项目成功");
         }catch (Exception e){
 		    logger.error("保存项目异常：",e);
             addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
         }
-		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 	}
 	/**
 	 * 保存项目
@@ -365,6 +402,8 @@ public class RuralProjectRecordsController extends BaseController {
 	@RequiresPermissions(value={"ruralProject:ruralProjectRecords:add","ruralProject:ruralProjectRecords:edit"},logical=Logical.OR)
 	@RequestMapping(value = "tstore")
 	public String tStore(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception{
+		String flag = projectRecords.getCompanyType();
+		model.addAttribute("companyType",flag);
 		if (!beanValidator(model, projectRecords)){
 			return form(projectRecords, model);
 		}
@@ -377,10 +416,10 @@ public class RuralProjectRecordsController extends BaseController {
 					projectRecordsService.saveProject(t, ProjectStatusEnum.TSTORE);//保存
 				}else if(t.getProjectStatus() == 2){
 					addMessage(redirectAttributes, "项目已送审，无法暂存");
-					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 				}else if(t.getProjectStatus() == 5){
 					addMessage(redirectAttributes, "项目已登记完成，无法暂存");
-					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 				}
             } else {//新增表单保存
             	// 添加查询类型(工程咨询)
@@ -392,7 +431,7 @@ public class RuralProjectRecordsController extends BaseController {
             logger.error("暂存项目异常：",e);
             addMessage(redirectAttributes, "暂存项目异常:"+e.getMessage());
         }
-		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 	}
 
 	/**
@@ -400,6 +439,7 @@ public class RuralProjectRecordsController extends BaseController {
 	 */
 	@RequestMapping(value = "adminUpdate")
 	public String adminUpdate(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes){
+		String flag = projectRecords.getCompanyType();
 		try {
 			RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
 			MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -409,7 +449,7 @@ public class RuralProjectRecordsController extends BaseController {
             logger.error("管理员修改项目异常：",e);
             addMessage(redirectAttributes, "管理员修改项目异常:"+e.getMessage());
         }
-		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 	}
 
     /**
@@ -464,6 +504,29 @@ public class RuralProjectRecordsController extends BaseController {
 		model.addAttribute("engineeringInfo", engineeringInfos);
 		projectRecords.setProjectPlanList(projectPlanList);
 		projectRecords.setWorkAttachments(projectPlanAttachment);
+		//根据项目编号查询委托/施工方联系人
+		List<RuralProjectContactPerson> projectContactPersonByProjectIdList = ruralProjectContactPersonService.findProjectContactPersonByProjectId(projectRecords.getProjectId());
+		projectRecords.setWorkClientLinkmanList(new ArrayList<>());
+		for (RuralProjectContactPerson person : projectContactPersonByProjectIdList) {
+			WorkClientLinkman workClientLinkman = new WorkClientLinkman();
+			WorkClientInfo workClientInfo = new WorkClientInfo();
+			workClientLinkman.setClientId(workClientInfo);
+			if (person.getType() == 1) {
+				workClientLinkman.getClientId().setName(person.getUnitName());
+				workClientLinkman.setName(person.getContactPersonName());
+				workClientLinkman.setLinkPhone(person.getPhone1());
+				workClientLinkman.setLinkMobile(person.getPhone2());
+				projectRecords.getWorkClientLinkmanList().add(workClientLinkman);
+			} else {
+				workClientLinkman.getClientId().setName(person.getUnitName());
+				workClientLinkman.setName(person.getContactPersonName());
+				workClientLinkman.setLinkPhone(person.getPhone1());
+				workClientLinkman.setLinkMobile(person.getPhone2());
+				projectRecords.getWorkConstructionLinkmanList().add(workClientLinkman);
+			}
+		}
+		//根据审核人id获取审核人
+		projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsAdminModify";
 	}
@@ -474,6 +537,7 @@ public class RuralProjectRecordsController extends BaseController {
 	@RequiresPermissions("ruralProject:ruralProjectRecords:del")
 	@RequestMapping(value = "delete")
 	public String delete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+		String flag = projectRecords.getCompanyType();
 		//判断该项目是否在发票或者报销中被引用，如果被引用则不允许作废
 		//查询报告中调用的次数(若被调用的发票也被作废 则可进行作废)
 		Integer cancellationRelationCount = workInvoiceService.getProjectRelationListByProjectId(projectRecords.getId());
@@ -482,9 +546,9 @@ public class RuralProjectRecordsController extends BaseController {
 		if(cancellationRelationCount>0 || cancellationReimbursementCount>0){
 			addMessage(redirectAttributes, "项目在开票或报销中已被使用，无法作废");
 			if("1".equals(projectRecords.getProjectType())){
-				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 			}
-			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
 		}
 		projectRecordsService.delete(projectRecords);
 		addMessage(redirectAttributes, "作废项目成功");
@@ -492,9 +556,9 @@ public class RuralProjectRecordsController extends BaseController {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else {
 			if("1".equals(projectRecords.getProjectType())){
-				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 			}
-			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;
 		}
 	}
 
@@ -503,15 +567,16 @@ public class RuralProjectRecordsController extends BaseController {
 	 */
 	@RequestMapping(value = "adminDelete")
 	public String adminDelete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+		String flag = projectRecords.getCompanyType();
 		int status = projectRecords.getProjectStatus();
 		if(status== ProjectStatusEnum.SIGNED.getValue()){
 			projectRecordsService.adminDelete(projectRecords);
 			addMessage(redirectAttributes, "管理员删除项目成功");
-			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 		}else {
 			addMessage(redirectAttributes, "管理员删除项目失败");
 		}
-		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage&companyType="+flag;
 	}
 
 	/**

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

@@ -72,7 +72,10 @@
 		a.quality_signature_upload_file_user as "qualitySignatureUploadFileUser.id",
 		a.quality_signature_upload_date as "qualitySignatureUploadDate",
 		a.belonging_department as "belongingDepartment",
-		a.reviewer_person as "reviewerPerson"
+		a.reviewer_person as "reviewerPerson",
+		a.reviewer_person_id as "reviewerPersonId",
+		a.company_type as "companyType",
+		a.contracts_num as "contractsNum"
 
 	</sql>
 
@@ -123,7 +126,10 @@
 		ifnull(a.record_state,0) as "projectRecordStatus",
 		a.over_record_status as "overRecordStatus",
 		a.emergency_project as "emergencyProject",
-		a.reviewer_person as "reviewerPerson"
+		a.reviewer_person as "reviewerPerson",
+		a.reviewer_person_id as "reviewerPersonId",
+		a.company_type as "companyType",
+		a.contracts_num as "contractsNum"
 	</sql>
 
 	<sql id="projectRecordsJoins">
@@ -312,6 +318,7 @@
 		wci.name AS "workContractInfo.name",
 		wci.contract_num as "workContractInfo.contractNum",
 		wci.contract_price as "workContractInfo.contractPrice",
+		wci.clientName as "workContractInfo.clientName",
 		sub.name as "projectMasterName",
 		sob.name as "projectMasterOffice",
 		wct.id AS "workContractInfo.client.id",
@@ -486,6 +493,9 @@
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
             </if>
+            <if test="companyType!=null and companyType!=''">
+				and a.company_type=#{companyType}
+			</if>
 		</where>
             GROUP BY a.id
 		<choose>
@@ -520,6 +530,9 @@
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
 		<where>
+			<if test="projectType!=null and projectType!=''">
+				and a.project_type = #{projectType}
+			</if>
             <if test="projectId != null and projectId != ''">
                 AND a.project_id like concat('%',#{projectId},'%')
             </if>
@@ -574,8 +587,8 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
-            <if test="projectType !=null and projectType !=''">
-				and project_type= #{projectType}
+            <if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
             </if>
 			<if test="engineeringType !=null and engineeringType !=''">
 				and a.engineering_type= #{engineeringType}
@@ -625,6 +638,7 @@
 		,
 		wci.name AS "workContractInfo.name",
 		wci.contract_num AS "workContractInfo.contractNum",
+		wci.clientName as "clientName",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.top_company AS "office.name"
@@ -661,6 +675,9 @@
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                 AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND (s.id = #{currentUser.company.id} or find_in_set( #{currentUser.company.id}, s.parent_ids ) ))${sqlMap.dsf} )
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
             AND a.del_flag = #{DEL_FLAG_NORMAL}
 		</where>
 		GROUP BY a.id
@@ -708,6 +725,9 @@
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
                 AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND (s.id = #{currentUser.company.id} or find_in_set( #{currentUser.company.id}, s.parent_ids ) ))${sqlMap.dsf} )
             </if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
             AND a.del_flag = #{DEL_FLAG_NORMAL}
         </where>
     </select>
@@ -718,7 +738,7 @@
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
+			a.del_flag = #{DEL_FLAG_NORMAL} and a.company_type= #{companyType}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -784,7 +804,10 @@
 			emergency_project,
 			reported_state,
 			belonging_department,
-			reviewer_person
+			reviewer_person,
+			reviewer_person_id,
+			company_type,
+			contracts_num
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -838,7 +861,10 @@
 		    #{emergencyProject},
 		    #{reportedState},
 		    #{belongingDepartment},
-		    #{reviewerPerson}
+		    #{reviewerPerson},
+		    #{reviewerPersonId},
+		    #{companyType},
+		    #{contractsNum}
 		)
 	</insert>
 
@@ -892,8 +918,9 @@
 			project_properties =#{projectProperties},
 			submit_scale =#{submitScale},
 			emergency_project=#{emergencyProject},
-			reviewer_person = #{reviewerPerson}
-
+			reviewer_person = #{reviewerPerson},
+		reviewer_person_id = #{reviewerPersonId},
+		contracts_num = #{contractsNum}
 			<choose>
 				<when test="reportedState ==null or reportedState == ''">
 					,reported_state = null
@@ -955,7 +982,9 @@
 			submit_scale = #{submitScale},
 			emergency_project = #{emergencyProject},
 			belonging_department = #{belongingDepartment},
-		reviewer_person = #{reviewerPerson}
+		reviewer_person = #{reviewerPerson},
+		reviewer_person_id = #{reviewerPersonId},
+		contracts_num = #{contractsNum}
 			<if test="engineeringType != null and engineeringType != ''">
 				,engineering_type =#{engineeringType}
 			</if>
@@ -1154,6 +1183,7 @@
 		,
 		wci.name AS "workContractInfo.name",
 		wci.contract_num AS "workContractInfo.contractNum",
+		wci.clientName as "workContractInfo.clientName",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.name AS "office.name"
@@ -1166,8 +1196,13 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office s ON s.id = a.company_id
 		LEFT JOIN sys_office o ON o.id = a.office_id
-		where a.status='5'  and a.del_flag='0' and w.user_id=#{userId} and w.del_flag='0'
-		and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
+		<where>
+			a.status='5'  and a.del_flag='0' and w.user_id=#{userId} and w.del_flag='0'
+			and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
+		</where>
 		GROUP BY a.id
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -1265,6 +1300,9 @@
 			<if test="projectStatus !=null">
 				AND a.status = #{projectStatus}
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="beginDate !=null">
 				AND a.create_date >= #{beginDate}
 			</if>
@@ -1357,6 +1395,9 @@
 			<if test="beginDate !=null">
 				AND a.create_date >= #{beginDate}
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
@@ -1412,6 +1453,9 @@
 			<if test="scaleUnit != null and scaleUnit != ''">
 				AND a.scale_unit = #{scaleUnit}
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="scaleQuantity != null and scaleQuantity != ''">
 				AND a.scale_quantity = #{scaleQuantity}
 			</if>
@@ -1507,6 +1551,9 @@
 			<if test="projectSite != null and projectSite != ''">
 				AND a.project_site LIKE concat('%',#{projectSite},'%')
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="remarks != null and remarks != ''">
 				AND a.remarks LIKE concat('%',#{remarks},'%')
 			</if>
@@ -1568,6 +1615,9 @@
 			and (a.reported_state=6 or a.reported_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -1593,6 +1643,9 @@
 			and (a.reported_state=6 or a.reported_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -1619,6 +1672,9 @@
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.reported_state is null
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -1645,6 +1701,9 @@
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.reported_state is null
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -1668,6 +1727,7 @@
 		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as submitMoneyStr
 		,
 		wci.name AS "workContractInfo.name",
+		wci.clientName as "workContractInfo.clientName",
 		prd.number AS "projectReportNumber",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
@@ -1718,6 +1778,9 @@
 			<if test="area != null and area.id != null and area.id != ''">
 				AND a.area_id = #{area.id}
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
 				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
 			</if>
@@ -1808,6 +1871,9 @@
 			<if test="projectSite != null and projectSite != ''">
 				AND a.project_site LIKE concat('%',#{projectSite},'%')
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="remarks != null and remarks != ''">
 				AND a.remarks LIKE concat('%',#{remarks},'%')
 			</if>
@@ -1886,6 +1952,9 @@
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 	<select id="projectFindList" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords">
@@ -1922,6 +1991,9 @@
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -1965,6 +2037,9 @@
 			and (a.record_state=6 or a.record_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -1989,6 +2064,9 @@
 			and (a.record_state=6 or a.record_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -2015,6 +2093,9 @@
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.record_state is null
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -2042,6 +2123,9 @@
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.record_state is null
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -2083,7 +2167,12 @@
 		select
 		count(a.id)
 		FROM rural_project_records a
-		where a.project_name=#{projectName}  and a.`status`!=7
+		<where>
+			a.project_name=#{projectName}  and a.`status`!=7
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
+		</where>
 	</select>
 
     <update id="updateReportDataTwo">
@@ -2159,6 +2248,9 @@
 			and a.report_signature_url_flag = 0
 			and (a.report_signature_url is null or a.report_signature_url = '')
 			and (a.report_signature_contract_id is not null or a.report_signature_contract_id != '')
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 		order by prd.number asc
 		limit #{count}
@@ -2175,6 +2267,9 @@
 			and a.report_signature_url_flag = 0
 			and (a.report_signature_url is null or a.report_signature_url = '')
 			and (a.report_signature_contract_id is not null or a.report_signature_contract_id != '')
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 
@@ -2194,6 +2289,7 @@
 		wci.name AS "workContractInfo.name",
 		wci.contract_num as "workContractInfo.contractNum",
 		wci.contract_price as "workContractInfo.contractPrice",
+		wci.clientName as "workContractInfo.clientName",
 		sub.name as "projectMasterName",
 		sob.name as "projectMasterOffice",
 		wct.id AS "workContractInfo.client.id",
@@ -2296,7 +2392,9 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
-
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
@@ -2457,7 +2555,9 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
-
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
@@ -2699,7 +2799,9 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
-
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
 			</if>
@@ -2951,7 +3053,9 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
-
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
@@ -3114,7 +3218,9 @@
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
 
-
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
 			</if>
@@ -3227,6 +3333,7 @@
 		wci.name AS "workContractInfo.name",
 		wci.contract_num as "workContractInfo.contractNum",
 		wci.contract_price as "workContractInfo.contractPrice",
+		wci.clientName as "workContractInfo.clientName",
 		sub.name as "projectMasterName",
 		sob.name as "projectMasterOffice",
 		wct.id AS "workContractInfo.client.id",
@@ -3353,7 +3460,9 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
-
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
 			</if>
@@ -3498,6 +3607,7 @@
 		,a.submit_money as "submitMoney"
 		,a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
+		wci.clientName as "workContractInfo.clientName",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.top_company AS "office.name",
@@ -3567,6 +3677,9 @@
 			<if test="#{id} != null and #{id} != ''">
 				cb.project_id = #{id}
 			</if>
+			<if test="companyType !=null and companyType !=''">
+				and a.company_type= #{companyType}
+			</if>
 		</where>
 	</select>
 

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -140,7 +140,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlanConsulting/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlanConsulting/?companyType=${companyType}" 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}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -247,7 +247,7 @@
 				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
-							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?companyType=${companyType}&id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
 						}else{
 							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
 						}
@@ -262,7 +262,7 @@
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
 						}else{
-							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?companyType=${companyType}&id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
@@ -280,19 +280,19 @@
 						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?companyType=${companyType}&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanConsulting/form?companyType=${companyType}&view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 编辑</a>";
 						}
 						if(d.canedit5 != undefined && d.canedit5 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanConsulting/form?companyType=${companyType}&view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
 						}
 						if(d.adminEdit != undefined && d.adminEdit =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanConsulting/form?companyType=${companyType}&view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 编辑</a>";
 						}
 						xml+="</div>"
 						return xml;

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -140,7 +140,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlanCost/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/project/projectPlanCost/?companyType=${companyType}" 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}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -248,7 +248,7 @@
 				{field:'index',align:'center', title: '序号',width:50}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
-							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?companyType=${companyType}&id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
 						}else{
 							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
 						}
@@ -263,7 +263,7 @@
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
 						}else{
-							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?companyType=${companyType}&id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
@@ -281,19 +281,19 @@
 						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?companyType=${companyType}&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?companyType=${companyType}&view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
 						}
 						if(d.canedit5 != undefined && d.canedit5 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanCost/form?companyType=${companyType}&view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
 						}
 						if(d.adminEdit != undefined && d.adminEdit =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?companyType=${companyType}&view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
 						}
 						xml+="</div>"
 						return xml;

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

@@ -32,6 +32,14 @@
                 var startDate = new Date($("#startDate").val());
                 var endingDate = new Date($("#endingDate").val());
                 var projectProperties=$("#projectProperties").val();
+                if(null == startDate||undefined==startDate ||"Invalid Date"==startDate){
+                    parent.layer.msg("工作开始日期不能为空!", {icon: 5});
+                    return false;
+                }
+                if(null==endingDate||undefined==endingDate||"Invalid Date" == endingDate){
+                    parent.layer.msg("工作结束日期不能为空!", {icon: 5});
+                    return false;
+                }
                 if(projectProperties==''){
                     parent.layer.msg("投资性质未选择!", {icon: 5});
                     return false;
@@ -45,6 +53,23 @@
                     parent.layer.msg("项目归属部门未填写!", {icon: 5});
                     return false;
                 }
+                var contractsNum = $("#contractsNum").val();
+                if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
+                    parent.layer.msg("合同数量不能为空!", {icon: 5});
+                    return false;
+                }
+                if(contractsNum<=0){
+                    parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                    return false;
+                }
+                if(contractsNum%1!=0){
+                    parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                    return false;
+                }
+                if(isNaN(contractsNum)){
+                    parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                    return false;
+                }
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -883,7 +908,7 @@
                 <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}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -953,6 +978,12 @@
                         </form: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">
+                        <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
+                    </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/ruralCostProjectRecordsForm.jsp

@@ -92,6 +92,26 @@
                     parent.layer.msg("项目归属部门未填写!", {icon: 5});
                     return false;
                 }
+                var contractsNum = $("#contractsNum").val();
+                if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
+                    parent.layer.msg("合同数量不能为空!", {icon: 5});
+                    return false;
+                }
+                if(contractsNum<=0){
+                    parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                    return false;
+                }
+                if(contractsNum%1!=0){
+                    parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                    return false;
+                }
+                if(isNaN(contractsNum)){
+                    parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                    return false;
+                }
+
+                $("#clientName").val($("#contractClientName").val());
+
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectRecords/tstore");
                 }else{
@@ -143,12 +163,12 @@
                     }
 
                     //选中审定（内）时必须同时选中B级项目
-                    if(submitMoney == 2){
+                    /*if(submitMoney == 2){
                         if(attachmentProjectSort == 8){
                             parent.layer.msg("项目类别为审定(内)时，项目等级必须为B级！", {icon: 5});
                             return false;
                         }
-                    }
+                    }*/
 
                     var flag = $("#flagFile").val();
                     if(flag == 'false'){
@@ -521,7 +541,6 @@
             $("#installPercent").val(p);
             $("#installUnitFees").val(pp);
         }
-
         /*function setLinkMan(newClientId) {
             $.ajax({
                 url:"${ctx}/ruralProject/ruralCostProjectRecords/getLinkManByClientId",
@@ -1068,10 +1087,10 @@
                     </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:treeselect id="master" name="reviewerPersonId" value="${ruralProjectRecords.reviewerPersonId}" labelName="reviewerPerson" labelValue="${ruralProjectRecords.reviewerPerson}"
-                                       cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                                               cssStyle="background-color:#fff"  title="项目负责人" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1081,11 +1100,10 @@
                     </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: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 judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
-                    <span class="spanzj">必须拥有一级造价师证书</span>
+                        <sys:reportedtreeselectUser id="projectMaster" name="reviewerPersonId" value="${ruralProjectRecords.reviewerPersonId}" labelName="reviewerPerson" labelValue="${ruralProjectRecords.reviewerPerson}"
+                                                    cssStyle="background-color:#fff" title="审核人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1148,13 +1166,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">工作开始日期：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</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"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">工作结束日期：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</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="endingDate" name="endingDate" placeholder="请选择结束日期" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
@@ -1175,6 +1193,17 @@
                         <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </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:input path="contractsNum" placeholder="登记数量" htmlEscape="false"  class="form-control layui-input" id="contractsNum"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
+                    <div class="layui-input-block">
+                        <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${ruralProjectRecords.companyType}"/>
+                    </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/ruralCostProjectRecordsList.jsp

@@ -357,7 +357,7 @@
 		</div>
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/?companyType=${companyType}" 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}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -437,7 +437,7 @@
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
-								<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input path="workContractInfo.clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -485,16 +485,16 @@
 				<div class="nav-btns">
 					<div class="layui-btn-group">
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:add">
-							<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
+							<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form?companyType=${companyType}" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">
 							<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:importB">
-							<table:importExcel url="${ctx}/ruralProject/ruralCostProjectRecords/importB"></table:importExcel><!-- 导入按钮 -->
+							<table:importExcel url="${ctx}/ruralProject/ruralCostProjectRecords/importB?companyType=${companyType}"></table:importExcel><!-- 导入按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:export">
-							<table:exportExcel url="${ctx}/ruralProject/ruralCostProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->
+							<table:exportExcel url="${ctx}/ruralProject/ruralCostProjectRecords/export?companyType=${companyType}"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:exportAll">
 							<button type="button" data-toggle="tooltip" data-placement="top" class="layui-btn layui-btn-sm layui-bg-blue" id="delUser"> 批量下载</button>
@@ -565,8 +565,8 @@
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
 					}}
-                ,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
-                        return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
+                ,{field:'reviewerPerson', align:'center',title: '审核人', width:100,templet:function(d){
+                        return "<span title=\"" + d.reviewerPerson + "\">" + d.reviewerPerson + "</span>";
                     }}
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
@@ -588,37 +588,37 @@
                         var xml="<div class=\"layui-btn-group\">";
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project&companyType=${companyType}','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"&companyType=${companyType}','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/modify?id=" + d.id + "&companyType=${companyType}','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "&companyType=${companyType}','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&companyType=${companyType}&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                         }
 						//项目在没有归档完成之前可对文档进行操作
 						if(d.recordStatus != undefined && d.recordStatus =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?companyType=${companyType}&id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
 							/*xml+="<a href=\"#\" onclick=\"btnImport('" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 导入压缩文件</a>";*/
 						}
 						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
 						{
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=2"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&companyType=${companyType}&projectType=2"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
 						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
@@ -626,13 +626,13 @@
                         }
 						if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/adminDelete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 						}
 						if(d.modifyRecords != undefined && d.modifyRecords =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
 						}
 						xml+="</div>"
                         return xml;
@@ -652,7 +652,7 @@
 					<%--,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"--%>
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"conId":"${projectRecords.workContractInfo.id}"
-                    ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"client":"${projectRecords.workContractInfo.clientName}"
                     ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"
@@ -661,6 +661,7 @@
                     ,"flagAdmin":"${projectRecords.flagAdmin}"
                     ,"notifyFlag":"${projectRecords.notifyFlag}"
                     ,"notifyId":"${projectRecords.notifyId}"
+					,"reviewerPerson":"${projectRecords.reviewerPerson}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">,"candel":	<c:choose><c:when test="${(projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4) && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 && fns:getUser().id == projectRecords.createBy.id }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>

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

@@ -32,6 +32,14 @@
               var startDate = new Date($("#startDate").val());
               var endingDate = new Date($("#endingDate").val());
               var projectProperties=$("#projectProperties").val();
+              if(null == startDate||undefined==startDate ||"Invalid Date"==startDate){
+                  parent.layer.msg("工作开始日期不能为空!", {icon: 5});
+                  return false;
+              }
+              if(null==endingDate||undefined==endingDate||"Invalid Date" == endingDate){
+                  parent.layer.msg("工作结束日期不能为空!", {icon: 5});
+                  return false;
+              }
               if(projectProperties==''){
                   parent.layer.msg("投资性质未选择!", {icon: 5});
                   return false;
@@ -40,6 +48,23 @@
                   parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                   return false;
               }
+              var contractsNum = $("#contractsNum").val();
+              if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
+                  parent.layer.msg("合同数量不能为空!", {icon: 5});
+                  return false;
+              }
+              if(contractsNum<=0){
+                  parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                  return false;
+              }
+              if(contractsNum%1!=0){
+                  parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                  return false;
+              }
+              if(isNaN(contractsNum)){
+                  parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                  return false;
+              }
 			  $("#inputForm").submit();
 			  return true;
 		  }else{
@@ -636,7 +661,7 @@
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>项目合同信息</h2></div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <div class="layui-item layui-col-sm6 lw7" style="display: none">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
@@ -812,7 +837,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"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
                     </div>
@@ -824,9 +849,9 @@
                     </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.projectMasterName}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -839,7 +864,7 @@
                         </button>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
@@ -973,6 +998,12 @@
                         <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
                     </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">
+                        <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">

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

@@ -56,6 +56,14 @@
                 var endingDate = new Date($("#endingDate").val());
                 var projectStartDate = new Date('${projectStartDate}');
                 var projectEndDate = new Date('${projectEndDate}');
+                if(null == startDate||undefined==startDate ||"Invalid Date"==startDate){
+                    parent.layer.msg("工作开始日期不能为空!", {icon: 5});
+                    return false;
+                }
+                if(null==endingDate||undefined==endingDate||"Invalid Date" == endingDate){
+                    parent.layer.msg("工作结束日期不能为空!", {icon: 5});
+                    return false;
+                }
                 if(startDate.getTime() > endingDate.getTime()){
                     parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                     return false;
@@ -87,7 +95,25 @@
                         return false;
                     }
                 }
+                var contractsNum = $("#contractsNum").val();
+                if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
+                    parent.layer.msg("合同数量不能为空!", {icon: 5});
+                    return false;
+                }
+                if(contractsNum<=0){
+                    parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                    return false;
+                }
+                if(contractsNum%1!=0){
+                    parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                    return false;
+                }
+                if(isNaN(contractsNum)){
+                    parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                    return false;
+                }
 
+                $("#clientName").val($("#contractClientName").val());
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
                 }else if(i==1){
@@ -107,7 +133,7 @@
                         return false;
                     }
                     //200万以上部队或政府项目及500万以上其它项目为A级,其余为B级
-                    if(submitMoney==1 ){
+                    /*if(submitMoney==1 ){
                         if (submitScale>=500){
                             parent.layer.msg("送审规模大于500万元,项目等级请选择A级!", {icon: 5});
                             return false;
@@ -124,7 +150,7 @@
                             return false;
                         }
 
-                    }
+                    }*/
                     var attachmentProjectSort=$("#attachmentProjectSort").val();
                     if(attachmentProjectSort==''){
                         parent.layer.msg("请选择项目类别!", {icon: 5});
@@ -514,7 +540,7 @@
             $("#installUnitFees").val(pp);
         }
 
-        function setLinkMan(newClientId) {
+        /*function setLinkMan(newClientId) {
             $.ajax({
                 url:"${ctx}/ruralProject/ruralProjectRecords/getLinkManByClientId",
                 data:{"clientId":newClientId},
@@ -553,7 +579,7 @@
                     $("#linkmanButton").addClass("forbidden");
                 }
             });
-        }
+        }*/
         function setValuee(obj){
             var successRows = 0;
             ss = $("#workClientLinkmanList tr").length;
@@ -898,9 +924,9 @@
             <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">
 
             <div class="form-group layui-row first">
-                <div class="form-group layui-row">
+                <div class="form-group layui-row" >
                     <div class="form-group-label"><h2>项目合同信息</h2></div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <div class="layui-item layui-col-sm6 lw7" style="display: none">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="有合同" lay-filter="ext" checked name="ext" id="ext" value="0">
@@ -1057,7 +1083,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="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
                                        cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
@@ -1070,11 +1096,10 @@
                     </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: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 judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
-                        <span class="spanzj">必须拥有一级造价师证书</span>
+                        <sys:reportedtreeselectUser id="projectMaster" name="reviewerPersonId" value="${ruralProjectRecords.reviewerPersonId}" labelName="reviewerPerson" labelValue="${ruralProjectRecords.reviewerPerson}"
+                                                    cssStyle="background-color:#fff" title="审核人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1100,11 +1125,11 @@
                         </button>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级：</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-                            <input type="radio" name="submitMoney" id="submitMoney" lay-filter="submitMoney"  value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                            <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" <c:if test="${v.value==1}">checked</c:if> title="${v.label}" <%--<c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>--%>>
                         </c:forEach>
                         <%--<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>--%>
                         <p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
@@ -1115,7 +1140,7 @@
                     </div>
                 </div>
                 <c:if test="${ruralProjectRecords.createReportFlag}">
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <div class="layui-item layui-col-sm6 lw7" style="display: none">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>是否生成报告号：</label>
                         <div class="layui-input-block">
                             <div style="margin-right: 30px;">
@@ -1139,13 +1164,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">工作开始日期：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</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"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">工作结束日期：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</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="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
@@ -1166,6 +1191,17 @@
                         <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </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:input path="contractsNum" placeholder="登记数量" htmlEscape="false"  class="form-control layui-input" id="contractsNum"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
+                    <div class="layui-input-block">
+                        <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${ruralProjectRecords.companyType}"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">地上层数：</label>
                         <div class="layui-input-block">
@@ -1286,11 +1322,9 @@
             <div>
                 <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>
                 <div id="linkmanDiv" class="layui-item nav-btns" style="float: left;width: 155px">
-                    <sys:gridselect1  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                      name="linkman.id"  title="选择客户"
-                                      value="${ruralProjectRecords.workContractInfo.workClinetInfoIds}"
-                                      cssClass="form-control required" fieldLabels="联系人" fieldKeys="name"
-                                      searchLabel="联系人" searchKey="name"></sys:gridselect1>
+                    <a class="nav-btn nav-btn-add"
+                       onclick="workClientLinkmanTplInfo('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"
+                       title="新增委托方联系人"><i class="fa fa-plus"></i> 新增委托方联系人</a>
                 </div>
 <%--                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">--%>
 <%--                    <a id="aButton" href="javascript:void(0)"--%>
@@ -1321,17 +1355,17 @@
                     <input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
                 </td>
 
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                 </td>
                 <td class="text-center op-td" >
                     {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delEntrustRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
@@ -1341,6 +1375,9 @@
                     <script type="text/javascript">
                         var workClientLinkmanRowIdx = 0,
                             workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                        function workClientLinkmanTplInfo(id,workClientLinkmanRowIdx,workClientLinkmanTpl){
+                            addRow(id, workClientLinkmanRowIdx, workClientLinkmanTpl, "");
+                        }
                         $(document).ready(function () {
                             var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
                             if(data!=null && data.length() > 0){
@@ -1357,8 +1394,9 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns" style="float: left;width: 155px">
-                    <sys:gridselectConstruction url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList" title="选择施工单位"
-                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('施工方单位')}" searchKey="name"></sys:gridselectConstruction>
+                    <a class="nav-btn nav-btn-add"
+                       onclick="workClientLinkmanTplInfo('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl);workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;"
+                       title="新增施工方联系人"><i class="fa fa-plus"></i> 新增施工方联系人</a>
                 </div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="contentTable2" class="table table-bordered table-condensed details">
@@ -1383,17 +1421,17 @@
                         <input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                     </td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_name" name="workConstructionLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_name" name="workConstructionLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
                     </td>
 
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_linkPhone" name="workConstructionLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkPhone" name="workConstructionLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                     </td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;" readonly="true" id="workConstructionLinkmanList{{idx}}_linkMobile" name="workConstructionLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkMobile" name="workConstructionLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                     </td>
 
 					<td class="text-center" width="10">
@@ -1404,6 +1442,9 @@
                     <script>
                         var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                        function workConstructionLinkmanTplInfo(id,workConstructionLinkmanRowIdx,workConstructionLinkmanTpl){
+                            addRow(id, workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, "");
+                        }
                         $(document).ready(function() {
                             var data = ${fns:toJson(ruralProjectRecords.workClientLinkmanList)};
                             if (data!=null) {

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

@@ -297,7 +297,7 @@
 		</div>
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/?companyType=${companyType}" 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}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -379,7 +379,7 @@
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
-								<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input path="workContractInfo.clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -427,10 +427,10 @@
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
 						<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">
-							<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
+							<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralProjectRecords:export">
-							<table:exportExcel url="${ctx}/ruralProject/ruralProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->
+							<table:exportExcel url="${ctx}/ruralProject/ruralProjectRecords/export?companyType=${companyType}"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralProjectRecords:exportAll">
 							<button type="button" data-toggle="tooltip" data-placement="top" class="layui-btn layui-btn-sm layui-bg-blue" id="delUser"> 批量下载</button>
@@ -474,7 +474,7 @@
                 {field:'index',align:'center', title: '序号',width:55}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
-							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?companyType=${companyType}&id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
 						}else{
 							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
 						}
@@ -492,7 +492,7 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                 		if(""!= d.contract){
-							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?companyType=${companyType}&id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
@@ -515,7 +515,7 @@
                         <%--return xml;--%>
                         var st = getruralProjectState(d.projectStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectRecords/getProcess?companyType=${companyType}&id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -525,36 +525,36 @@
                         var xml="<div class=\"layui-btn-group\">";
                         if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
                         {
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?companyType=${companyType}&id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
                         }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                         }
                         //项目在没有归档完成之前可对文档进行操作
                         if(d.recordStatus != undefined && d.recordStatus =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?companyType=${companyType}&id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
                         }
 						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
 						{
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=1"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?companyType=${companyType}&id=" + d.id + "&projectType=1"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
 						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
@@ -562,12 +562,12 @@
                         }
                         if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
 						if(d.modifyRecords != undefined && d.modifyRecords =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
 						}
                         xml+="</div>"
@@ -589,7 +589,7 @@
 					,"contract":"${projectRecords.workContractInfo.name}"
                     ,"conId":"${projectRecords.workContractInfo.id}"
                     ,"projectReportNumber":"${projectRecords.projectReportNumber}"
-                    ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"client":"${projectRecords.workContractInfo.clientName}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"
                     ,"procId":"${projectRecords.processInstanceId}"

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

@@ -250,7 +250,7 @@
 				<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}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -316,12 +316,19 @@
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</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">
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">
 						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
 					</div>
 				</div>
+
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">