实施三个阶段 复核的报告号列表中添加一个领取人和领取时间列

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

@@ -28,6 +28,7 @@ public class ProjectContentTreeData {
     private String stageName;//阶段名称
     private String reportType;
     private String typeName;
+    private String state;
 
     public String getId() {
         return id;
@@ -165,4 +166,12 @@ public class ProjectContentTreeData {
     public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

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

@@ -115,16 +115,19 @@
 	</select>
 
 	<select id="getReportNumList" resultType="com.jeeplus.modules.projectcontentinfo.entity.ProjectContentTreeData" >
-		select (@row_number:=@row_number + 1) as `index`,
+		select
 		a.id as "id",
 		a.del_flag as "delFlag",
 		a.num as "num",
-		a.parent_id as "pid"
-		from report_num a,(select @row_number:=0) as t
+		a.parent_id as "pid",
+		su.name as createId ,
+		a.create_date as "createDate"
+		from report_num a
+		left join sys_user su on su.id = a.create_by
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL} and a.state = '0' and a.project_id = #{projectId}
 		</where>
-		ORDER BY a.parent_id
+		ORDER BY a.parent_id,a.create_date
 	</select>
 
 	<select id="getTypeIdList" resultType="java.lang.String">

src/main/webapp/webpage/modules/projectrecord/check/reportForm.jsp

@@ -218,7 +218,7 @@
         function selectNum() {
 			top.layer.open({
 				type: 2,
-				area: ['50%','95%'],
+				area: ['70%','95%'],
 				title:'选择报告号',
 				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}&projectType=${projectType}',
 				btn: ['确定','关闭'],

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -223,7 +223,7 @@
         function selectNum() {
 			top.layer.open({
 				type: 2,
-				area: ['50%','95%'],
+				area: ['70%','95%'],
 				title:'选择报告号',
 				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
 				btn: ['确定','关闭'],

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

@@ -115,7 +115,9 @@
 					{field:'num',align:'center',width:260,title: '报告号'},
 					{field:'stageName',align:'center',  width:110,title: '阶段'},
 					{field:'typeName',align:'center',  title: '工作内容'},
-					{templet: complain, align:'center',title: '操作',width:120}
+					{field:'createId',align:'center',width:80,title: '领取人'},
+					{field:'createDate',align:'center',width:80,title: '领取时间'},
+					{templet: complain, align:'center',title: '操作',width:130}
 				]],
 				done: function () {
 					layer.closeAll('loading');

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

@@ -110,6 +110,8 @@
 					{field:'num',align:'center',  title: '报告号'},
 					{field:'stageName',align:'center',  title: '阶段'},
 					{field:'typeName',align:'center',  title: '工作内容'},
+					{field:'createId',align:'center',width:80,title: '领取人'},
+					{field:'createDate',align:'center',width:80,title: '领取时间'},
 					{templet: complain, title: '操作',width:130}
 				]],
 				done: function () {