项目管理部分代码提交

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

@@ -9,7 +9,6 @@ import com.jeeplus.common.persistence.TreeEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.ReportedConsultant;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
@@ -76,6 +75,7 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private String projectContentDataNewId;		//宜居性资料或者成果文件的id
 	private String projectId;		//宜居性资料或者成果文件的id
 	private List<ProjectTemplateInfo> projectAchievementFileDataList;   //全过程依据性文件
+	private String companyType;		//项目类型
 
 
 	public RuralProjectRecords getProjectOnRural() {
@@ -435,4 +435,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setProjectAchievementFileDataList(List<ProjectTemplateInfo> projectAchievementFileDataList) {
 		this.projectAchievementFileDataList = projectAchievementFileDataList;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -11,7 +11,6 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.sys.entity.Workattachment;
 
 import java.util.List;
@@ -48,6 +47,7 @@ public class RuralProjectcontentinfo extends TreeEntity<RuralProjectcontentinfo>
 	private List<ProjectTemplateInfo> fileOtherList;   //其他文件
 
 	private String reportedId;
+	private String companyType;		//项目类型
 
 	public String getProjectId() {
 		return projectId;
@@ -246,4 +246,12 @@ public class RuralProjectcontentinfo extends TreeEntity<RuralProjectcontentinfo>
 	public void setProjectReportDataTwo(ProjectReportDataTwo projectReportDataTwo) {
 		this.projectReportDataTwo = projectReportDataTwo;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -955,9 +955,9 @@ 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&companyType="+projectcontentinfo.getCompanyType();
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+projectcontentinfo.getCompanyType();
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -967,7 +967,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&companyType="+projectcontentinfo.getCompanyType();
     }
 
 
@@ -987,9 +987,9 @@ 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&companyType="+projectcontentinfo.getCompanyType();
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+projectcontentinfo.getCompanyType();
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -999,7 +999,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&companyType="+projectcontentinfo.getCompanyType();
     }
 
     /**

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

@@ -436,6 +436,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         model.addAttribute("projectcontentinfo", projectcontentinfo);
         model.addAttribute("projectReportData", projectcontentinfo.getProjectReportData());
         model.addAttribute("projectGrade", records.getSubmitMoney());
+        model.addAttribute("companyType", projectcontentinfo.getCompanyType());
         if (projectReportData != null && projectReportData.getCreateBy() != null && StringUtils.isNotBlank(projectReportData.getCreateBy().getId()) && projectReportData.getCreateBy().getId().equals(UserUtils.getUser().getId())) {
             if("8".equals(records.getAttachmentProjectSort())){
                 return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm";

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

@@ -751,6 +751,7 @@
 		<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}"/>