Home Explore Help
Register Sign In
user5
/
simple_xg_total_process_master
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

管理员上报以及无需复核上报调整

user5 2 years ago
parent
ce6ecee1ac
commit
088f82b8a3
4 changed files with 25 additions and 12 deletions
Unified View Show Diff Stats
  1. 3 3
      src/main/java/com/jeeplus/modules/projectrecord/service/AdminProjectReportedImportService.java
  2. 8 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java
  3. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/adminProjectReportedImportList.jsp
  4. 12 7
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

+ 3 - 3
src/main/java/com/jeeplus/modules/projectrecord/service/AdminProjectReportedImportService.java
View File 

@@ -278,10 +278,10 @@ public class AdminProjectReportedImportService extends CrudService<AdminProjectR
 
         projectReportedImport.setProjectCode("0");      //项目代码
 
         projectReportedImport.setProjectCode("0");      //项目代码
 
         projectReportedImport.setProjectClassify("99"); //项目分类
 
         projectReportedImport.setProjectClassify("99"); //项目分类
 
         projectReportedImport.setTouZiXZ("102");        //投资性质
 
         projectReportedImport.setTouZiXZ("102");        //投资性质
 
-        projectReportedImport.setHeTongLeiXing("20");   //合同类型
 
+        projectReportedImport.setHeTongLeiXing("10");   //合同类型
 
         projectReportedImport.setPorjectStruct("099");  //工程结构
 
         projectReportedImport.setPorjectStruct("099");  //工程结构
 
         projectReportedImport.setGCGMValue("50");       //建筑规模
 
         projectReportedImport.setGCGMValue("50");       //建筑规模
 
-        projectReportedImport.setGCGMValueParameter("项");//建筑规模
 
+        projectReportedImport.setGCGMValueParameter("1项");//建筑规模
 
         projectReportedImport.setPorjectUse("09");      //工程用途
 
         projectReportedImport.setPorjectUse("09");      //工程用途
 
 
 
         projectReportedImport.setOffice(UserUtils.getSelectOffice());
 
         projectReportedImport.setOffice(UserUtils.getSelectOffice());
 
@@ -304,7 +304,7 @@ public class AdminProjectReportedImportService extends CrudService<AdminProjectR
 
         projectReportedImport.setProjectType("81");     //项目类型
 
         projectReportedImport.setProjectType("81");     //项目类型
 
         projectReportedImport.setPorjectStruct("099");  //工程结构
 
         projectReportedImport.setPorjectStruct("099");  //工程结构
 
         projectReportedImport.setGCGMValue("50");       //建筑规模
 
         projectReportedImport.setGCGMValue("50");       //建筑规模
 
-        projectReportedImport.setGCGMValueParameter("项");//建筑规模
 
+        projectReportedImport.setGCGMValueParameter("1项");//建筑规模
 
         projectReportedImport.setPorjectUse("09");      //工程用途
 
         projectReportedImport.setPorjectUse("09");      //工程用途
 
 
 
         projectReportedImport.setOffice(UserUtils.getSelectOffice());
 
         projectReportedImport.setOffice(UserUtils.getSelectOffice());

+ 8 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java
View File 

@@ -685,6 +685,14 @@ public class RuralProjectMessageAllController extends BaseController {
 
             ruralProjectMessageService.disposeProjectRecords(records,reported);
 
             ruralProjectMessageService.disposeProjectRecords(records,reported);
 
             //将质量复核的咨询收入添加到上报中
 
             //将质量复核的咨询收入添加到上报中
 
             reported.setZiXunShouRu(projectReportData.getZiXunShouRu());
 
             reported.setZiXunShouRu(projectReportData.getZiXunShouRu());
 
+            //默认项目编号为0
 
+            reported.setProjectRecordId("0");
 
+            //默认项目代码为0
 
+            reported.setProjectCode("0");
 
+            //工程用途默认其他
 
+            reported.setPorjectUse("09");
 
+            //建筑规模默认1项
 
+            reported.setGCGMValueParameter("1项");
 
         }
 
         }
 
         //根据上报id查询上报咨询员的信息
 
         //根据上报id查询上报咨询员的信息
 
         List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());
 
         List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/adminProjectReportedImportList.jsp
View File 

@@ -332,9 +332,9 @@
 
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 
 				<div class="nav-btns">
 
 				<div class="nav-btns">
 
 					<div class="layui-btn-group">
 
 					<div class="layui-btn-group">
 
-						<shiro:hasPermission name="project:adminProjectReportedImport:add">
 
+						<%--<shiro:hasPermission name="project:adminProjectReportedImport:add">
 
 							<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
 
 							<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
 
-						</shiro:hasPermission>
 
+						</shiro:hasPermission>--%>
 
 						<shiro:hasPermission name="project:adminProjectReportedImport:del">
 
 						<shiro:hasPermission name="project:adminProjectReportedImport:del">
 
 							<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
 
 							<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
 
 						</shiro:hasPermission>
 
 						</shiro:hasPermission>

+ 12 - 7
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp
View File 

@@ -1,5 +1,9 @@
 
+<%@ page import="com.jeeplus.modules.sys.utils.UserUtils" %>
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
 <%@ include file="/webpage/include/taglib.jsp"%>
 
 <%@ include file="/webpage/include/taglib.jsp"%>
 
+<%
 
+	boolean admin = UserUtils.getUser().isAdmin();
 
+%>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
 	<title>项目列表</title>
 
 	<title>项目列表</title>
 
@@ -1079,7 +1083,7 @@
 
 						}
 
 						}
 
 						return xml;
 
 						return xml;
 
 					}}
 
 					}}
 
-                ,{field:'op',align:'center',title:"操作",width:330,templet:function(d) {
 
+                ,{field:'op',align:'center',title:"操作",width:380,templet:function(d) {
 
 						////对操作进行初始化
 
 						////对操作进行初始化
 
 						var xml = '<div class=\"layui-btn-group\">';
 
 						var xml = '<div class=\"layui-btn-group\">';
 
 
 
@@ -1176,12 +1180,13 @@
 
                             }
 
                             }
 
                         </shiro:hasPermission>
 
                         </shiro:hasPermission>
 
 
 
-						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 
-						if(d.reportedState == 10){
 
-							xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageAll/adminSubmitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
 
-						}
 
-						</shiro:hasPermission>
 
-
 
+						<c:if test="<%=admin%>">
 
+							<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 
+							if(d.reportedState == 10){
 
+								xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageAll/adminSubmitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
 
+							}
 
+							</shiro:hasPermission>
 
+						</c:if>
 
 
 
 
 
 						xml+="</div>";
 
 						xml+="</div>";