项目管理

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectMaterialDefectRecord.java

@@ -93,6 +93,7 @@ public class ProjectMaterialDefectRecord extends ActEntity<ProjectMaterialDefect
 	private ProcessDefinition processDefinition;
 
 	private List<Workattachment> workAttachments = Lists.newArrayList();
+	private String companyType;
 
 	public List<Workattachment> getWorkAttachments() {
 		return workAttachments;
@@ -365,4 +366,12 @@ public class ProjectMaterialDefectRecord extends ActEntity<ProjectMaterialDefect
 	public void setChargeCriterionList(List<String> chargeCriterionList) {
 		this.chargeCriterionList = chargeCriterionList;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -122,6 +122,7 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();	//附件信息
 	private Date accomplishDate;	//审核通过时间
 	private String reportId;	//报告id
+	private String companyType;//1赣能 0东兴
 
 	public WorkContractInfo getWorkContractInfo() {
 		return workContractInfo;
@@ -810,4 +811,12 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 	public void setReportId(String reportId) {
 		this.reportId = reportId;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -206,10 +206,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         if(projectRecords!=null){
             String cid = projectRecords.getWorkContractInfo().getId();
             WorkContractInfo workContractInfo = contractInfoService.get(cid);
-            if(null != workContractInfo) {
+            /*if(null != workContractInfo) {
                 WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
                 workContractInfo.setClient(workClientInfo);
-            }
+            }*/
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         return projectRecords;

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

@@ -129,6 +129,8 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequiresPermissions("ruralProject:ruralCostProjectMessage:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -205,6 +207,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"form"})
     public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -335,6 +339,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"adminModifyForm"})
     public String adminModifyForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -394,6 +400,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"adminEditForm"})
     public String adminEditForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         RuralProjectRecords projectRecords=new RuralProjectRecords();
         if (null!=projectcontentinfo.getProjectId()){
             projectRecords = projectRecordsService.get(projectcontentinfo.getProjectId());
@@ -660,6 +668,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"adminModifyReport"})
     public String adminModifyReport(Projectcontentinfo projectcontentinfo,HttpServletRequest request, Model model,RedirectAttributes redirectAttributes)  {
+        String companyType = projectcontentinfo.getCompanyType();
         try{
             String toJson = ruralProjectMessageService.getReportToJson(projectcontentinfo);
             HistoricalData historicalData = new HistoricalData();
@@ -673,11 +682,12 @@ public class RuralCostProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
             }
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("ProjectcontentinfoController save Exception e"+e);
         }
         if(UserUtils.isManager()){
@@ -685,7 +695,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         addMessage(redirectAttributes, "修改报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
     /**
      * 查询管理员变更的所有新增报告数据信息
@@ -776,6 +786,8 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequiresPermissions(value={"ruralProject:ruralCostProjectMessage:edit"},logical= Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         System.out.println(status);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
@@ -930,13 +942,14 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"saveReport"})
     public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
+        String companyType = projectcontentinfo.getCompanyType();
         try{
             Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProject().getId());
             ProjectReportData reportData = projectReportDataService.get(projectcontentinfo1.getInfoId());
             //将审核人员id放入报告信息中
             if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId()) && StringUtils.isBlank(reportData.getBzshbUserId())){
                 addMessage(redirectAttributes, "审核人员未选择，请重新发起请求");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&compnyType="+companyType;
             }
             if(null != reportData){
                 if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
@@ -944,10 +957,10 @@ public class RuralCostProjectMessageController extends BaseController {
                 }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 } else if(reportData.getStatus().equals("5")){
                     addMessage(redirectAttributes, "报告已审核完毕，请勿再次送审");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
             }
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
@@ -1012,6 +1025,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "deleteReport")
     public String deleteReport(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        String companyType = projectcontentinfo.getCompanyType();
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //获取项目信息
@@ -1076,7 +1090,7 @@ public class RuralCostProjectMessageController extends BaseController {
             ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -1114,6 +1128,8 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping(value = {"reportAudit"})
     public String reportAudit(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,
                               RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
         if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
             Act act = getByAct(projectReportData.getProcessInstanceId());
@@ -1123,12 +1139,12 @@ public class RuralCostProjectMessageController extends BaseController {
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+ companyType;
             }
         }
         if(t.getStatus().equals("5")){
             addMessage(redirectAttributes, "项目报告已登记完成，无法再次送审");
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectReportData, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1193,9 +1209,9 @@ public class RuralCostProjectMessageController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
             if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
 
     }
@@ -1204,15 +1220,16 @@ public class RuralCostProjectMessageController extends BaseController {
     public String revoke(HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception {
         HashMap<String, String> requestMap = findRequestMap(request);
         String processInstanceId = requestMap.get("processInstanceId");
+        String companyType = requestMap.get("companyType");
         String id = requestMap.get("id");
         try {
             RuralProjectRecords projectRecords = ruralProjectMessageService.get(id);
             if(3==projectRecords.getProjectReportStatus() || 4==projectRecords.getProjectReportStatus()){
                 addMessage(redirectAttributes, "项目报告已撤回，请勿重复撤回");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }else if(5==projectRecords.getProjectReportStatus()){
                 addMessage(redirectAttributes, "项目报告已审批通过，无法撤回");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }
         ProjectReportData projectReportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectRecords.getId());
         ruralProjectMessageService.cancelInvalidate(projectReportDateByProjectId);
@@ -1221,7 +1238,7 @@ public class RuralCostProjectMessageController extends BaseController {
             logger.info("报告撤回错误",e.getMessage());
             addMessage(redirectAttributes, "撤回该项目报告失败");
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
 
@@ -1264,6 +1281,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecord")
     public String form(ProjectReportRecord projectReportRecord, Model model) throws Exception {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
@@ -1426,6 +1445,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -1626,6 +1647,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveRecord")
     public String save(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception{
+        String companyType = projectReportRecord.getCompanyType();
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1635,7 +1657,7 @@ public class RuralCostProjectMessageController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
             }
             //状态设置为审核中
             projectReportRecord.setStatus("2");
@@ -1649,11 +1671,11 @@ public class RuralCostProjectMessageController extends BaseController {
                 if(null != saveAuditFlag){
                     if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                     }
                     if(t.getStatus().equals("5")){
                         addMessage(redirectAttributes, "报告归档已登记完成，无法再次送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                     }
                 }
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportRecord,t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1673,7 +1695,7 @@ public class RuralCostProjectMessageController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档失败");
             logger.error("保存报告归档失败",e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
 
@@ -1687,6 +1709,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "holdSaveRecord")
     public String holdSaveRecord(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes) throws Exception{
+        String companyType = projectReportRecord.getCompanyType();
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1696,7 +1719,7 @@ public class RuralCostProjectMessageController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
             }
             //添加暂存判定
             projectReportRecord.setFlag("1");
@@ -1718,7 +1741,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
                 if(null != reportRecord){
                     addMessage(redirectAttributes, "报告归档已存在，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
                 ruralProjectMessageService.saveProjectReportRecord(projectReportRecord,variables,processInstanceId);//保存
             }
@@ -1727,7 +1750,7 @@ public class RuralCostProjectMessageController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("保存报告归档暂存失败",e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -1737,6 +1760,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "deleteRecord")
     public String deleteRecord(ProjectReportRecord projectReportRecord) {
+        String companyType = projectReportRecord.getCompanyType();
         ProjectReportData reportData = ruralProjectMessageService.getProjectReportDateByProjectId(projectReportRecord.getReportId());
         if(null != reportData){
             ProjectReportRecord projectReportRecordInfo =ruralProjectMessageService.getProjectReportRecord(reportData.getId());
@@ -1744,7 +1768,7 @@ public class RuralCostProjectMessageController extends BaseController {
             //删除归档信息
             ruralProjectMessageService.deleteRecord(projectReportRecordInfo);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -1791,6 +1815,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping("cancelInvalidate")
     public String cancelInvalidate(ProjectReportRecord projectReportRecord,RedirectAttributes redirectAttributes){
+        String companyType = projectReportRecord.getCompanyType();
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
         try {
             if(projectReportRecord.getStatus().equals("5")){
@@ -1801,14 +1826,14 @@ public class RuralCostProjectMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回报告归档成功");
                 }else{
                     addMessage(redirectAttributes, "报告归档不是送审状态，无法撤回");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回报告归档失败");
             logger.error("强制撤回归档信息失败",e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -1817,6 +1842,7 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping("cancelDescription")
     public String cancelDescription(ProjectMaterialDefectRecord materialDefectRecord, RedirectAttributes redirectAttributes){
         ProjectMaterialDefectRecord defectRecord = projectReportRecordService.getMaterialDefectRecord(materialDefectRecord.getId());
+        String companyType = materialDefectRecord.getCompanyType();
         try {
             MyBeanUtils.copyBeanNotNull2Bean(materialDefectRecord, defectRecord);
             if(defectRecord.getStatus().equals("5")){
@@ -1828,9 +1854,9 @@ public class RuralCostProjectMessageController extends BaseController {
                 }else{
                     addMessage(redirectAttributes, "报告归档资料缺失说明不是送审状态，无法撤回");
                     if (StringUtils.isNotBlank(defectRecord.getView()) && defectRecord.getView().equals("zixun")){
-                        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&compnyType="+companyType;
                     }
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
             }
         }catch (Exception e){
@@ -1838,9 +1864,9 @@ public class RuralCostProjectMessageController extends BaseController {
             logger.error("强制撤回归档资料缺失说明失败",e);
         }
         if (StringUtils.isNotBlank(defectRecord.getView()) && defectRecord.getView().equals("zixun")){
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&compnyType="+companyType;
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -1850,6 +1876,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "updateReported")
     public String updateReported(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("compannyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
@@ -1923,6 +1951,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "reportedModify")
     public String reportedModify(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         ProcessInstance processInstance = actTaskService.getProcIns(reported.getProcessInstanceId());
@@ -1963,9 +1993,10 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveReported")
     public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String companyType = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -1983,7 +2014,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -1994,9 +2025,10 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "tstore")
     public String tstore(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String companyType = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -2014,7 +2046,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报暂存成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
     /**
@@ -2058,6 +2090,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping("cancelInvalidateByReported")
     public String cancelInvalidateByReported(RuralProjectRecordsReported reported,RedirectAttributes redirectAttributes){
+        String companyType = reported.getCompanyType();
         reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());
         try {
             if(reported.getReportStatus().equals("5")){
@@ -2068,14 +2101,14 @@ public class RuralCostProjectMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回项目上报成功");
                 }else{
                     addMessage(redirectAttributes, "项目上报不是送审状态，无法撤回");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回项目上报失败");
             logger.error("强制撤回项目上报信息失败",e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
 
@@ -2088,13 +2121,14 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping(value = "auditSaveReported")
     public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
                                     RedirectAttributes redirectAttributes) {
+        String companyType = reported.getCompanyType();
         try {
             if (!BaseController.REPORTSWITCH){
                 addMessage(redirectAttributes, "重新申请失败：上报管理员已关闭上报功能");
                 if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
                     return "redirect:" + Global.getAdminPath() + "/home/?repage";
                 }else {
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
                 }
             }
             ruralProjectMessageService.disposeList(reported);
@@ -2127,9 +2161,9 @@ public class RuralCostProjectMessageController extends BaseController {
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
-            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&compnyType="+companyType;
         }else {
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
         }
     }
 
@@ -2138,6 +2172,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "adminRecordModifyForm")
     public String adminRecordModifyForm(ProjectReportRecord projectReportRecord, Model model) {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
         if(StringUtils.isBlank(projectReportRecord.getId())){
             projectReportRecord.setCreateDate(new Date());
@@ -2186,6 +2222,7 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping(value = {"adminModifyRecord"})
     public String adminModifyRecord(ProjectReportRecord projectReportRecord,
                                     RedirectAttributes redirectAttributes) {
+        String companyType = projectReportRecord.getCompanyType();
         try {
             //管理员修改项目归档案卷号
             projectReportRecordService.adminModifyRecord(projectReportRecord);
@@ -2194,7 +2231,7 @@ public class RuralCostProjectMessageController extends BaseController {
             logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "案卷号变更失败");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
     }
 
 
@@ -2208,6 +2245,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "updateReportedByPerson")
     public String updateReportedByPerson(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
@@ -2240,6 +2279,7 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveReportedByPerson")
     public String saveReportedByPerson(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String companyType = reported.getCompanyType();
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
             ruralProjectMessageService.disposeList(reported);
@@ -2256,7 +2296,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**

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

@@ -135,6 +135,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"form"})
     public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
@@ -461,6 +463,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @RequiresPermissions(value={"ruralProject:ruralCostProjectMessage:edit"},logical= Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
@@ -722,13 +726,16 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"saveReport"})
     public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
+        System.out.println("--------------------------------->"+flag);
         try{
             Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProject().getId());
             ProjectReportData reportData = projectReportDataService.get(projectcontentinfo1.getInfoId());
             //将审核人员id放入报告信息中
             if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId()) && StringUtils.isBlank(reportData.getBzshbUserId())){
                 addMessage(redirectAttributes, "审核人员未选择，请重新发起请求");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
             if(null != reportData){
                 if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
@@ -736,7 +743,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                 }
 //                else if(reportData.getStatus().equals("5")){
 //                    addMessage(redirectAttributes, "报告已审核完毕，请勿再次送审");
@@ -763,9 +770,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -775,7 +782,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }
         addMessage(redirectAttributes, "发起发起质量复核失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
 
@@ -789,15 +796,18 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"holdSaveReport"})
     public String holdSaveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) throws Exception {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
+        System.out.println("--------------------------->"+flag);
         try{
             String str = ruralProjectMessageService.saveData(projectcontentinfo,1);
             addMessage(redirectAttributes, "暂存报告"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -807,7 +817,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }
         addMessage(redirectAttributes, "暂存报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -820,6 +830,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "deleteReport")
     public String deleteReport(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //获取项目信息
@@ -884,7 +896,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -922,6 +934,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @RequestMapping(value = {"reportAudit"})
     public String reportAudit(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,
                               RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
         if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
             Act act = getByAct(projectReportData.getProcessInstanceId());
@@ -931,12 +945,12 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
         }
         if(t.getStatus().equals("5")){
             addMessage(redirectAttributes, "项目报告已登记完成，无法再次送审");
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectReportData, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -981,8 +995,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }else if ("modifyApply".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
         }
-        String flag = t.getAct().getFlag();
-        if ("yes".equals(flag) && (users==null || users.size()==0)){
+        String temp = t.getAct().getFlag();
+        if ("yes".equals(temp) && (users==null || users.size()==0)){
             addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
         }else {
             if ("modifyApply".equals(taskDefKey)){
@@ -1001,9 +1015,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
             if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
 
     }
@@ -1012,6 +1026,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @RequestMapping(value = {"reportJudgementAudit"})
     public String reportJudgementAudit(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,
                               RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
         if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
             Act act = getByAct(projectReportData.getProcessInstanceId());
@@ -1021,12 +1037,12 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
         }
         if(t.getStatus().equals("5")){
             addMessage(redirectAttributes, "项目报告已登记完成，无法再次送审");
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectReportData, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1052,8 +1068,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }else if ("modifyApply".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
         }
-        String flag = t.getAct().getFlag();
-        if ("yes".equals(flag) && (users==null || users.size()==0)){
+        String temp = t.getAct().getFlag();
+        if ("yes".equals(temp) && (users==null || users.size()==0)){
             addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
         }else {
             if ("modifyApply".equals(taskDefKey)){
@@ -1072,9 +1088,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
             if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
 
     }
@@ -1171,6 +1187,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "formRecord")
     public String form(ProjectReportRecord projectReportRecord, Model model) throws Exception {
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
@@ -1318,6 +1336,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "holdSaveRecord")
     public String holdSaveRecord(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes) throws Exception{
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1329,7 +1349,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
             //添加暂存判定
             projectReportRecord.setFlag("1");
@@ -1351,7 +1371,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
                 if(null != reportRecord){
                     addMessage(redirectAttributes, "报告归档已存在，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                 }
                 ruralProjectMessageService.saveProjectReportRecord(projectReportRecord,variables,processInstanceId);//保存
             }
@@ -1361,11 +1381,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
             logger.error("保存报告归档暂存失败",e);
         }
         if("1".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }else if("2".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1373,6 +1393,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "saveRecord")
     public String save(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception{
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1384,7 +1406,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
             //状态设置为审核中
             projectReportRecord.setStatus("2");
@@ -1398,11 +1420,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 if(null != saveAuditFlag){
                     if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                     }
                     if(t.getStatus().equals("5")){
                         addMessage(redirectAttributes, "报告归档已登记完成，无法再次送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                     }
                 }
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportRecord,t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1423,11 +1445,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
             logger.error("保存报告归档失败",e);
         }
         if("1".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }else if("2".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1435,6 +1457,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -1569,6 +1593,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "formRecordUrgentModify")
     public String formRecordUrgentModify(ProjectReportRecord projectReportRecord, Model model) {
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -1774,6 +1800,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "updateReported")
     public String updateReported(RuralProjectRecords projectRecords, Model model) {
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
@@ -1846,6 +1874,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "reportedModify")
     public String reportedModify(RuralProjectRecords projectRecords, Model model) {
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         ProcessInstance processInstance = actTaskService.getProcIns(reported.getProcessInstanceId());
@@ -1886,9 +1916,10 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "saveReported")
     public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String flag = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -1906,7 +1937,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1917,9 +1948,10 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "tstore")
     public String tstore(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String flag = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
         //根据项目id查询项目信息
         RuralProjectRecords records = projectRecordsService.get(reported.getProjectId());
@@ -1941,11 +1973,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }
         if(null != records){
             if("3".equals(records.getProjectType())){
-                return "redirect:"+Global.getAdminPath()+"/project/projectRecords/?repage";
+                return "redirect:"+Global.getAdminPath()+"/project/projectRecords/?repage&companyType="+flag;
             }
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1956,13 +1988,14 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @RequestMapping(value = "auditSaveReported")
     public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
                                     RedirectAttributes redirectAttributes) {
+        String flag = reported.getCompanyType();
         try {
             if (!BaseController.REPORTSWITCH){
                 addMessage(redirectAttributes, "重新申请失败：上报管理员已关闭上报功能");
                 if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
                     return "redirect:" + Global.getAdminPath() + "/home/?repage";
                 }else {
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                 }
             }
             ruralProjectMessageService.disposeList(reported);
@@ -2009,8 +2042,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 }
             }
 
-            String flag = reported.getAct().getFlag();
-            if ("yes".equals(flag) && (users==null || users.size()==0)){
+            String temp = reported.getAct().getFlag();
+            if ("yes".equals(temp) && (users==null || users.size()==0)){
                 addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
             }else {
                 String str = ruralProjectMessageService.auditSaveReported(t, users);
@@ -2025,14 +2058,14 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
-            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+flag;
         }else {
             if("1".equals(ruralProjectRecords.getProjectType())){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }else if("2".equals(ruralProjectRecords.getProjectType())){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
             }
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }
     }
 
@@ -2047,6 +2080,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"reviewForm"})
     public String reviewForm(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
@@ -2275,6 +2310,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "submitReportedProvincialStanding")
     public String submitReportedProvincialStanding(RuralProjectRecords projectRecords, Model model) {
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         ProcessInstance processInstance = actTaskService.getProcIns(reported.getProcessInstanceId());
@@ -2315,6 +2352,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @RequestMapping(value = "saveReportedProvincialStanding")
     public String saveReportedProvincialStanding(RuralProjectRecordsReported reported, Model model,
                                     RedirectAttributes redirectAttributes) {
+        String flag = reported.getCompanyType();
+        model.addAttribute("companyType",flag);
         try {
             ruralProjectMessageService.disposeList(reported);
             RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
@@ -2330,11 +2369,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
 
         if("1".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }else if("2".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**

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

@@ -229,6 +229,9 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"form"})
     public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -357,6 +360,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"adminModifyForm"})
     public String adminModifyForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -416,6 +421,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"adminEditForm"})
     public String adminEditForm(RuralProjectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         RuralProjectRecords projectRecords=new RuralProjectRecords();
         if (null!=projectcontentinfo.getProjectId()){
             projectRecords = projectRecordsService.get(projectcontentinfo.getProjectId());
@@ -674,6 +681,9 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"adminModifyReport"})
     public String adminModifyReport(Projectcontentinfo projectcontentinfo,HttpServletRequest request, Model model,RedirectAttributes redirectAttributes)  {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         try{
             String toJson = ruralProjectMessageService.getReportToJson(projectcontentinfo);
             HistoricalData historicalData = new HistoricalData();
@@ -687,9 +697,9 @@ public class RuralProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -699,7 +709,7 @@ public class RuralProjectMessageController extends BaseController {
         }
         addMessage(redirectAttributes, "修改报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -790,6 +800,8 @@ public class RuralProjectMessageController extends BaseController {
     @RequiresPermissions(value={"ruralProject:ruralProjectMessage:edit"},logical= Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",flag);
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
@@ -959,13 +971,16 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"saveReport"})
     public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         try{
             Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProject().getId());
             ProjectReportData reportData = projectReportDataService.get(projectcontentinfo1.getInfoId());
             //将审核人员id放入报告信息中
             if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId()) && StringUtils.isBlank(reportData.getBzshbUserId())){
                 addMessage(redirectAttributes, "审核人员未选择，请重新发起请求");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
             if(null != reportData){
                 if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
@@ -973,10 +988,10 @@ public class RuralProjectMessageController extends BaseController {
                 }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 } else if(reportData.getStatus().equals("5")){
                     addMessage(redirectAttributes, "报告已审核完毕，请勿再次送审");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
             }
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
@@ -988,9 +1003,9 @@ public class RuralProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -1000,7 +1015,7 @@ public class RuralProjectMessageController extends BaseController {
         }
         addMessage(redirectAttributes, "发起报告审批失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1012,15 +1027,18 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = {"holdSaveReport"})
     public String holdSaveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         try{
             String str = ruralProjectMessageService.saveData(projectcontentinfo,1);
             addMessage(redirectAttributes, "暂存报告"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -1030,7 +1048,7 @@ public class RuralProjectMessageController extends BaseController {
         }
         addMessage(redirectAttributes, "暂存报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1040,6 +1058,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "deleteReport")
     public String deleteReport(RuralProjectcontentinfo projectcontentinfo, RedirectAttributes redirectAttributes) {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //获取项目信息
@@ -1105,7 +1125,7 @@ public class RuralProjectMessageController extends BaseController {
             ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1114,6 +1134,7 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "getProcessOne")
     public String getProcessOne(Projectcontentinfo projectcontentinfo,String type,Model model) {
+
         ProjectReportData projectReportDataInfo = ruralProjectMessageService.getProjectReportDateByProjectId(projectcontentinfo.getId());
         projectcontentinfo.setProjectReportData(projectReportDataInfo);
         if ("2".equals(type)){          //审批中流程
@@ -1143,6 +1164,9 @@ public class RuralProjectMessageController extends BaseController {
     @RequestMapping(value = {"reportAudit"})
     public String reportAudit(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,
                               RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
         if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
             Act act = getByAct(projectReportData.getProcessInstanceId());
@@ -1152,12 +1176,12 @@ public class RuralProjectMessageController extends BaseController {
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
         }
         if(t.getStatus().equals("5")){
             addMessage(redirectAttributes, "项目报告已登记完成，无法再次送审");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectReportData, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1202,8 +1226,8 @@ public class RuralProjectMessageController extends BaseController {
         }else if ("modifyApply".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
         }
-        String flag = t.getAct().getFlag();
-        if ("yes".equals(flag) && (users==null || users.size()==0)){
+        String temp = t.getAct().getFlag();
+        if ("yes".equals(temp) && (users==null || users.size()==0)){
             addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
         }else {
             if ("modifyApply".equals(taskDefKey)){
@@ -1222,9 +1246,9 @@ public class RuralProjectMessageController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
             if("1".equals(projectRecord.getProjectType())){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
         }
 
     }
@@ -1233,15 +1257,16 @@ public class RuralProjectMessageController extends BaseController {
     public String revoke(HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception {
         HashMap<String, String> requestMap = findRequestMap(request);
         String processInstanceId = requestMap.get("processInstanceId");
+        String companyType = requestMap.get("companyType");
         String id = requestMap.get("id");
         try {
             RuralProjectRecords projectRecords = ruralProjectMessageService.get(id);
             if(3==projectRecords.getProjectReportStatus() || 4==projectRecords.getProjectReportStatus()){
                 addMessage(redirectAttributes, "项目报告已撤回、驳回，请勿重复操作");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }else if(5==projectRecords.getProjectReportStatus()){
                 addMessage(redirectAttributes, "项目报告已审批通过，无法撤回");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
         ProjectReportData projectReportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectRecords.getId());
         ruralProjectMessageService.cancelInvalidate(projectReportDateByProjectId);
@@ -1250,7 +1275,7 @@ public class RuralProjectMessageController extends BaseController {
             logger.info(e.getMessage());
             addMessage(redirectAttributes, "撤回该项目报告失败");
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
 
 
@@ -1293,6 +1318,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecord")
     public String form(ProjectReportRecord projectReportRecord, Model model) throws Exception {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
@@ -1458,6 +1485,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -1596,6 +1625,9 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveRecord")
     public String save(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception{
+        //添加标识
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType", flag);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1604,7 +1636,7 @@ public class RuralProjectMessageController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
             //状态设置为审核中
             projectReportRecord.setStatus("2");
@@ -1618,11 +1650,11 @@ public class RuralProjectMessageController extends BaseController {
                 if(null != saveAuditFlag){
                     if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                     }
                     if(t.getStatus().equals("5")){
                         addMessage(redirectAttributes, "报告归档已登记完成，无法再次送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                     }
                 }
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportRecord,t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1642,7 +1674,7 @@ public class RuralProjectMessageController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档失败");
             logger.error("Exception e:"+e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1655,6 +1687,9 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "holdSaveRecord")
     public String holdSaveRecord(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes) throws Exception{
+        //添加标识
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType", flag);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1664,7 +1699,7 @@ public class RuralProjectMessageController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
             }
             //添加暂存判定
             projectReportRecord.setFlag("1");
@@ -1686,7 +1721,7 @@ public class RuralProjectMessageController extends BaseController {
                 ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
                 if(null != reportRecord){
                     addMessage(redirectAttributes, "报告归档已存在，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
                 ruralProjectMessageService.saveProjectReportRecord(projectReportRecord,variables,processInstanceId);//保存
             }
@@ -1695,7 +1730,7 @@ public class RuralProjectMessageController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("Exception e:"+e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1705,6 +1740,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "deleteRecord")
     public String deleteRecord(ProjectReportRecord projectReportRecord) {
+        //添加标识
+        String flag = projectReportRecord.getCompanyType();
         ProjectReportData reportData = ruralProjectMessageService.getProjectReportDateByProjectId(projectReportRecord.getReportId());
         if(null != reportData){
             ProjectReportRecord projectReportRecordInfo =ruralProjectMessageService.getProjectReportRecord(reportData.getId());
@@ -1712,7 +1749,7 @@ public class RuralProjectMessageController extends BaseController {
             //删除归档信息
             ruralProjectMessageService.deleteRecord(projectReportRecordInfo);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -1730,11 +1767,13 @@ public class RuralProjectMessageController extends BaseController {
     @RequestMapping(value = {"auditProjectReportRecordSave"})
     public String auditProjectReportRecordSave(ProjectReportRecord projectReportRecord, HttpServletRequest request, HttpServletResponse response, Model model,
                             RedirectAttributes redirectAttributes) {
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         try {
             // 对不同环节的业务逻辑进行操作
             List<User> users = UserUtils.getByProssType(projectReportRecord.getProcessInstanceId(),1);
-            String flag = projectReportRecord.getAct().getFlag();
-            if ("yes".equals(flag) && (users==null || users.size()==0)){
+            String temp = projectReportRecord.getAct().getFlag();
+            if ("yes".equals(temp) && (users==null || users.size()==0)){
                 addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
             }else {
                 String str = projectReportRecordService.auditSave(projectReportRecord,users);
@@ -1759,6 +1798,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping("cancelInvalidate")
     public String cancelInvalidate(ProjectReportRecord projectReportRecord,RedirectAttributes redirectAttributes){
+        //添加标识
+        String flag = projectReportRecord.getCompanyType();
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
         try {
             if(projectReportRecord.getStatus().equals("5")){
@@ -1769,20 +1810,22 @@ public class RuralProjectMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回报告归档成功");
                 }else{
                     addMessage(redirectAttributes, "报告归档不是送审状态，无法撤回");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回报告归档失败");
             logger.error("Exception e:"+e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
     /**
      * 编辑项目表单页面
      */
     @RequestMapping(value = "skipDownloadFtl")
     public String skipDownloadFtl(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         model.addAttribute("projectReportData", projectReportData);
         model.addAttribute("projectId", projectRecords.getId());
@@ -1796,6 +1839,8 @@ public class RuralProjectMessageController extends BaseController {
     @RequiresPermissions("ruralProject:ruralProjectMessage:importApprovalFile")
     @RequestMapping(value = "skipImportApprovalWord")
     public String skipImportApprovalWord(RuralProjectRecords projectRecords, String visitType, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         model.addAttribute("projectReportData", projectReportData);
         model.addAttribute("projectId", projectRecords.getId());
@@ -2069,6 +2114,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "updateReported")
     public String updateReported(RuralProjectRecords projectRecords, Model model) {
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType",flag);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
@@ -2143,6 +2190,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "reportedModify")
     public String reportedModify(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         ProcessInstance processInstance = actTaskService.getProcIns(reported.getProcessInstanceId());
@@ -2203,9 +2252,11 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveReported")
     public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        //添加标识
+        String flag = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -2223,7 +2274,7 @@ public class RuralProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     /**
@@ -2234,9 +2285,11 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "tstore")
     public String tstore(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        //添加标识
+        String flag = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -2254,7 +2307,7 @@ public class RuralProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报暂存成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
 
@@ -2283,6 +2336,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping("cancelInvalidateByReported")
     public String cancelInvalidateByReported(RuralProjectRecordsReported reported,RedirectAttributes redirectAttributes){
+        //添加标识
+        String flag = reported.getCompanyType();
         reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());
         try {
             if(reported.getReportStatus().equals("5")){
@@ -2293,14 +2348,14 @@ public class RuralProjectMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回项目上报成功");
                 }else{
                     addMessage(redirectAttributes, "项目上报不是送审状态，无法撤回");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回项目上报失败");
             logger.error("Exception e:"+e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
 
@@ -2313,6 +2368,8 @@ public class RuralProjectMessageController extends BaseController {
     @RequestMapping(value = "auditSaveReported")
     public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
                             RedirectAttributes redirectAttributes) {
+        //添加标识
+        String flag = reported.getCompanyType();
         try {
             //判断是否关闭上报功能
             if (!BaseController.REPORTSWITCH){
@@ -2320,17 +2377,17 @@ public class RuralProjectMessageController extends BaseController {
                 if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
                     return "redirect:" + Global.getAdminPath() + "/home/?repage";
                 }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
-                    return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+flag;
                 }else {
                     RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
                     if(null != ruralProjectRecords){
                         if("1".equals(ruralProjectRecords.getProjectType())){
-                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                         }else if("2".equals(ruralProjectRecords.getProjectType())){
-                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                         }
                     }
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }
             }
             ruralProjectMessageService.disposeList(reported);
@@ -2347,8 +2404,8 @@ public class RuralProjectMessageController extends BaseController {
                 users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
             }
 
-            String flag = reported.getAct().getFlag();
-            if ("yes".equals(flag) && (users==null || users.size()==0)){
+            String temp = reported.getAct().getFlag();
+            if ("yes".equals(temp) && (users==null || users.size()==0)){
                 addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
             }else {
                 String str = ruralProjectMessageService.auditSaveReported(t, users);
@@ -2362,16 +2419,16 @@ public class RuralProjectMessageController extends BaseController {
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
-            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+flag;
         }else {
             if(null != ruralProjectRecords){
                 if("1".equals(ruralProjectRecords.getProjectType())){
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
                 }else if("2".equals(ruralProjectRecords.getProjectType())){
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+flag;
                 }
             }
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
         }
     }
 
@@ -2380,6 +2437,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "adminRecordModifyForm")
     public String adminRecordModifyForm(ProjectReportRecord projectReportRecord, Model model) {
+        String flag = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",flag);
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
         if(StringUtils.isBlank(projectReportRecord.getId())){
             projectReportRecord.setCreateDate(new Date());
@@ -2428,6 +2487,8 @@ public class RuralProjectMessageController extends BaseController {
     @RequestMapping(value = {"adminModifyRecord"})
     public String adminModifyRecord(ProjectReportRecord projectReportRecord,
                             RedirectAttributes redirectAttributes) {
+        //添加标识
+        String flag = projectReportRecord.getCompanyType();
         try {
             //管理员修改项目归档案卷号
             projectReportRecordService.adminModifyRecord(projectReportRecord);
@@ -2436,7 +2497,7 @@ public class RuralProjectMessageController extends BaseController {
             logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "案卷号变更失败");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
 
@@ -2449,6 +2510,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "updateReportedByPerson")
     public String updateReportedByPerson(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
@@ -2475,6 +2538,8 @@ public class RuralProjectMessageController extends BaseController {
     @RequestMapping(value = "saveReportedByPerson")
     public String saveReportedByPerson(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
         String str = "";
+        //添加标识
+        String flag = reported.getCompanyType();
         if(!reported.getIsNewRecord()){//编辑表单保存
             ruralProjectMessageService.disposeList(reported);
             RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
@@ -2490,7 +2555,7 @@ public class RuralProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+flag;
     }
 
     @RequestMapping(value = "getProcess")

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

@@ -143,6 +143,9 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"form"})
     public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
@@ -448,6 +451,9 @@ public class RuralProjectMessageNewController extends BaseController {
     @RequiresPermissions(value={"ruralProject:ruralProjectMessage:edit"},logical= Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        //添加标识
+        String flag = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType", flag);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
@@ -693,13 +699,15 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"saveReport"})
     public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         try{
             Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProject().getId());
             ProjectReportData reportData = projectReportDataService.get(projectcontentinfo1.getInfoId());
             //将审核人员id放入报告信息中
             if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId()) && StringUtils.isBlank(reportData.getBzshbUserId())){
                 addMessage(redirectAttributes, "审核人员未选择，请重新发起请求");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
             if(null != reportData){
                 if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
@@ -707,7 +715,7 @@ public class RuralProjectMessageNewController extends BaseController {
                 }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                 }
 //                else if(reportData.getStatus().equals("5")){
 //                    addMessage(redirectAttributes, "报告已审核完毕，请勿再次送审");
@@ -737,9 +745,9 @@ public class RuralProjectMessageNewController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -748,7 +756,7 @@ public class RuralProjectMessageNewController extends BaseController {
             model.addAttribute("flag","1");
         }
         addMessage(redirectAttributes, "发起发起质量复核失败");
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -760,15 +768,17 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"holdSaveReport"})
     public String holdSaveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         try{
             String str = ruralProjectMessageService.saveData(projectcontentinfo,1);
             addMessage(redirectAttributes, "暂存报告"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -778,7 +788,7 @@ public class RuralProjectMessageNewController extends BaseController {
         }
         addMessage(redirectAttributes, "暂存报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -788,6 +798,7 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "deleteReport")
     public String deleteReport(RuralProjectcontentinfo projectcontentinfo, RedirectAttributes redirectAttributes) {
+        String companyType = projectcontentinfo.getCompanyType();
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //获取项目信息
@@ -837,7 +848,7 @@ public class RuralProjectMessageNewController extends BaseController {
             ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -875,6 +886,7 @@ public class RuralProjectMessageNewController extends BaseController {
     @RequestMapping(value = {"reportAudit"})
     public String reportAudit(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,
                               RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception {
+        String companyType = projectcontentinfo.getCompanyType();
         ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
         if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
             Act act = getByAct(projectReportData.getProcessInstanceId());
@@ -929,12 +941,12 @@ public class RuralProjectMessageNewController extends BaseController {
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
         }
         if(t.getStatus().equals("5")){
             addMessage(redirectAttributes, "项目报告已登记完成，无法再次送审");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
         }
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectReportData, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -998,12 +1010,12 @@ public class RuralProjectMessageNewController extends BaseController {
         if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && projectcontentinfo.getHome().equals("home")){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && "notifyList".equals(projectcontentinfo.getHome())){
-            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+companyType;
         }else {
             if("1".equals(projectRecord.getProjectType())){
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
 
     }
@@ -1069,6 +1081,8 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "formRecord")
     public String form(ProjectReportRecord projectReportRecord, Model model) throws Exception {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
@@ -1221,6 +1235,8 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "holdSaveRecord")
     public String holdSaveRecord(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes) throws Exception{
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1230,7 +1246,7 @@ public class RuralProjectMessageNewController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
             //添加暂存判定
             projectReportRecord.setFlag("1");
@@ -1252,7 +1268,7 @@ public class RuralProjectMessageNewController extends BaseController {
                 ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
                 if(null != reportRecord){
                     addMessage(redirectAttributes, "报告归档已存在，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                 }
                 ruralProjectMessageService.saveProjectReportRecord(projectReportRecord,variables,processInstanceId);//保存
             }
@@ -1261,13 +1277,15 @@ public class RuralProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("Exception e:"+e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
     /**
      * 保存报告归档
      */
     @RequestMapping(value = "saveRecord")
     public String save(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes,Integer saveAuditFlag) throws Exception{
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -1276,7 +1294,7 @@ public class RuralProjectMessageNewController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
             //状态设置为审核中
             projectReportRecord.setStatus("2");
@@ -1290,11 +1308,11 @@ public class RuralProjectMessageNewController extends BaseController {
                 if(null != saveAuditFlag){
                     if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                     }
                     if(t.getStatus().equals("5")){
                         addMessage(redirectAttributes, "报告归档已登记完成，无法再次送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                     }
                 }
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportRecord,t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1314,13 +1332,15 @@ public class RuralProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档失败");
             logger.error("Exception e:"+e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
     /**
      * 查看，增加，编辑报告归档表单页面
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -1458,6 +1478,8 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "updateReported")
     public String updateReported(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
@@ -1536,6 +1558,8 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "reportedModify")
     public String reportedModify(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         ProcessInstance processInstance = actTaskService.getProcIns(reported.getProcessInstanceId());
@@ -1576,9 +1600,10 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "saveReported")
     public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String companyType = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -1596,7 +1621,7 @@ public class RuralProjectMessageNewController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
     /**
      * 保存报告并提交审核
@@ -1606,9 +1631,10 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = "tstore")
     public String tstore(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String companyType = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -1626,7 +1652,7 @@ public class RuralProjectMessageNewController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报暂存成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -1637,6 +1663,7 @@ public class RuralProjectMessageNewController extends BaseController {
     @RequestMapping(value = "auditSaveReported")
     public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
                                     RedirectAttributes redirectAttributes) {
+        String companyType = reported.getCompanyType();
         try {
             //判断是否关闭上报功能
             if (!BaseController.REPORTSWITCH){
@@ -1644,17 +1671,17 @@ public class RuralProjectMessageNewController extends BaseController {
                 if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
                     return "redirect:" + Global.getAdminPath() + "/home/?repage";
                 }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
-                    return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+companyType;
                 }else {
                     RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
                     if(null != ruralProjectRecords){
                         if("1".equals(ruralProjectRecords.getProjectType())){
-                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                         }else if("2".equals(ruralProjectRecords.getProjectType())){
-                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                         }
                     }
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                 }
             }
             ruralProjectMessageService.disposeList(reported);
@@ -1716,16 +1743,16 @@ public class RuralProjectMessageNewController extends BaseController {
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
-            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+companyType;
         }else {
             if(null != ruralProjectRecords){
                 if("1".equals(ruralProjectRecords.getProjectType())){
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                 }else if("2".equals(ruralProjectRecords.getProjectType())){
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
             }
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
         }
     }
     /**
@@ -1740,6 +1767,8 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"reviewForm"})
     public String reviewForm(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        String companyType = projectcontentinfo.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());

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

@@ -144,7 +144,7 @@
 	<div class="layui-row ">
 		<div class="full-width fl">
 			<div class="contentShadow layui-row" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="projectReportRecord" action="${ctx}/projectcontentinfo/projectReportRecord/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="projectReportRecord" action="${ctx}/projectcontentinfo/projectReportRecord/?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}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
@@ -232,8 +232,8 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<a href="javascript:void(0)" onclick="openDialogre('新增报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>
-					<table:exportExcel url="${ctx}/projectcontentinfo/projectReportRecord/export"></table:exportExcel><!-- 导出按钮 -->
+					<a href="javascript:void(0)" onclick="openDialogre('新增报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?companyType=${companyType}','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>
+					<table:exportExcel url="${ctx}/projectcontentinfo/projectReportRecord/export?companyType=${companyType}"></table:exportExcel><!-- 导出按钮 -->
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 					<div style="clear: both;"></div>
 				</div>
@@ -258,7 +258,7 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:60}
                 ,{field:'recordNum',align:'center', title: '归档申请编号',width:200,templet:function(d){
-                    return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看项目', '${ctx}/projectcontentinfo/projectReportRecord/form?id=" + d.id + "&view=view','95%', '95%')\">" + d.recordNum + "</a>";
+                    return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看项目', '${ctx}/projectcontentinfo/projectReportRecord/form?companyType=${companyType}&id=" + d.id + "&view=view','95%', '95%')\">" + d.recordNum + "</a>";
                 }}
                 ,{field:'reportNum', align:'center',title: '报告编号',width:200}
                 ,{field:'reportName', align:'center',title: '报告名称',width:200}
@@ -269,7 +269,7 @@
                 ,{field:'createBy', align:'center',title: '归档申请人',width:200}
                 ,{ title: '状态', align:'center',sort: true, width:100,templet:function(d){
                     var st = getAuditRecordState(d.status)
-                    var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectReportRecord/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                    var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectReportRecord/getProcessOne?companyType=${companyType}&id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                     return xml;
                 }}
                 // ,{fixed: 'right',align:'center', toolbar: '#op',title:"操作"}
@@ -277,15 +277,15 @@
                     ////对操作进行初始化
                     var xml = "";
                     if(d.cancancel != undefined && d.cancancel == "1")
-                        xml += "<a href=\"${ctx}/projectcontentinfo/projectReportRecord/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                        xml += "<a href=\"${ctx}/projectcontentinfo/projectReportRecord/cancelInvalidate?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                     if(d.canedit1 != undefined && d.canedit1 == "1")
-                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?companyType=${companyType}&id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                     if(d.canedit2 != undefined && d.canedit2 == "1")
-                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?id="+ d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?companyType=${companyType}&id="+ d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                     if(d.canedit3 != undefined && d.canedit3 == "1")
-                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改报告归档', '${ctx}/projectcontentinfo/projectReportRecord/form?companyType=${companyType}&id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                     if(d.candelete != undefined && d.candelete == "1")
-                        xml +="<a href=\"${ctx}/projectcontentinfo/projectReportRecord/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告归档吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                        xml +="<a href=\"${ctx}/projectcontentinfo/projectReportRecord/delete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告归档吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
 
                     return xml;
                 }}

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

@@ -353,7 +353,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -1097,7 +1097,11 @@
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
                     <div class="layui-input-block readOnlyFFF">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -1096,6 +1096,11 @@
                         <select id="otherProvinces" name="s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="cityDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
                     <div class="layui-input-block readOnlyFFF">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/submitReportedProvincialStandingForm.jsp

@@ -1083,7 +1083,11 @@
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
                     <div class="layui-input-block">

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

@@ -1047,7 +1047,11 @@
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
                     <div class="layui-input-block">

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

@@ -80,7 +80,11 @@
 						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum" value="${projectReportRecord.fileNumTow}"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">报告日期：</label>
 					<div class="layui-input-block">

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

@@ -405,7 +405,11 @@
 					</td>
                 </tr>//-->
 			</script>
-
+			<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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性文件</h2></div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">

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

@@ -359,6 +359,11 @@
 						<form:input id="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档时间：</label>
 					<div class="layui-input-block">

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

@@ -120,6 +120,11 @@
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.createBy.name}"/>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">申请日期：</label>
 				<div class="layui-input-block">

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

@@ -1689,6 +1689,11 @@
 						</div>
 					</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="${companyType}"/>
+					</div>
+				</div>
 				<div class="form-group layui-row">
 					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 						<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>

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

@@ -521,6 +521,11 @@
 							<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</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="${companyType}"/>
+					</div>
+				</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">咨询标的额(元)：</label>
 						<div class="layui-input-block with-icon">

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

@@ -751,7 +751,6 @@
 		<form:hidden path="projectReportData.id"/>
 		<form:hidden path="projectReportData.createBy.id"/>
 		<form:hidden path="project.id"/>
-		<form:hidden path="companyType"/>
 		<input type="hidden" id="projectSort" value="${projectSort}">
 		<input type="hidden" id="projectOnRuralId" name="projectOnRural.id" value="${projectRecords.id}">
 		<sys:message content="${message}"/>
@@ -1147,7 +1146,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw7">

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

@@ -967,6 +967,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw7">

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

@@ -673,6 +673,11 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 					<%--<div class="layui-item layui-col-sm6 lw6">
                         <label class="layui-form-label">项目类型：</label>
                         <div class="layui-input-block">

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

@@ -625,6 +625,11 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 					<%--<div class="layui-item layui-col-sm6 lw6">
                         <label class="layui-form-label">项目类型：</label>
                         <div class="layui-input-block">

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

@@ -573,7 +573,11 @@
             <form:hidden path="projectId"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
-
+            <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="${companyType}"/>
+                </div>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -1044,7 +1044,11 @@
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
                     <div class="layui-input-block">

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

@@ -751,26 +751,26 @@
 				}else{
 					if(d.projectReportStatusTwo == 5){
 						if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 
 						}
 						if(d.projectReportRecordStatus == 2){
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
 							//驳回操作
 							if(d.newRecordTwoNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 							}else if(d.newRecordNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 							}else{
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 							}
 						}
 					}
@@ -781,19 +781,19 @@
 						if(d.emergencyProject == 1){
 							if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 ){
 								if (d.defectRecordStatus==0) {
-									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 								}
 								if (d.defectRecordStatus==2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
 								}
 								if (d.defectRecordStatus==3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 								}
 								if(d.defectRecordStatus == 4){
 									//驳回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 								}
 							}
 						}
@@ -802,20 +802,20 @@
 					if(d.projectReportStatusTwo == 5){
 						if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 							if (d.defectRecordStatus==0) {
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 							}
 							if (d.defectRecordStatus==2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
 							}
 							if (d.defectRecordStatus==3){
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 
 							}
 							if(d.defectRecordStatus == 4){
 								//驳回操作
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 
 							}
 						}
@@ -828,23 +828,23 @@
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
 									if(d.reportedState == 0 || d.reportedState == 6){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
 									}
 								}else{
 									if(d.reportedState == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 									}
 									if(d.reportedState == 2){
-										xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
+										xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
 									}
 									/*撤回修改*/
 									if(d.reportedState == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 									}
 									/*驳回修改*/
 									if(d.reportedState == 4){
 										//驳回操作
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 									}
 								}
 							}
@@ -855,23 +855,23 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
 								}
 							}else{
 								if(d.reportedState == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 								}
 								if(d.reportedState == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
 									//驳回操作
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 								}
 							}
 						}
@@ -900,24 +900,24 @@
 
 				if('1' == d.flagAdmin && d.projectReportStatus == 5)
 				{
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改报告</a>";
-					xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralCostProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 历史报告</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改报告</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralCostProjectMessage/getReportModifyList?companyType=${companyType}&projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 历史报告</a>";
 				}
 				if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
 				{
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改归档</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?companyType=${companyType}&id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改归档</a>";
 				}
 			}
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
 			if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
-				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
+				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 			}
 			if(d.paperFilingStatus == 5){
-				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改纸质归档</a>";
+				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改纸质归档</a>";
 			}
 			if(d.projectReportStatus == 5){
 				if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新复核</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?companyType=${companyType}&projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新复核</a>";
 				}
 			}
 			//项目升级按钮
@@ -929,7 +929,7 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){
-				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
+				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
 			}
 			</shiro:hasPermission>
 
@@ -1190,7 +1190,7 @@
 				,{field:'projName',align:'center', title: '项目名称', minWidth:215,templet:function(d){
 						var xml="";
 						<shiro:hasPermission name="ruralProject:ruralProjectView:costlistView">
-						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
+						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?companyType=${companyType}&id=" + d.id +"','95%', '95%')\">"
 						</shiro:hasPermission>
 						xml+=d.projName
 						<shiro:hasPermission name="ruralProject:ruralProjectView:costlistView">
@@ -1210,7 +1210,7 @@
 					}}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:215,templet:function(d){
 						if(""!= d.contract && null!= d.contract ){
-							return "<a class=\"attention-info pid\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
+							return "<a class=\"attention-info pid\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?companyType=${companyType}&id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
 							// return d.contractName;
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
@@ -1242,7 +1242,7 @@
                 ,{align:'center', title: '质量复核',  width:100,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?companyType=${companyType}&id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+ 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;
@@ -1259,12 +1259,12 @@
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if(st.action){
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?companyType=${companyType}&id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						} else{
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?companyType=${companyType}&processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
                         return xml;
                     }}
@@ -1296,7 +1296,7 @@
 				,{align:'center', title: '上报',  width:110,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;

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

@@ -80,7 +80,11 @@
 						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum" value="${projectReportRecord.fileNumTow}"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">报告日期：</label>
 					<div class="layui-input-block">

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

@@ -252,6 +252,11 @@
 						<form:input id="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
 					<div class="layui-input-block">

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

@@ -357,7 +357,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">

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

@@ -150,6 +150,12 @@
 					<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectReportRecord.createBy.name}"/>
 				</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="${companyType}"/>
+				</div>
+			</div>
+
 			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">申请日期：</label>
 				<div class="layui-input-block">

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

@@ -231,7 +231,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">

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

@@ -271,7 +271,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp

@@ -498,6 +498,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>
 				<div class="layui-item layui-col-sm12 lw6">

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

@@ -180,7 +180,11 @@
 						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
 					<div class="layui-input-block">

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

@@ -596,7 +596,11 @@
 					</td>
                 </tr>//-->
 			</script>
-
+			<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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
 				<div id="addFile_other" style="display: none" class="upload-progress">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/downloadForm.jsp

@@ -53,6 +53,11 @@
 						</form:select>
 					</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="${companyType}"/>
+					</div>
+				</div>
 			</div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/importWordApprovalForm.jsp

@@ -52,6 +52,11 @@
 										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</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="${companyType}"/>
+					</div>
+				</div>
 			</div>
 			<%--<div class="form-group layui-row first">
 				<div class="layui-item layui-col-sm12">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp

@@ -1111,6 +1111,11 @@
                         </form:select>
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目代码：</label>
                     <div class="layui-input-block">

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

@@ -1576,6 +1576,11 @@
 				<input type="hidden" name="recordsReported.workContractInfo.client.id" id="contractClientId" value="${ruralProjectRecordsReported.workContractInfo.client.id}">
 			</c:if>
 			<sys:message content="${message}"/>
+			<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="${companyType}"/>
+				</div>
+			</div>
 			<div id="info">
 				<input type="hidden" id="status" value="${projectReportData.status}">
 				<div class="form-group layui-row first lw12">

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

@@ -509,6 +509,11 @@
 							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</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="${companyType}"/>
+					</div>
+				</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp

@@ -966,7 +966,11 @@
 					</div>
 				</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="${companyType}"/>
+				</div>
+			</div>
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp

@@ -744,6 +744,11 @@
                     </div>
                 </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="${companyType}"/>
+                </div>
+            </div>
             <%--<div class="form-group layui-row first lw12">
                 <div class="form-group-label"><h2>咨询质量控制信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -542,6 +542,11 @@
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
                     </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="${companyType}"/>
+                    </div>
+                </div>
                     <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
                         <div class="layui-input-block">

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

@@ -1038,6 +1038,11 @@
 						</div>
 					</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="${companyType}"/>
+				</div>
+			</div>
 			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw7">

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

@@ -397,6 +397,11 @@
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">项目编号：</label>
                     <div class="layui-input-block">

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

@@ -592,6 +592,11 @@
 				</div>
 			</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw6">

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

@@ -123,6 +123,11 @@
 				</div>
 			</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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -1033,7 +1033,11 @@
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedFormPerson.jsp

@@ -748,7 +748,11 @@
                     </div>
                 </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="${companyType}"/>
+                </div>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1077,7 +1077,11 @@
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </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="${companyType}"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
                     <div class="layui-input-block readOnlyFFF">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -5,6 +5,10 @@
 <head>
 	<title>项目列表</title>
 	<meta name="decorator" content="default"/>
+	<%--<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>--%>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+	<script src="layer.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 
@@ -581,6 +585,313 @@
 				}
 			})
 		}
+
+		function show(d) {
+			////对操作进行初始化
+			var xml = '<div class=\"layui-btn-group\">';
+			if(d.falg=="1"){
+				if(d.projectReportStatus == 0){
+					xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 新增质量复核</a>";
+				}
+				if(d.projectReportStatus == 1){
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+					<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
+				}
+				if(d.projectReportStatus == 2){
+					xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/revoke?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回质量复核</a>";
+				}
+				if(d.projectReportStatus == 3){
+					//撤回操作
+					xml+="<a href=\"#\" onclick=\"openDialogre('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+					<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
+				}
+				if(d.projectReportStatus == 4){
+					//驳回操作
+					// if(d.newReportNotifyFlag == 1){
+					xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+					<%--}else{--%>
+					<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";--%>
+					<%--}--%>
+
+					<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
+				}
+				//案例项目申请按钮
+				if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
+					if (d.caseType != 1 && d.caseStatus !=2 && d.caseStatus !=5 && d.caseStatus != 4 ){
+						xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/ruralCostProjectMessage/caseBase?companyType=${companyType}&projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 申请案例项目</a>";
+					}
+					if(d.caseType != 1 && d.caseStatus ==2){
+						xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateCaseBase?companyType=${companyType}&projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤销案例项目申请</a>";
+					}
+					if(d.caseType != 1){
+						if(d.caseStatus == 4){
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreNew('重新申请案例项目','${ctx}/workprojectnotify/workProjectNotify/form?companyType=${companyType}&notifyId=" + d.id + "&type=152&remarks=重新申请','95%', '95%','','重新申请,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新申请案例项目</a>";
+						}
+					}
+				}
+				//报告签发操作
+				if(d.projectReportStatus == 5 && d.emergencyProject != 1){
+
+					if(d.projectReportStatusTwo == 0){
+						xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 报告签发</a>";
+					}
+					if(d.projectReportStatusTwo == 1){
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改签发</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 删除签发</a>";
+					}
+					if(d.projectReportStatusTwo == 2){
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/revoke?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.prdtProcessinstanceId + "\" onclick=\"return confirmx('确认要撤回该报告签发审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回签发</a>";
+					}
+					if(d.projectReportStatusTwo == 3){
+						//撤回操作
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改签发</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 删除签发</a>";
+					}
+					if(d.projectReportStatusTwo == 4){
+						//驳回操作
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + "&view=report ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改签发</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 删除签发</a>";
+					}
+				}
+
+				//线上归档操作
+				if(d.projectReportStatusTwo == 0){
+					if(d.projectReportStatus == 5){
+						if(d.emergencyProject == 1){
+							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
+							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上归档</a>";
+							}
+							if(d.projectReportRecordStatus == 1){
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							}
+							if(d.projectReportRecordStatus == 2){
+								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回线上归档</a>";
+							}
+							if(d.projectReportRecordStatus == 3){
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							}
+							if(d.projectReportRecordStatus == 4){
+								//驳回操作
+								if(d.newRecordTwoNotifyFlag == 1){
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";--%>
+								}else if(d.newRecordNotifyFlag == 1){
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
+								}else{
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+								}
+							}
+						}
+					}
+				}else{
+					if(d.projectReportStatusTwo == 5){
+						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
+						if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上归档</a>";
+						}
+						if(d.projectReportRecordStatus == 1){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+						}
+						if(d.projectReportRecordStatus == 2){
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回线上归档</a>";
+						}
+						if(d.projectReportRecordStatus == 3){
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+						}
+						if(d.projectReportRecordStatus == 4){
+							//驳回操作
+							if(d.newRecordTwoNotifyFlag == 1){
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							}else if(d.newRecordNotifyFlag == 1){
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							}else{
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
+							}
+						}
+					}
+				}
+				//归档资料缺失说明
+				if(d.projectReportStatusTwo == 0){
+					if(d.projectReportStatus == 5){
+						if(d.emergencyProject == 1){
+							if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+								if (d.defectRecordStatus==0) {
+									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 资料缺失说明</a>";
+								}
+								if (d.defectRecordStatus==2){
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回说明</a>";
+								}
+								if (d.defectRecordStatus==3){
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 说明作废</a>";
+
+								}
+								if(d.defectRecordStatus == 4){
+									//驳回操作
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 说明作废</a>";
+
+								}
+							}
+						}
+					}
+				}else{
+					if(d.projectReportStatusTwo == 5){
+						if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+							if (d.defectRecordStatus==0) {
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 资料缺失说明</a>";
+							}
+							if (d.defectRecordStatus==2){
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回说明</a>";
+							}
+							if (d.defectRecordStatus==3){
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改资料说明</a>";
+								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 说明作废</a>";
+							}
+							if(d.defectRecordStatus == 4){
+								//驳回操作
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改资料说明</a>";
+								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 说明作废</a>";
+							}
+						}
+					}
+				}
+				/*上报相关按钮*/
+				if(d.projectReportStatusTwo == 0){
+					if(d.projectReportStatus == 5){
+						if(d.emergencyProject == 1){
+							if(d.syncStatus == 0){
+								if(d.reportStatus == 0){
+									if(d.reportedState == 0 || d.reportedState == 6){
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 上报</a>";
+										/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
+									}
+								}else{
+									if(d.reportedState == 1){
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+									}
+									if(d.reportedState == 2){
+										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回上报</a>";
+									}
+									/*撤回修改*/
+									if(d.reportedState == 3){
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+									}
+									/*驳回修改*/
+									if(d.reportedState == 4){
+										//驳回操作
+										// if(d.newReportedNotifyFlag == 1){
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+										<%--}else{--%>
+										<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
+										<%--}--%>
+
+									}
+								}
+							}
+						}
+					}
+				}else{
+					if(d.projectReportStatusTwo == 5){
+						if(d.syncStatus == 0){
+							if(d.reportStatus == 0){
+								if(d.reportedState == 0 || d.reportedState == 6){
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 上报</a>";
+									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
+								}
+							}else{
+								if(d.reportedState == 1){
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+								}
+								if(d.reportedState == 2){
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回上报</a>";
+								}
+								/*撤回修改*/
+								if(d.reportedState == 3){
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+								}
+								/*驳回修改*/
+								if(d.reportedState == 4){
+									//驳回操作
+									// if(d.newReportedNotifyFlag == 1){
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+									<%--}else{--%>
+									<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
+									<%--}--%>
+
+								}
+							}
+						}
+
+					}
+				}
+				/*纸质归档*/
+				if(d.projectReportStatusTwo == 5){
+					if(d.submitMoney == "2"){
+						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
+						if(d.paperFilingStatus == 0){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 纸质归档</a>";
+						}
+						if(d.paperFilingStatus == 2){
+							xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?companyType=${companyType}&id=" + d.ppfId + "&view=filing&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回纸质归档</a>";
+						}
+						if(d.paperFilingStatus == 3){
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 纸质重新归档</a>";
+						}
+						if(d.paperFilingStatus == 4){
+							//驳回操作
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + "&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 纸质重新归档</a>";
+						}
+					}
+				}
+
+
+
+				if('1' == d.flagAdmin && d.projectReportStatus == 5)
+				{
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改报告</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?companyType=${companyType}&projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 历史报告</a>";
+				}
+				if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
+				{
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?companyType=${companyType}&id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改归档</a>";
+				}
+			}
+			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
+			if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
+				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+			}
+			if(d.paperFilingStatus == 5){
+				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改纸质归档</a>";
+			}
+			//项目升级按钮
+			if (d.submitMoney==1){
+				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
+					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 项目升级</a>";
+				}
+			}
+			if(d.projectReportStatus == 5){
+				if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?companyType=${companyType}&projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新复核</a>";
+				}
+			}
+			</shiro:hasPermission>
+
+			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
+			if(d.reportedState == 5 || d.reportedState == 7){
+				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 提交省站</a>";
+			}
+			</shiro:hasPermission>
+
+
+			xml+="</div>";
+			return[xml].join('');
+		}
 	</script>
 	<style>
 		body{
@@ -761,7 +1072,7 @@
 <%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
-				<table class="oa-table layui-table" id="contentTable1"></table>
+				<table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>
 
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
@@ -771,8 +1082,51 @@
 	</div>
 	<div id="changewidth"></div>
 </div>
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="more" style="width: 75px">请选择<i class="layui-icon layui-icon-down"></i></a>
+</script>
+<script>
+	layui.use(function() {
+		//得到各种内置组件
+		var table = layui.table //表格
+				,dropdown = layui.dropdown //下拉菜单
+
+		table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+			var data = obj.data //获得当前行数据
+					, layEvent = obj.event; //获得 lay-event 对应的值
+			if (layEvent === 'more' && (data.falg == 1 || ('0'!=data.projectReportStatus && '1'!=data.projectReportStatus) || data.paperFilingStatus == 5 || data.projectReportStatus == 5 || data.submitMoney==1 || data.reportedState == 5 || data.reportedState == 7) ){
+				//下拉菜单
+				dropdown.render({
+					elem: this //触发事件的 DOM 对象
+					, show: true //外部事件触发即显示
+					, data: [{
+						title: ''
+						, id: 'must' //此项为必填项
+						// , href: '#'
+						// , target: '_blank' 默认_self
+						, templet: show(data)
+
+					}]
+					, align: 'center' //右对齐弹出（v2.6.8 新增）
+					, style: 'box-shadow: 5px 5px 10px rgb(0 0 0 / 12%);' //设置额外样式
+				})
+			}else {
+				dropdown.render({
+					elem: this
+					,show: true
+					,data:[{
+						title: '当前已无可进行操作!'
+						,id:'no'
+					}]
+					, align: 'center' //右对齐弹出（v2.6.8 新增）
+					, style: 'box-shadow: 5px 5px 10px rgb(0 0 0 / 12%);' //设置额外样式
+				})
+			}
+
+		});
+	})
+</script>
 
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
 
     layui.use('table', function(){
@@ -917,313 +1271,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{field:'op',align:'center',title:"操作",width:350,templet:function(d) {
-
-							////对操作进行初始化
-						var xml = '<div class=\"layui-btn-group\">';
-						if(d.falg=="1"){
-							if(d.projectReportStatus == 0){
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 新增质量复核</a>";
-							}
-							if(d.projectReportStatus == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
-							}
-							if(d.projectReportStatus == 2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 撤回质量复核</a>";
-							}
-							if(d.projectReportStatus == 3){
-								//撤回操作
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
-							}
-							if(d.projectReportStatus == 4){
-								//驳回操作
-								// if(d.newReportNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-								<%--}else{--%>
-								<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";--%>
-								<%--}--%>
-
-								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
-							}
-							//案例项目申请按钮
-							if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
-								if (d.caseType != 1 && d.caseStatus !=2 && d.caseStatus !=5 && d.caseStatus != 4 ){
-									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/ruralCostProjectMessage/caseBase?companyType=${companyType}&projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 申请案例项目</a>";
-								}
-								if(d.caseType != 1 && d.caseStatus ==2){
-									xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateCaseBase?companyType=${companyType}&projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤销案例项目申请</a>";
-								}
-								if(d.caseType != 1){
-									if(d.caseStatus == 4){
-										xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreNew('重新申请案例项目','${ctx}/workprojectnotify/workProjectNotify/form?companyType=${companyType}&notifyId=" + d.id + "&type=152&remarks=重新申请','95%', '95%','','重新申请,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  > 重新申请案例项目</a>";
-									}
-								}
-							}
-							//报告签发操作
-							if(d.projectReportStatus == 5 && d.emergencyProject != 1){
-
-								if(d.projectReportStatusTwo == 0){
-									xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签发</a>";
-								}
-								if(d.projectReportStatusTwo == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
-								}
-								if(d.projectReportStatusTwo == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/revoke?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.prdtProcessinstanceId + "\" onclick=\"return confirmx('确认要撤回该报告签发审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 撤回签发</a>";
-								}
-								if(d.projectReportStatusTwo == 3){
-									//撤回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
-								}
-								if(d.projectReportStatusTwo == 4){
-									//驳回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + "&view=report ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
-								}
-							}
-
-							//线上归档操作
-							if(d.projectReportStatusTwo == 0){
-								if(d.projectReportStatus == 5){
-									if(d.emergencyProject == 1){
-										/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-										if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-											xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
-										}
-										if(d.projectReportRecordStatus == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
-										}
-										if(d.projectReportRecordStatus == 2){
-											xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
-										}
-										if(d.projectReportRecordStatus == 3){
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-											xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
-										}
-										if(d.projectReportRecordStatus == 4){
-											//驳回操作
-											if(d.newRecordTwoNotifyFlag == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-												<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";--%>
-											}else if(d.newRecordNotifyFlag == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=Reurgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-												<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
-											}else{
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-											}
-										}
-									}
-								}
-							}else{
-								if(d.projectReportStatusTwo == 5){
-									/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-									if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-										xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
-									}
-									if(d.projectReportRecordStatus == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
-									}
-									if(d.projectReportRecordStatus == 2){
-										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
-									}
-									if(d.projectReportRecordStatus == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
-									}
-									if(d.projectReportRecordStatus == 4){
-										//驳回操作
-										if(d.newRecordTwoNotifyFlag == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}else if(d.newRecordNotifyFlag == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}else{
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-										}
-									}
-								}
-							}
-							//归档资料缺失说明
-							if(d.projectReportStatusTwo == 0){
-								if(d.projectReportStatus == 5){
-									if(d.emergencyProject == 1){
-										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
-											if (d.defectRecordStatus==0) {
-												xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
-											}
-											if (d.defectRecordStatus==2){
-												xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
-											}
-											if (d.defectRecordStatus==3){
-												xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-												xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
-
-											}
-											if(d.defectRecordStatus == 4){
-												//驳回操作
-												xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-												xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
-
-											}
-										}
-									}
-								}
-							}else{
-								if(d.projectReportStatusTwo == 5){
-									if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
-										if (d.defectRecordStatus==0) {
-											xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
-										}
-										if (d.defectRecordStatus==2){
-											xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
-										}
-										if (d.defectRecordStatus==3){
-											xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-											xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
-										}
-										if(d.defectRecordStatus == 4){
-											//驳回操作
-											xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-											xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
-										}
-									}
-								}
-							}
-							/*上报相关按钮*/
-							if(d.projectReportStatusTwo == 0){
-								if(d.projectReportStatus == 5){
-									if(d.emergencyProject == 1){
-										if(d.syncStatus == 0){
-											if(d.reportStatus == 0){
-												if(d.reportedState == 0 || d.reportedState == 6){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
-													/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
-												}
-											}else{
-												if(d.reportedState == 1){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
-												}
-												if(d.reportedState == 2){
-													xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
-												}
-												/*撤回修改*/
-												if(d.reportedState == 3){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
-												}
-												/*驳回修改*/
-												if(d.reportedState == 4){
-													//驳回操作
-													// if(d.newReportedNotifyFlag == 1){
-														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-													<%--}else{--%>
-													<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
-													<%--}--%>
-
-												}
-											}
-										}
-									}
-								}
-							}else{
-								if(d.projectReportStatusTwo == 5){
-									if(d.syncStatus == 0){
-										if(d.reportStatus == 0){
-											if(d.reportedState == 0 || d.reportedState == 6){
-												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
-												/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
-											}
-										}else{
-											if(d.reportedState == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
-											}
-											if(d.reportedState == 2){
-												xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
-											}
-											/*撤回修改*/
-											if(d.reportedState == 3){
-												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
-											}
-											/*驳回修改*/
-											if(d.reportedState == 4){
-												//驳回操作
-												// if(d.newReportedNotifyFlag == 1){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
-												<%--}else{--%>
-												<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
-												<%--}--%>
-
-											}
-										}
-									}
-
-								}
-							}
-							/*纸质归档*/
-							if(d.projectReportStatusTwo == 5){
-								if(d.submitMoney == "2"){
-									/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-									if(d.paperFilingStatus == 0){
-										xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 纸质归档</a>";
-									}
-									if(d.paperFilingStatus == 2){
-										xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?companyType=${companyType}&id=" + d.ppfId + "&view=filing&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回纸质归档</a>";
-									}
-									if(d.paperFilingStatus == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
-									}
-									if(d.paperFilingStatus == 4){
-										//驳回操作
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + "&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
-									}
-								}
-							}
-
-
-
-							if('1' == d.flagAdmin && d.projectReportStatus == 5)
-							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-								xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?companyType=${companyType}&projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 历史报告</a>";
-							}
-							if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
-							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?companyType=${companyType}&id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
-							}
-						}
-						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-						if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
-						}
-						if(d.paperFilingStatus == 5){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
-						}
-						//项目升级按钮
-						if (d.submitMoney==1){
-							if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
-								xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 项目升级</a>";
-							}
-						}
-						if(d.projectReportStatus == 5){
-							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?companyType=${companyType}&projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
-							}
-						}
-						</shiro:hasPermission>
-
-						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
-						if(d.reportedState == 5 || d.reportedState == 7){
-							xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 提交省站</a>";
-						}
-						</shiro:hasPermission>
-
-
-						xml+="</div>";
-						return[xml].join('');
-					}}
+				,{align:'center',title:"操作",width:150,templet:'#barDemo'}
 
 			]]
             ,data: [

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

@@ -338,6 +338,11 @@
                         </div>
                     </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="${companyType}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label">
 					<c:if test="${projectRecords.submitMoney == 2}">