选查项目模块变更

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

@@ -99,6 +99,7 @@ public class RuralProjectRecordChooseCheckAllController extends BaseController {
         List<RuralProjectRecords> list = page.getList();
         for (int i = 0; i < list.size(); i++) {
             RuralProjectRecords records1 = list.get(i);
+            //无合同状态下，获取委托方的名称
             if (records1.getWorkContractInfo() == null) {
                 service.queryLinkmanInfos(records1);
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
@@ -108,6 +109,18 @@ public class RuralProjectRecordChooseCheckAllController extends BaseController {
                     records1.setWorkContractInfo(contractInfo);
                 }
             }
+            //获取项目报告号
+            if(records1.getReportData()==null){
+                ruralProjectMessageService.queryReportData(records1);
+                if (records1.getProjectReportData() != null && records1.getProjectReportData().size() > 0) {
+                    ProjectReportData reportData = records1.getProjectReportData().get(0);
+                    ProjectReportData projectReportData = new ProjectReportData();
+                    projectReportData.setNumber(reportData.getNumber());
+//					records1.setReportData(projectReportData);
+                    records1.setProjectReportNumber(reportData.getNumber());
+                }
+            }
+            records1.setCreateBy(UserUtils.get(records1.getCreateBy().getId()));
             //判断是否为admin
             if (UserUtils.isManager()){
                 records1.setFlagAdmin("1");

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

@@ -99,6 +99,7 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
         List<RuralProjectRecords> list = page.getList();
         for (int i = 0; i < list.size(); i++) {
             RuralProjectRecords records1 = list.get(i);
+            //无合同状态下，获取委托方的名称
             if (records1.getWorkContractInfo() == null) {
                 service.queryLinkmanInfos(records1);
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
@@ -108,6 +109,18 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
                     records1.setWorkContractInfo(contractInfo);
                 }
             }
+            //获取项目报告号
+            if(records1.getReportData()==null){
+                ruralProjectMessageService.queryReportData(records1);
+                if (records1.getProjectReportData() != null && records1.getProjectReportData().size() > 0) {
+                    ProjectReportData reportData = records1.getProjectReportData().get(0);
+                    ProjectReportData projectReportData = new ProjectReportData();
+                    projectReportData.setNumber(reportData.getNumber());
+//					records1.setReportData(projectReportData);
+                    records1.setProjectReportNumber(reportData.getNumber());
+                }
+            }
+            records1.setCreateBy(UserUtils.get(records1.getCreateBy().getId()));
             //判断是否为admin
             if (UserUtils.isManager()){
                 records1.setFlagAdmin("1");

src/main/webapp/static/common/jeeplus.js

@@ -441,12 +441,12 @@ function getCheckProjectState(id)
     result.action = true;
     switch(id)
     {
-        case "0":result.label = "unknown";result.status="未审查";result.action = false;break;
+        case "0":result.label = "unknown";result.status="未选";result.action = false;break;
         case "1":result.label = "tempstore";result.status="暂存";result.action = false;break;
-        case "2":result.label = "auditing";result.status="审查中";break;
+        case "2":result.label = "auditing";result.status="归档中";break;
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
-        case "5":result.label = "signed";result.status="审查完成";break;
+        case "5":result.label = "signed";result.status="归档完成";break;
         case "7":result.label = "discarded";result.status="作废";result.action = false;break;
         case "8":result.label = "discarded";result.status="已删除";result.action = false;break;
         default:

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -148,6 +148,42 @@
                 }
             });
         }
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
 	</script>
 	<style>
 		body{
@@ -262,32 +298,42 @@
             ,elem: '#contentTable1'
             ,page: false
             ,cols: [[
-                {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
-                    }}
+				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
-                ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
-                    	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
+						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+					}}
+				,{field: 'projectReportNumber', align:'center', title: '报告号',width:170,templet: function(d){
+						if(""!= d.projectReportNumber){
+							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						}else{
+							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+						}
 					}}
 				,{field:'fileNum', align:'center',title: '案卷号',minWidth:200,templet:function(d){
 						return "<span title='"+ d.fileNum +"'>" + d.fileNum + "</span>";
 					}}
-                ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
-                        return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
-                    }}
-                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
-                        return "<span title=\"" + d.client + "\">" + d.client + "</span>";
-                    }}
-                ,{field:'createDate',align:'center', title: '创建日期',  width:80}
-                ,{align:'center', title: '状态',  width:70,templet:function(d){
-                        var st = getCheckProjectState(d.checkStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/recordChooseCheck/getProcess?id=" + 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;
-                    }}
+				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
+						return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+					}}
+				,{field:'client',align:'center', title: '委托单位',  width:150,templet:function(d){
+						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
+					}}
+				,{field:'projMaster', align:'center',title: '项目负责人', width:65,templet:function(d){
+						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
+					}}
+				,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field:'creatName', align:'center',title: '登记人', width:65,templet:function(d){
+						return "<span title=\"" + d.creatName + "\">" + d.creatName + "</span>";
+					}}
+				,{align:'center', title: '状态',  width:70,templet:function(d){
+						var st = getCheckProjectState(d.checkStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/recordChooseCheck/getProcess?id=" + 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;
+					}}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -338,6 +384,8 @@
 					,"flagAdmin":"${projectRecords.flagAdmin}"
 					,"checkStatus":"${projectRecords.checkStatus}"
 					,"fileNum":"${projectRecords.fileNum}"
+					,"projectReportNumber":"${projectRecords.projectReportNumber}"
+					,"creatName":"${projectRecords.createBy.name}"
 					<shiro:hasPermission name="project:recordChooseCheckAll:add">
 					,"canAdd":	<c:choose><c:when test="${projectRecords.checkStatus == 0}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -148,6 +148,42 @@
                 }
             });
         }
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
 	</script>
 	<style>
 		body{
@@ -267,19 +303,29 @@
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
+				,{field: 'projectReportNumber', align:'center', title: '报告号',width:170,templet: function(d){
+						if(""!= d.projectReportNumber){
+							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						}else{
+							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+						}
+					}}
+				,{field:'fileNum', align:'center',title: '案卷号',minWidth:200,templet:function(d){
+						return "<span title='"+ d.fileNum +"'>" + d.fileNum + "</span>";
+					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                     	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 					}}
-                ,{field:'fileNum', align:'center',title: '案卷号',minWidth:200,templet:function(d){
-                    	return "<span title='"+ d.fileNum +"'>" + d.fileNum + "</span>";
+				,{field:'client',align:'center', title: '委托单位',  width:150,templet:function(d){
+						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
+					}}
+				,{field:'projMaster', align:'center',title: '项目负责人', width:65,templet:function(d){
+						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
-                ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
-                        return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
-                    }}
-                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
-                        return "<span title=\"" + d.client + "\">" + d.client + "</span>";
-                    }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field:'creatName', align:'center',title: '登记人', width:65,templet:function(d){
+						return "<span title=\"" + d.creatName + "\">" + d.creatName + "</span>";
+					}}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         var st = getCheckProjectState(d.checkStatus);
                         if(st.action)
@@ -338,6 +384,8 @@
 					,"flagAdmin":"${projectRecords.flagAdmin}"
 					,"checkStatus":"${projectRecords.checkStatus}"
 					,"fileNum":"${projectRecords.fileNum}"
+					,"projectReportNumber":"${projectRecords.projectReportNumber}"
+					,"creatName":"${projectRecords.createBy.name}"
 
 					<shiro:hasPermission name="project:recordChooseCheck:del">,"candel":	<c:choose><c:when test="${(projectRecords.checkStatus == 1 or projectRecords.checkStatus == 3 or projectRecords.checkStatus == 4)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="project:recordChooseCheck:edit">