Parcourir la source

Merge remote-tracking branch 'origin/master'

user5 il y a 3 ans
Parent
commit
6f2b332e5e
16 fichiers modifiés avec 369 ajouts et 17 suppressions
  1. 18 0
      src/main/java/com/jeeplus/modules/bzshbExamine/dao/StandardOpinionDao.java
  2. 9 0
      src/main/java/com/jeeplus/modules/bzshbExamine/entity/StandardOpinion.java
  3. 13 1
      src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionAllService.java
  4. 13 1
      src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionService.java
  5. 1 1
      src/main/java/com/jeeplus/modules/bzshbExamine/web/StandardOpinionAllController.java
  6. 9 1
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java
  7. 4 0
      src/main/java/com/jeeplus/modules/workstaff/web/QualificationsController.java
  8. 30 7
      src/main/resources/mappings/modules/bzshbExamin/StandardOpinionDao.xml
  9. 3 1
      src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp
  10. 3 1
      src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp
  11. 242 0
      src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionUserProjectAllList.jsp
  12. 6 1
      src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionUserProjectList.jsp
  13. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp
  14. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp
  15. 6 3
      src/main/webapp/webpage/modules/workstaff/qualificationList.jsp
  16. 6 0
      src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

+ 18 - 0
src/main/java/com/jeeplus/modules/bzshbExamine/dao/StandardOpinionDao.java

@@ -23,6 +23,13 @@ public interface StandardOpinionDao extends CrudDao<StandardOpinion> {
     Integer getStandardNumber(StandardOpinion standardOpinion);
 
     /**
+     * 获取B级项目的数量
+     * @param standardOpinion
+     * @return
+     */
+    Integer getBjiProject(StandardOpinion standardOpinion);
+
+    /**
      * 查询指定人时间区间内项目总数
      * @param standardOpinion
      * @return
@@ -59,4 +66,15 @@ public interface StandardOpinionDao extends CrudDao<StandardOpinion> {
      * @return
      */
     Integer getProjectCountByMasterUserTwo(StandardOpinion standardOpinion);
+
+    /**
+     * 获取B级复核标准数量
+     * @return
+     */
+    Integer getBjiStandard();
+    /**
+     * 获取A级复核标准数量
+     * @return
+     */
+    Integer getAjiStandard();
 }

+ 9 - 0
src/main/java/com/jeeplus/modules/bzshbExamine/entity/StandardOpinion.java

@@ -33,6 +33,7 @@ public class StandardOpinion extends DataEntity<StandardOpinion> {
 
     private String deductOption;    //标准复核意见
     private String standardDetail;  //标准内容
+    private String standardDetailTwo;  //标准内容旧数据
 
 
     public String getUserId() {
@@ -178,4 +179,12 @@ public class StandardOpinion extends DataEntity<StandardOpinion> {
     public void setStandardDetail(String standardDetail) {
         this.standardDetail = standardDetail;
     }
+
+    public String getStandardDetailTwo() {
+        return standardDetailTwo;
+    }
+
+    public void setStandardDetailTwo(String standardDetailTwo) {
+        this.standardDetailTwo = standardDetailTwo;
+    }
 }

+ 13 - 1
src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionAllService.java

@@ -58,8 +58,20 @@ public class StandardOpinionAllService extends CrudService<StandardOpinionDao, S
         if(null == standardOpinion.getEndDate()){
             standardOpinion.setEndDate(new Date());
         }
-
+        //获取AB级的质量复核数量
+        Integer AJi=dao.getAjiStandard();
+        Integer BJi=dao.getBjiStandard();
         for (StandardOpinion info: recordsList) {
+            //B级项目数量
+            Integer BCount=dao.getBjiProject(info);
+            if (null==BCount){
+                BCount=0;
+            }
+            //A级项目数量
+            Integer ACount=info.getProjectAllNumber()-BCount;
+            //获取AB级项目的总质量复核数量
+            Integer standardNumber=(ACount*AJi)+(BCount*BJi);
+            info.setStandardNumber(standardNumber);
             info.setAuditUserIdList(standardOpinion.getAuditUserIdList());
             info.setStartDate(standardOpinion.getStartDate());
             info.setEndDate(standardOpinion.getEndDate());

+ 13 - 1
src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionService.java

@@ -49,8 +49,20 @@ public class StandardOpinionService extends CrudService<StandardOpinionDao, Stan
         if(null == standardOpinion.getEndDate()){
             standardOpinion.setEndDate(new Date());
         }
-
+        //获取AB级的质量复核数量
+        Integer AJi=dao.getAjiStandard();
+        Integer BJi=dao.getBjiStandard();
         for (StandardOpinion info: recordsList) {
+            //B级项目数量
+            Integer BCount=dao.getBjiProject(info);
+            if (null==BCount){
+                BCount=0;
+            }
+            //A级项目数量
+            Integer ACount=info.getProjectAllNumber()-BCount;
+            //获取AB级项目的总质量复核数量
+            Integer standardNumber=(ACount*AJi)+(BCount*BJi);
+            info.setStandardNumber(standardNumber);
             info.setAuditUserIdList(standardOpinion.getAuditUserIdList());
             info.setStartDate(standardOpinion.getStartDate());
             info.setEndDate(standardOpinion.getEndDate());

+ 1 - 1
src/main/java/com/jeeplus/modules/bzshbExamine/web/StandardOpinionAllController.java

@@ -54,6 +54,6 @@ public class StandardOpinionAllController extends BaseController {
     public String viewList(StandardOpinion standardOpinion, HttpServletRequest request, HttpServletResponse response, Model model){
         Page<StandardOpinion> page = service.findPageByUser(new Page<StandardOpinion>(request, response), standardOpinion);
         model.addAttribute("page", page);
-        return "modules/bzshStandardOpinion/StandardOpinionUserProjectList";
+        return "modules/bzshStandardOpinion/StandardOpinionUserProjectAllList";
     }
 }

+ 9 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -812,15 +812,23 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        //判断是否是新数据
+        boolean flag=false;
         for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){
                 if (reviewAudit.getId().equals(audit.getStandardId())){
                     reviewAudit.setDeductOption(audit.getDeductOption());
+                    flag=true;
                     break;
                 }
             }
         }
-        model.addAttribute("list", workReviewAudits);
+        //取出旧数据的标准意见
+        if (!flag){
+            model.addAttribute("list", audits);
+        }else{
+            model.addAttribute("list", workReviewAudits);
+        }
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";

+ 4 - 0
src/main/java/com/jeeplus/modules/workstaff/web/QualificationsController.java

@@ -123,6 +123,10 @@ public class QualificationsController extends BaseController {
 		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
+		for (WorkStaffBasicInfo info:list){
+			info.setRoleId(roleService.getRoleIdByUserId(info.getUserId()));
+			info.setRoleName(roleService.get(info.getRoleId()).getName());
+		}
 		model.addAttribute("page", page);
 		return "modules/workstaff/qualificationList";
 	}

+ 30 - 7
src/main/resources/mappings/modules/bzshbExamin/StandardOpinionDao.xml

@@ -29,6 +29,21 @@
 		group by wpu.user_id
 		order by a.audit_pass_date desc
 	</select>
+	<select id="getBjiProject" resultType="java.lang.Integer" >
+		select count(a.create_by)
+		from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		left join rural_project_records rpr on rpr.id = a.project_id
+		<where>
+			and a.del_flag = 0
+			and rpr.project_id is not null
+			and a.status = 5
+			and wpu.is_master = 1
+			and rpr.submit_money =1
+			and wpu.user_id=#{userId}
+		</where>
+		group by wpu.user_id
+	</select>
 
     <select id="queryCount" resultType="int" >
         select count(1)
@@ -105,7 +120,7 @@
 			and wpu.user_id = #{userId}
 			and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
 			and wa.type=4
-			and wa.standard_id is not null
+			and (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and a.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -125,7 +140,7 @@
 			and wpu.user_id = #{userId}
 			and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
 			and wa.type=4
-			and wa.standard_id is not null
+			and (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and a.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -144,7 +159,8 @@
 		aa.projectName,
 		aa.createDate,
 		ws.standard_detail AS "standardDetail",
-		wa.deductOption AS "deductOption"
+		wa.deductOption AS "deductOption",
+		wa.standard_detail AS "standardDetailTwo"
 		FROM (
 		select a.id as "projectId" ,a.project_name as "projectName",a.create_date AS "createDate",prd.id as "reportId",wpu.user_id as "user_id",prd.bzshb_user_id as "bzshb_user_id" FROM rural_project_records a
 		LEFT JOIN work_project_user wpu ON wpu.project_id = a.id
@@ -159,7 +175,7 @@
 		<where>
 			and aa.user_id = #{userId}
 			AND wa.type = 4
-			AND wa.standard_id IS NOT NULL
+			AND (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and aa.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -186,7 +202,7 @@
 		<where>
 			and wpu.user_id = #{userId}
 			AND wa.type = 4
-			AND wa.standard_id IS NOT NULL
+			AND (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and prd.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -210,7 +226,7 @@
 		<where>
 			and wpu.user_id = #{userId}
 			AND wa.type = 4
-			AND wa.standard_id IS NOT NULL
+			AND (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and prd.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -225,7 +241,14 @@
 			</if>
 		</where>
 	</select>
-
+	<select id="getBjiStandard" resultType="java.lang.Integer">
+		select count(1) from work_review_standard where parent_ids like concat('0,3,','%') and
+			parent_id != '3'
+	</select>
+	<select id="getAjiStandard" resultType="java.lang.Integer">
+		select count(1) from work_review_standard where parent_ids like concat('0,1,','%') and
+			parent_id != '1'
+	</select>
 
 
 </mapper>

+ 3 - 1
src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp

@@ -260,12 +260,13 @@
 				{field:'index',align:'center', fixed: 'left', title: '序号',width:40}
 				,{field:'userName',align:'center', title: '项目责任人'}
 				,{field:'projectAllNumber',align:'center', title: '总项目数'}
+				,{field:'standardNumber',align:'center', title: '总评价数'}
 				,{field:'projectAllCount',align:'center', title: '当前项目数'}
 				,{field:'standardCount',align:'center', title: '当前标准评价数'}
 				,{field:'op',align:'center',title:"操作", fixed: 'right',width:100,templet:function(d){
 						////对操作进行初始化
 						var xml="";
-						xml+="<a href=\"#\" onclick=\"openDialogView('查看', '${ctx}/standardOpinion/standardOpinion/viewList?id=" + d.id + "&userId=" + d.userId + "','95%', '95%','','关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 查看</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('查看', '${ctx}/standardOpinionAll/standardOpinionAll/viewList?id=" + d.id + "&userId=" + d.userId + "','95%', '95%','','关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 查看</a>";
 						return xml;
 
 					}}
@@ -282,6 +283,7 @@
 					,"startDate":"<fmt:formatDate value="${bzshbExamin.startDate}" pattern="yyyy-MM-dd"/>"
 					,"endDate":"<fmt:formatDate value="${bzshbExamin.endDate}" pattern="yyyy-MM-dd"/>"
 					,"projectAllNumber":"${bzshbExamin.projectAllNumber}"
+					,"standardNumber":"${bzshbExamin.standardNumber}"
 					,"projectAllCount":"${bzshbExamin.projectAllCount}"
 					,"standardCount":"${bzshbExamin.standardCount}"
                 }

+ 3 - 1
src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp

@@ -380,8 +380,9 @@
                 {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
                 ,{field:'userName',align:'center', title: '项目责任人'}
                 ,{field:'projectAllNumber',align:'center', title: '总项目数'}
+                ,{field:'standardNumber',align:'center', title: '总评价数'}
                 ,{field:'projectAllCount',align:'center', title: '当前项目数'}
-                ,{field:'standardCount',align:'center', title: '当前标准评价数'}
+                ,{field:'standardCount',align:'center', title: '当前评价数'}
                 ,{field:'op',align:'center',title:"操作", fixed: 'right',width:100,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -402,6 +403,7 @@
 					,"startDate":"<fmt:formatDate value="${bzshbExamin.startDate}" pattern="yyyy-MM-dd"/>"
 					,"endDate":"<fmt:formatDate value="${bzshbExamin.endDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectAllNumber":"${bzshbExamin.projectAllNumber}"
+                    ,"standardNumber":"${bzshbExamin.standardNumber}"
                     ,"projectAllCount":"${bzshbExamin.projectAllCount}"
                     ,"standardCount":"${bzshbExamin.standardCount}"
                 }

+ 242 - 0
src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionUserProjectAllList.jsp

@@ -0,0 +1,242 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>子项目列表</title>
+	<meta name="decorator" content="default"/>
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script type="text/javascript">
+        $(document).ready(function() {
+			//搜索框收放
+			$('#moresee').click(function(){
+				if($('#moresees').is(':visible'))
+				{
+					$('#moresees').slideUp(0,resizeListWindow2);
+					$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+				}else{
+					$('#moresees').slideDown(0,resizeListWindow2);
+					$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+				}
+			});
+			laydate.render({
+				elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+        });
+
+        function reset() {
+            $("#searchForm").resetForm();
+        }
+        function openDialog(title,url,width,height,target,formId,tableId) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端,根据用户设置的width和height显示。
+
+            }
+
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"two-btns",
+				maxmin: false, //开启最大化最小化按钮
+				content: url ,
+				btn: ['确定','关闭'],
+				yes: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe,则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+					inputForm.attr("action","${ctx}/subProject/subProject/save");//表单提交成功后,从服务器返回的url在当前tab中展示
+					var $document = iframeWin.contentWindow.document;
+
+					formSubmit2($document,formId,index,tableId);
+
+				},
+				cancel: function(index){
+				}
+			});
+        }
+
+			function formSubmit2($document,inputForm,index,tableId){
+
+				var validateForm = $($document.getElementById(inputForm)).validate({
+					submitHandler: function(form){
+						loading('正在提交,请稍等...');
+						form.submit();
+					},
+					errorContainer: "#messageBox",
+					errorPlacement: function(error, element) {
+						$($document.getElementById("#messageBox")).text("输入有误,请先更正。");
+						if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+							error.appendTo(element.parent().parent());
+						} else {
+							error.insertAfter(element);
+						}
+					}
+				});
+				if(validateForm.form()){
+					$($document.getElementById(inputForm)).ajaxSubmit({
+						success:function(data) {
+							var d = data;
+							//输出提示信息
+							if(d.str.length>0){
+								parent.layer.msg(d.str,{icon:1});
+							}
+							window.location.reload();
+							//关闭当前页
+							top.layer.close(index)
+						}
+					});
+				}
+			}
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="standardOpinion" action="${ctx}/standardOpinionAll/standardOpinionAll/viewList?id=${standardOpinion.id}&userId=${standardOpinion.userId}" method="post" class="form-inline layui-form">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称:</label>
+							<div class="layui-input-block">
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">创建时间:</label>
+							<div class="layui-input-block">
+								<input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${standardOpinion.startDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${standardOpinion.endDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+						<div class="layui-item fr">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm  layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
+								</div>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+
+						<div style="clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<div class="layui-btn-group ">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新">&nbsp;刷新</button>
+					</div>
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable1"></table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+<script>
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable1'
+            ,page: false
+            ,cols: [[
+                // {checkbox: true, fixed: true},
+                {field:'index',align:'center', title: '序号',width:70}
+                ,{field:'projectName',align:'center',width:200, title: '项目名称',templet:function(d){
+                        return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">" + d.projectName + "</a>";
+                    }}
+				,{field:'createDate',align:'center',width:100, title: '创建时间'}
+				,{field:'standardDetail',align:'center',width:500, title: '复核标准内容',templet:function(d){
+						return "<span title=\""+d.standardDetail+"\" onclick=\"readOpenInfo('"+d.standardDetail+"')\">"+d.standardDetail+"</span>"
+					}}
+				,{field:'deductOption',align:'center', title: '总审意见'}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="bzshbExamin" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${bzshbExamin.id}"
+                    ,"projectId":"${bzshbExamin.projectId}"
+					,"createDate":"<fmt:formatDate value="${bzshbExamin.createDate}" pattern="yyyy-MM-dd"/>"
+                    ,"projectName":"<c:out value="${bzshbExamin.projectName}" escapeXml="true"/>"
+					<c:if test="${null == bzshbExamin.standardDetail}">
+						,"standardDetail":"${bzshbExamin.standardDetailTwo}"
+					</c:if>
+					<c:if test="${null != bzshbExamin.standardDetail}">
+						,"standardDetail":"${bzshbExamin.standardDetail}"
+					</c:if>
+					,"deductOption":"${bzshbExamin.deductOption}"
+				}
+                </c:forEach>
+                </c:if>
+            ]
+            // ,even: true
+            // ,height: 315
+        });
+    })
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+
+</script>
+</body>
+</html>

+ 6 - 1
src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionUserProjectList.jsp

@@ -340,7 +340,12 @@
                     ,"projectId":"${bzshbExamin.projectId}"
 					,"createDate":"<fmt:formatDate value="${bzshbExamin.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectName":"<c:out value="${bzshbExamin.projectName}" escapeXml="true"/>"
-					,"standardDetail":"${bzshbExamin.standardDetail}"
+					<c:if test="${null == bzshbExamin.standardDetail}">
+						,"standardDetail":"${bzshbExamin.standardDetailTwo}"
+					</c:if>
+					<c:if test="${null != bzshbExamin.standardDetail}">
+						,"standardDetail":"${bzshbExamin.standardDetail}"
+					</c:if>
 					,"deductOption":"${bzshbExamin.deductOption}"
 				}
                 </c:forEach>

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -819,15 +819,18 @@
 									if(d.emergencyProject == 1){
 										/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 										if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 											xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 										}
 										if(d.projectReportRecordStatus == 1){
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 											xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
 										}
 										if(d.projectReportRecordStatus == 2){
 											xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗?', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回线上归档</a>";
 										}
 										if(d.projectReportRecordStatus == 3){
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 											xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}
 										if(d.projectReportRecordStatus == 4){

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -817,15 +817,18 @@
 									if(d.emergencyProject == 1){
 										/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 										if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 											xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 										}
 										if(d.projectReportRecordStatus == 1){
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 											xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 										}
 										if(d.projectReportRecordStatus == 2){
 											xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗?', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 										}
 										if(d.projectReportRecordStatus == 3){
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 											xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 										}
 										if(d.projectReportRecordStatus == 4){

+ 6 - 3
src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -236,8 +236,10 @@
                 ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
-                // ,{field:'role',align:'center', title: '岗位', minWidth:100}
-                ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
+                ,{field:'role',align:'center', title: '岗位', minWidth:100}
+                ,{field:'highestEducation',align:'center', title: '最高学历', minWidth:100}
+
+                // ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 /*,{field:'auditUserName',align:'center', title: '校审人员', minWidth:100
                     ,event:'auditUserId',config:{type:'select',data:params,verify:true}
                     ,templet:function (d) {
@@ -271,7 +273,7 @@
                     ,"id":"${workStaffBasicInfo.id}"
                     ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
                     ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
-                    <%--,"role":"${workStaffBasicInfo.roleName}"--%>
+                    ,"role":"${workStaffBasicInfo.roleName}"
                     ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
                     ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"
                     ,"idCard":"<c:out value="${workStaffBasicInfo.idCard}" escapeXml="true"/>"
@@ -279,6 +281,7 @@
                     ,'office':"<c:out value="${workStaffBasicInfo.office.name}" escapeXml="true"/>"
                     ,'jobGrade':"<c:out value="${workStaffBasicInfo.jobGrade.name}" escapeXml="true"/>"
                     ,'status':"<c:out value="${workStaffBasicInfo.status}" escapeXml="true"/>"
+                    ,'highestEducation':"<c:out value="${workStaffBasicInfo.highestEducation}"/>"
                     ,"entryDate":"<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"
                     <shiro:hasPermission name="qualifications:qualifications:edit">,"canedit":"1"</shiro:hasPermission>
                 }

+ 6 - 0
src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -256,6 +256,12 @@
                             <input style="background-color: #f1f1f1" id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
                         </div>
                     </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>最高学历:</label>
+                        <div class="layui-input-block ">
+                            <input style="background-color: #f1f1f1" id="highestEducation" value="${workStaffBasicInfo.highestEducation}" type="text" readonly class="form-control layui-input" />
+                        </div>
+                    </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">备注:</label>
                         <div class="layui-input-block">