Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/bzshbExamine/dao/StandardOpinionDao.java

@@ -30,6 +30,12 @@ public interface StandardOpinionDao extends CrudDao<StandardOpinion> {
     Integer getBjiProject(StandardOpinion standardOpinion);
 
     /**
+     * 查询指定人项目总数
+     * @param standardOpinion
+     * @return
+     */
+    Integer getProjectAllNumber(StandardOpinion standardOpinion);
+    /**
      * 查询指定人时间区间内项目总数
      * @param standardOpinion
      * @return

src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionService.java

@@ -49,32 +49,17 @@ 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.setProjectAllNumber(dao.getProjectAllNumber(info));
+            Integer standardNumber=dao.getStandardNumber(info);
+            info.setStandardNumber(standardNumber);
             info.setStartDate(standardOpinion.getStartDate());
             info.setEndDate(standardOpinion.getEndDate());
             //查询指定人时间区间内项目总数
             info.setProjectAllCount(dao.getProjectAllCount(info));
-            //查询指定人时间区间复核标准评价数量
+            //查询指定人时间区间评价数量
             Integer count=dao.getStandardCount(info);
-            //报告签发标准评价数量
-            Integer twoCount=dao.getStandardCountTwo(info);
-            if (null!=twoCount && 0!=twoCount){
-                count+=twoCount;
-            }
             info.setStandardCount(count);
         }
         page.setList(recordsList);
@@ -91,10 +76,6 @@ public class StandardOpinionService extends CrudService<StandardOpinionDao, Stan
         List<String> auditUserIdList = userDao.getAuditUserListByRelevanceUserId(UserUtils.getUser().getId());
         standardOpinion.setAuditUserIdList(auditUserIdList);
         Integer projectCount = dao.getProjectCountByMasterUser(standardOpinion);
-        Integer projectCountTwo = dao.getProjectCountByMasterUserTwo(standardOpinion);
-        if (null !=projectCountTwo && 0 != projectCountTwo){
-            projectCount+=projectCountTwo;
-        }
         page.setCount(projectCount);
         page.setCountFlag(false);
         standardOpinion.setPage(page);

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

@@ -463,40 +463,42 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         }
 
         ProjectReportDataTwo t = projectReportDataService.getOnRural(projectReportData.getId());//从数据库取出记录的值
-
-        //重新生成质量复核标准送审数据
-        String infoId="";
-        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
-        if (projectcontentinfo.getProjectReviewList()!=null && projectcontentinfo.getProjectReviewList().size()!=0){
-            for (WorkReviewAudit workReviewAudit:projectcontentinfo.getProjectReviewList()){
-                if (StringUtils.isNotBlank(workReviewAudit.getDeductOption())){
-                    infoId=projectReportData.getId();
-                    WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getStandardId());
-                    if (reviewStandard==null){
-                        workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
-                        workReviewAudits.add(workReviewAudit);
-                    }else{
-                        workReviewAudit.setReportId(infoId);
-                        workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
-                        workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
-                        workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
-                        workReviewAudit.setSort(reviewStandard.getSort());
-                        workReviewAudit.setId(null);
-                        workReviewAudit.setType("4");
-                        workReviewAudit.setParent(new WorkReviewAudit("0"));
-                        workReviewAudits.add(workReviewAudit);
+        ProjectReportData data = reportDataService.getReportDataByProjectId(t.getProject().getId());
+        if (projectReportData.getAct().getFlag().equals("yes")){
+            //重新生成质量复核标准送审数据
+            String infoId="";
+            List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+            if (projectcontentinfo.getProjectReviewList()!=null && projectcontentinfo.getProjectReviewList().size()!=0){
+                for (WorkReviewAudit workReviewAudit:projectcontentinfo.getProjectReviewList()){
+                    if (StringUtils.isNotBlank(workReviewAudit.getDeductOption())){
+                        infoId=data.getId();
+                        WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getStandardId());
+                        if (reviewStandard==null){
+                            workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+                            workReviewAudits.add(workReviewAudit);
+                        }else{
+                            workReviewAudit.setReportId(infoId);
+                            workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                            workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                            workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                            workReviewAudit.setSort(reviewStandard.getSort());
+                            workReviewAudit.setId(null);
+                            workReviewAudit.setType("4");
+                            workReviewAudit.setParent(new WorkReviewAudit("0"));
+                            workReviewAudits.add(workReviewAudit);
+                        }
                     }
                 }
             }
-        }
-        workReviewStandardService.deleteAuditType(infoId);
-        if (workReviewAudits!=null && workReviewAudits.size()!=0){
-            for (WorkReviewAudit workReviewAudit:workReviewAudits){
-                workReviewStandardService.saveAudit(workReviewAudit);
+            if (workReviewAudits!=null && workReviewAudits.size()!=0){
+                for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                    workReviewStandardService.saveAudit(workReviewAudit);
+                }
             }
         }
 
 
+
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");

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

@@ -1000,7 +1000,7 @@ public class RuralProjectViewController extends BaseController {
         String type = "4";
         workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
         workReviewAudit.setType(type);
-        workReviewAudit.setReportId(projectReportDataTwo.getId());
+        workReviewAudit.setReportId(projectReportData.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
         for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1705,6 +1705,24 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					model.addAttribute("datalist", workReviewAuditList);
+					//拆线呢报告签发评分展示项
+					List<WorkReviewAudit> reviewAuditList = projectContentDataService.findListIssue(review,"报告签发");
+					//查询报告签发评分评论数据
+					WorkReviewAudit workReviewAuditTwo = new WorkReviewAudit();
+					type = "4";
+					workReviewAuditTwo.setCompanyId(UserUtils.getSelectCompany().getId());
+					workReviewAuditTwo.setType(type);
+					workReviewAuditTwo.setReportId(projectReportData.getId());
+					List<WorkReviewAudit> rreviewAuditList = workReviewStandardService.findAuditList(workReviewAuditTwo);
+					for(WorkReviewAudit reAudit:reviewAuditList){
+						for (WorkReviewAudit audit:rreviewAuditList){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalistTwo", reviewAuditList);
 
 					//查询总审人员信息
 					List<User> auditUserList = userService.getAuditUserList();
@@ -3356,7 +3374,7 @@ public class WorkProjectNotifyController extends BaseController {
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
 						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 						workReviewAudit.setType(type);
-						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						workReviewAudit.setReportId(data.getId());
 						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
 						for(WorkReviewAudit reviewAudit:workReviewAudits){
 							for (WorkReviewAudit audit:audits){
@@ -3877,7 +3895,24 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					model.addAttribute("datalist", workReviewAuditList);
-
+					//拆线呢报告签发评分展示项
+					List<WorkReviewAudit> reviewAuditList = projectContentDataService.findListIssue(review,"报告签发");
+					//查询报告签发评分评论数据
+					WorkReviewAudit workReviewAuditTwo = new WorkReviewAudit();
+					type = "4";
+					workReviewAuditTwo.setCompanyId(UserUtils.getSelectCompany().getId());
+					workReviewAuditTwo.setType(type);
+					workReviewAuditTwo.setReportId(projectReportData.getId());
+					List<WorkReviewAudit> rreviewAuditList = workReviewStandardService.findAuditList(workReviewAuditTwo);
+					for(WorkReviewAudit reAudit:reviewAuditList){
+						for (WorkReviewAudit audit:rreviewAuditList){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalistTwo", reviewAuditList);
 
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
@@ -4122,7 +4157,7 @@ public class WorkProjectNotifyController extends BaseController {
 					type = "4";
 					revAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 					revAudit.setType(type);
-					revAudit.setReportId(projectReportDataTwo.getId());
+					revAudit.setReportId(projectReportData.getId());
 					List<WorkReviewAudit> reviewAuditList = workReviewStandardService.findAuditList(revAudit);
 					for(WorkReviewAudit reAudit:workReviewAudits){
 						for (WorkReviewAudit audit:reviewAuditList){
@@ -4385,6 +4420,25 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					model.addAttribute("datalist", workReviewAuditList);
 
+					//拆线呢报告签发评分展示项
+					List<WorkReviewAudit> reviewAuditList = projectContentDataService.findListIssue(reviewId,"报告签发");
+					//查询报告签发评分评论数据
+					WorkReviewAudit workReviewAuditTwo = new WorkReviewAudit();
+					type = "4";
+					workReviewAuditTwo.setCompanyId(UserUtils.getSelectCompany().getId());
+					workReviewAuditTwo.setType(type);
+					workReviewAuditTwo.setReportId(projectReportData.getId());
+					List<WorkReviewAudit> rreviewAuditList = workReviewStandardService.findAuditList(workReviewAuditTwo);
+					for(WorkReviewAudit reAudit:reviewAuditList){
+						for (WorkReviewAudit audit:rreviewAuditList){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalistTwo", reviewAuditList);
+
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//展示
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();

src/main/java/com/jeeplus/modules/workreview/dao/WorkReviewAuditDao.java

@@ -33,4 +33,9 @@ public interface WorkReviewAuditDao extends CrudDao<WorkReviewAudit>,TreeDao<Wor
     void deleteAuditById(@Param("id")String id);
 
     String selectOrderNum(String parentId);
+
+    List<WorkReviewAudit> findDataAuditList(WorkReviewAudit workReviewAudit);
+    List<WorkReviewAudit> findDataTwoAuditList(WorkReviewAudit workReviewAudit);
+
+
 }

src/main/java/com/jeeplus/modules/workreview/service/WorkReviewStandardService.java

@@ -334,4 +334,15 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
         projectcontentinfo.getProjectReportData().setExaminScore(sore);
         bzshbExaminDao.updateBzshbExamin(projectcontentinfo.getProjectReportData());
     }
+    //获取质量复核审核意见
+    public List<WorkReviewAudit> findDataAuditList(WorkReviewAudit workReviewAudit) {
+        List<WorkReviewAudit> list = workReviewAuditDao.findDataAuditList(workReviewAudit);
+        return list;
+    }
+    //获取报告签发审核意见
+    public List<WorkReviewAudit> findDataTwoAuditList(WorkReviewAudit workReviewAudit) {
+        List<WorkReviewAudit> list = workReviewAuditDao.findDataTwoAuditList(workReviewAudit);
+        return list;
+    }
+
 }

src/main/resources/mappings/modules/bzshbExamin/StandardOpinionDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jeeplus.modules.bzshbExamine.dao.StandardOpinionDao">
 
 	<select id="findList" resultType="com.jeeplus.modules.bzshbExamine.entity.StandardOpinion" >
-		select wpu.user_id as "userId", su.name as "userName",count(a.create_by) as "projectAllNumber"
+		select wpu.user_id as "userId", su.name as "userName"
 		from project_report_data a
 		left join work_project_user wpu on wpu.project_id = a.project_id
 		left join sys_user su on su.id = wpu.user_id
@@ -29,6 +29,30 @@
 		group by wpu.user_id
 		order by a.audit_pass_date desc
 	</select>
+	<select id="getProjectAllNumber" resultType="java.lang.Integer" >
+		select count(a.create_by) as "projectAllNumber"
+		from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		left join sys_user su on su.id = wpu.user_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
+			<if test="auditUserIdList.size>0">
+				and a.bzshb_user_id in
+				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
+					#{auditUserId}
+				</foreach>
+			</if>
+			<if test="(userId != null and userId != '') or (userName != null and userName != '')">
+				AND (wpu.user_id = #{userId} or su.name like concat('%',#{userName},'%'))
+			</if>
+		</where>
+		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
@@ -73,45 +97,47 @@
 		group by wpu.user_id) z
     </select>
 
-	<select id="getStandardNumber" resultType="java.lang.Integer">
+	<select id="getProjectAllCount" resultType="java.lang.Integer">
+
 		select count(1) 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
+		left join rural_project_records rpr on rpr.id = a.project_id
 		<where>
-			and wpu.user_id = #{userId} and wpu.is_master = 1
-			and a.status = 5
-			and a.del_flag = 0
-			and rpr.id IS NOT NULL
+			and wpu.user_id = #{userId}
+			and rpr.project_id is not null
+			and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
 			<if test="auditUserIdList.size>0">
 				and a.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
 					#{auditUserId}
 				</foreach>
 			</if>
+			<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
+				AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
+			</if>
 		</where>
 	</select>
 
-	<select id="getProjectAllCount" resultType="java.lang.Integer">
-
+	<select id="getStandardNumber" resultType="java.lang.Integer">
 		select count(1) 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
+		LEFT JOIN work_review_audit wa on wa.report_id =a.id
 		<where>
 			and wpu.user_id = #{userId}
-			and rpr.project_id is not null
 			and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
+			and wa.type=4
+			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=")">
 					#{auditUserId}
 				</foreach>
 			</if>
-			<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">
-				AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
-			</if>
+<!--			<if test="startDate != null and endDate != null and startDate != '' and endDate != ''">-->
+<!--				AND a.audit_pass_date BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)-->
+<!--			</if>-->
 		</where>
 	</select>
-
 	<select id="getStandardCount" resultType="java.lang.Integer">
 		select count(1) from project_report_data a
 		left join work_project_user wpu on wpu.project_id = a.project_id
@@ -159,16 +185,11 @@
 		aa.projectName,
 		aa.createDate,
 		ws.standard_detail AS "standardDetail",
-		wa.deductOption AS "deductOption",
-		wa.standard_detail AS "standardDetailTwo"
+		wa.deductOption AS "deductOption"
 		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
 		LEFT JOIN project_report_data prd ON prd.project_id = a.id
-		union all
-		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
-		LEFT JOIN project_report_data_two prd ON prd.project_id = a.id
 		) aa
 		LEFT JOIN work_review_audit wa ON wa.report_id = aa.reportId
 		LEFT JOIN work_review_standard ws ON ws.id = wa.standard_id

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAudit.jsp

@@ -1213,6 +1213,48 @@
 								</div>
 							</div>
 						</div>
+						<div style="overflow: hidden">
+							<div class="form-group-label">
+								<h2>报告签发复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
+										</tr>
+										</thead>
+										<tbody>
+										<c:forEach items="${datalistTwo}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+													<%--<td title="${workReviewAudit.orderNum}">--%>
+													<%--${workReviewAudit.orderNum}--%>
+													<%--</td>--%>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+													<%--									</td>--%>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
+													<%--									</td>--%>
+												<td class="input-td">
+													<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -1119,6 +1119,49 @@
 								</div>
 							</div>
 						</div>
+						<div style="overflow: hidden">
+							<div class="form-group-label">
+								<h2>报告签发复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
+										</tr>
+										</thead>
+										<tbody>
+										<c:forEach items="${datalistTwo}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+													<%--<td title="${workReviewAudit.orderNum}">--%>
+													<%--${workReviewAudit.orderNum}--%>
+													<%--</td>--%>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+													<%--									</td>--%>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
+													<%--									</td>--%>
+												<td class="input-td">
+													<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -1202,6 +1202,48 @@
 								</div>
 							</div>
 						</div>
+						<div style="overflow: hidden">
+							<div class="form-group-label">
+								<h2>报告签发复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
+										</tr>
+										</thead>
+										<tbody>
+										<c:forEach items="${datalistTwo}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+													<%--<td title="${workReviewAudit.orderNum}">--%>
+													<%--${workReviewAudit.orderNum}--%>
+													<%--</td>--%>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+													<%--									</td>--%>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
+													<%--									</td>--%>
+												<td class="input-td">
+													<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyBacklogListByMine.jsp

@@ -398,7 +398,7 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">类型：</label>
 						<div class="layui-input-block">
-							<form:select id="type" path="type" class="form-control simple-select">
+							<form:select id="type" path="types" class="form-control simple-select">
 								<form:option value="" label=""/>
 								<form:options items="${fns:getDictList('agenda_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -535,7 +535,7 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">类型：</label>
 						<div class="layui-input-block">
-							<form:select id="type" path="type" class="form-control simple-select">
+							<form:select id="type" path="types" class="form-control simple-select">
 								<form:option value="" label=""/>
 								<form:options items="${fns:getDictList('agenda_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

@@ -398,7 +398,7 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">类型：</label>
 						<div class="layui-input-block">
-							<form:select id="type" path="type" class="form-control simple-select">
+							<form:select id="type" path="types" class="form-control simple-select">
 								<form:option value="" label=""/>
 								<form:options items="${fns:getDictList('agenda_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>