修改报告号的展示

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

@@ -24,7 +24,8 @@ public class ProjectContentTreeData {
     private String url;//下载链接
     private Integer count;//总数
 
-    private String contentName;
+    private String contentName;//工作内容
+    private String stageName;//阶段名称
 
     public String getId() {
         return id;
@@ -138,4 +139,12 @@ public class ProjectContentTreeData {
     public void setContentName(String contentName) {
         this.contentName = contentName;
     }
+
+    public String getStageName() {
+        return stageName;
+    }
+
+    public void setStageName(String stageName) {
+        this.stageName = stageName;
+    }
 }

src/main/java/com/jeeplus/modules/projectreportnum/dao/ProjectReportNumDao.java

@@ -30,4 +30,6 @@ public interface ProjectReportNumDao extends CrudDao<ReportNum> {
      * @return
      */
     WorkContentType getWorkContentTypeByReportNum(String reportNum);
+    //通过id获取阶段名称project_type
+    String getStageName(String reportType);
 }

src/main/java/com/jeeplus/modules/projectreportnum/entity/ReportNum.java

@@ -21,6 +21,7 @@ public class ReportNum extends DataEntity<ReportNum> {
 	private String projectId;   //项目id
 
 
+
 	public String getNum() {
 		return num;
 	}
@@ -68,4 +69,8 @@ public class ReportNum extends DataEntity<ReportNum> {
 	public void setProjectId(String projectId) {
 		this.projectId = projectId;
 	}
+
+
+
+
 }

src/main/java/com/jeeplus/modules/projectreportnum/service/ProjectReportNumService.java

@@ -150,5 +150,8 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 		}
 		return null;
 	}
-	
+	//通过id获取阶段名称
+	public String getStageName(String reportType) {
+		return projectReportNumDao.getStageName(reportType);
+	}
 }

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -86,12 +86,24 @@ public class ProjectReportNumController extends BaseController {
 
 	@RequestMapping(value = "getReportNumList")
 	@ResponseBody
-	public Map<String,List> getReportNumList(ReportNum reportNum,String projectTypeId) {
+	public Map<String,List> getReportNumList(ReportNum reportNum,String projectTypeId,String reportType) {
 		String userId = UserUtils.getUser().getId();
 		reportNum.setUserId(userId);
 		List<ProjectContentTreeData> listNum=new LinkedList();
 		Map<String,List> map = new HashMap<>();
+
+		String stageName=null;
 		List<ProjectContentTreeData> projectContentTreeDataList = projectReportNumService.getReportNumList(reportNum);
+		if(StringUtils.isNotEmpty(reportType)&&projectContentTreeDataList.size()>0){
+			//通过id获取阶段名称
+			stageName=projectReportNumService.getStageName(reportType);
+
+			for(ProjectContentTreeData pct:projectContentTreeDataList){
+
+			}
+		}
+
+
 		if(StringUtils.isNotEmpty(projectTypeId)){
 			for(ProjectContentTreeData treeData:projectContentTreeDataList){
 				if(treeData.getPid().equals("0")){

src/main/resources/mappings/modules/projectreportnum/ProjectReportNumDao.xml

@@ -142,7 +142,9 @@
 		from /*work_content_type*/ project_type a where a.type_id = #{reportNum}
 	</select>
 
-
+	<select id="getStageName" resultType="java.lang.String">
+		select type_name as stageName from project_type where id=#{reportType}
+	</select>
 
 
 </mapper>

src/main/webapp/webpage/modules/projectreportnum/projectReportNumList.jsp

@@ -108,7 +108,7 @@
 				treeDefaultClose: true,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
-				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectId=${projectId}',
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectId=${projectId}&reportType=${reportType}',
 				page: false,
 				cols: [[
 					{field:'index',align:'center',width:120, title: '序号'},