报告号领取排序问题修复

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

@@ -43,6 +43,7 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 
 	private String reportType; //阶段id
 	private String reportId;
+	private String projectType;
 
 	public RuralProjectRecords getProjectOnRural() {
 		return projectOnRural;
@@ -241,4 +242,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setReportId(String reportId) {
 		this.reportId = reportId;
 	}
+
+	public String getProjectType() {
+		return projectType;
+	}
+
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
 }

src/main/java/com/jeeplus/modules/projectrecord/web/check/ChechDesignController.java

@@ -83,6 +83,7 @@ public class ChechDesignController extends BaseController {
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
+        model.addAttribute("projectType","43");
         model.addAttribute("contractName",constructionContract.getContractName());
         return "modules/projectrecord/check/checkDesignList";
     }

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckClaimController.java

@@ -79,6 +79,7 @@ public class CheckClaimController extends BaseController {
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
+        model.addAttribute("projectType","46");
         model.addAttribute("contractName",constructionContract.getContractName());
         return "modules/projectrecord/check/checkClaimList";
     }

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckDistributionSettlementController.java

@@ -40,7 +40,7 @@ import java.util.*;
 
 
 /**
- * 甲供物资Controller
+ * 分布结算Controller
  * @author 徐滕
  * @version 2020-07-30
  */
@@ -89,6 +89,7 @@ public class CheckDistributionSettlementController extends BaseController {
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
+        model.addAttribute("projectType","412");
         model.addAttribute("contractName",constructionContract.getContractName());
         return "modules/projectrecord/check/checkDistributionSettlementList";
     }

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckInterimPaymentController.java

@@ -84,6 +84,7 @@ public class CheckInterimPaymentController extends BaseController {
         List<ConstructionContract> list = page.getList();
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
+        model.addAttribute("projectType","420");
         model.addAttribute("contractName",constructionContract.getContractName());
         return "modules/projectrecord/check/checkInterimPayment";
     }

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckVisaController.java

@@ -86,6 +86,7 @@ public class CheckVisaController extends BaseController {
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
+        model.addAttribute("projectType","45");
         model.addAttribute("contractName",constructionContract.getContractName());
         return "modules/projectrecord/check/checkVisaList";
     }

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

@@ -24,6 +24,14 @@ public interface ProjectReportNumDao extends CrudDao<ReportNum> {
 
     List<ProjectContentTreeData>  getReportNumList(ReportNum reportNum);
 
+
+    /**
+     * 根据父节点id查询对应的project_type表中的typeId数据
+     * @param panretId
+     * @return
+     */
+    List<String>  getTypeIdList(String panretId);
+
     /**
      * 根据工作内容类型查询名称
      * @param reportNum

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

@@ -20,6 +20,7 @@ public class ReportNum extends DataEntity<ReportNum> {
 	private String stageId;   //阶段id
 	private String projectId;   //项目id
 	private String reportType;
+	private String projectType;
 
 
 
@@ -78,4 +79,12 @@ public class ReportNum extends DataEntity<ReportNum> {
 	public void setReportType(String reportType) {
 		this.reportType = reportType;
 	}
+
+	public String getProjectType() {
+		return projectType;
+	}
+
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
 }

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

@@ -136,6 +136,15 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 	}
 
 	/**
+	 * 根据父节点id查询对应的project_type表中的typeId数据
+	 * @param panretId
+	 * @return
+	 */
+	public List<String>  getTypeIdList(String panretId) {
+		return projectReportNumDao.getTypeIdList(panretId);
+	}
+
+	/**
 	 * 根据工作内容类型查询名称
 	 * @param reportNumStr
 	 * @return

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

@@ -71,6 +71,7 @@ public class ProjectReportNumController extends BaseController {
 
 		model.addAttribute("projectId",reportNum.getProjectId());
 		model.addAttribute("reportType",reportType);
+		model.addAttribute("projectType",reportNum.getProjectType());
 		return "modules/projectreportnum/projectReportNumList";
 	}
 	/**
@@ -137,6 +138,14 @@ public class ProjectReportNumController extends BaseController {
 
 		}else{
 			if(null != projectContentTreeDataList){
+				//根据前台是否传递具体复核文件信息来进行展示报告号文件
+				List<String> typeIdList = new ArrayList<>();
+				if(StringUtils.isNotBlank(reportNum.getProjectType())){
+					typeIdList.add(reportNum.getProjectType());
+				}else{
+					typeIdList = projectReportNumService.getTypeIdList(reportType);
+				}
+
 				for(ProjectContentTreeData treeData:projectContentTreeDataList){
 					if(treeData.getPid().equals("0")){
 						listNum.add(treeData);
@@ -144,7 +153,8 @@ public class ProjectReportNumController extends BaseController {
 						String typeId = treeData.getNum().split("-")[1];
 						//截取获取
 						//String typeStage=typeId.split("")[0];
-						if(reportType.equals(reportNum.getReportType())){
+						//判断是否包含数据
+						if(typeIdList.contains(typeId)){
 							List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(typeId);
 							if(null != workClientAttachmentList){
 								for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {

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

@@ -127,6 +127,10 @@
 		ORDER BY a.parent_id
 	</select>
 
+	<select id="getTypeIdList" resultType="java.lang.String">
+		select type_id as typeId from project_type where parent_id =#{parentId}
+	</select>
+
 	<select id="getWorkContentTypeByReportNum" resultType="com.jeeplus.modules.workcontent.entity.WorkContentType">
 		select a.id AS "id",
 		a.create_by AS "createBy.id",

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

@@ -355,7 +355,7 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -384,7 +384,7 @@
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=claim&dictType=&reportType=${reportType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=claim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
                     ].join('');
                 }else{
                     return[''].join('');

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

@@ -357,7 +357,7 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -386,7 +386,7 @@
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=design&dictType=&reportType=${reportType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=design&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
                     ].join('');
                 }else{
                     return[''].join('');

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

@@ -353,7 +353,7 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -382,7 +382,7 @@
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=distribution&dictType=&reportType=${reportType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=distribution&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
                     ].join('');
                 }else{
                     return[''].join('');

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

@@ -393,7 +393,7 @@
 
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
 					].join('');
 				}else{
 					return[''].join('');
@@ -423,7 +423,7 @@
 						return [''].join('');
 					}else if(d.status == null || d.status == '' || d.status == 10){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=interim&dictType=&reportType=${reportType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=interim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 						].join('');
 					}else{
 						return[''].join('');

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

@@ -356,7 +356,7 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -385,7 +385,7 @@
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=visa&dictType=&reportType=${reportType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=visa&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
                     ].join('');
                 }else{
                     return[''].join('');

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

@@ -220,7 +220,7 @@
 				type: 2,
 				area: ['50%','95%'],
 				title:'选择报告号',
-				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
+				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}&projectType=${projectType}',
 				btn: ['确定','关闭'],
 				btn1: function(index, layero){
 					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

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

@@ -108,10 +108,10 @@
 				treeDefaultClose: false,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
-				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}&projectType=${projectType}',
 				page: false,
 				cols: [[
-					{field:'index',align:'center',width:60, title: '序号'},
+					{field:'',align:'center', type:'numbers' ,width:60, title: '序号'},
 					{field:'num',align:'center',width:260,title: '报告号'},
 					{field:'stageName',align:'center',  width:110,title: '阶段'},
 					{field:'typeName',align:'center',  title: '工作内容'},