Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataTwoDao.java

@@ -118,6 +118,12 @@ public interface ProjectReportDataTwoDao extends CrudDao<ProjectReportDataTwo> {
      * @return
      */
     ProjectReportDataTwo getProjectReportData(String projectId);
+    /**
+     * 根据项目id查询报告签发信息
+     * @param projectId
+     * @return
+     */
+    ProjectReportDataTwo getProjectReportDataTwoByProjectId(String projectId);
 
     /**
      * 全过程根据id查询归档报告信息
@@ -147,4 +153,4 @@ public interface ProjectReportDataTwoDao extends CrudDao<ProjectReportDataTwo> {
      * @return
      */
     ProjectReportDataTwo findTwoByProjectId(String projectId);
-}
+}

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataTwoService.java

@@ -1600,6 +1600,15 @@ public class ProjectReportDataTwoService extends CrudService<ProjectReportDataTw
 		ProjectReportDataTwo projectReportData = dao.getProjectReportData(projectId);
 		return projectReportData;
 	}
+	/**
+	 * 根据项目id查询报告签发信息
+	 * @param projectId
+	 * @return
+	 */
+	public ProjectReportDataTwo getProjectReportDataTwoByProjectId(String projectId) {
+		ProjectReportDataTwo projectReportData = dao.getProjectReportDataTwoByProjectId(projectId);
+		return projectReportData;
+	}
 
 
 	/**

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.ruralprojectrecords.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordReportInfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
@@ -204,4 +205,17 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     Integer updatePlanInfo(ProjectRecords projectRecord);
+
+    /**
+     * 查询报告签发审批完成并且审批时间为null的数据的审批通过时间
+     * @return
+     */
+    List<ProjectReportDataTwo> getProjectReportTwoInfo();
+
+    /**
+     * 报告签发审批时间节点为保存修改
+     * @param info
+     * @return
+     */
+    Integer updateReportDataTwo(ProjectReportDataTwo info);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -25,6 +25,7 @@ import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
@@ -2282,4 +2283,16 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void updatePlanInfo(ProjectRecords projectRecord){
 		dao.updatePlanInfo(projectRecord);
 	}
+
+	/**
+	 * 报告签发审批完成审批时间未同步处理
+	 */
+	public void disposeProjectReportTwoInfo(){
+		//查询报告签发审批完成并且审批时间为null的数据的审批通过时间
+		List<ProjectReportDataTwo> projectReportTwoInfo = dao.getProjectReportTwoInfo();
+		//循环遍历修改报告签发对应数据的审核时间
+		for (ProjectReportDataTwo info : projectReportTwoInfo) {
+			dao.updateReportDataTwo(info);
+		}
+	}
 }

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

@@ -173,6 +173,7 @@ import com.jeeplus.modules.workprojectcompletion.entity.WorkProjectCompletionInf
 import com.jeeplus.modules.workprojectcompletion.service.WorkProjectCompletionService;
 import com.jeeplus.modules.workprojectdeposit.entity.WorkProjectDeposit;
 import com.jeeplus.modules.workprojectdeposit.service.WorkProjectDepositService;
+import com.jeeplus.modules.workprojectnotify.dao.WorkProjectNotifyDao;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreceiptsrevise.entity.WorkReceiptsRevise;
@@ -480,6 +481,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private ProjectEngineeringService engineeringService;
 	@Autowired
 	private SubProjectInfoService subProjectInfoService;
+	@Autowired
+	private WorkProjectNotifyDao workProjectNotifyDao;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -559,6 +562,23 @@ public class WorkProjectNotifyController extends BaseController {
 		return "modules/workprojectnotify/workProjectNotifyReadBacklogList";
 	}
 
+	/**
+	 * 已审批待办列表页面
+	 */
+	@RequestMapping(value = {"readShowCount"})
+	@ResponseBody
+	public Map<String,Object> readShowCount (WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Map<String,Object> map=new HashMap<>();
+		User user = UserUtils.getUser();
+		workProjectNotify.setUser(user);
+		workProjectNotify.setStatus("2");
+		workProjectNotify.setRemarks("待通知");
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		Integer count=workProjectNotifyDao.queryReadCount(workProjectNotify);
+		map.put("count",count);
+		return map;
+	}
+
 
 	/**
 	 * 我发起的待办列表页面
@@ -1685,7 +1705,7 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					model.addAttribute("datalist", workReviewAuditList);
-					
+
 					//查询总审人员信息
 					List<User> auditUserList = userService.getAuditUserList();
 					ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -3858,7 +3878,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					model.addAttribute("datalist", workReviewAuditList);
 
-					
+
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
@@ -4082,7 +4102,38 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}
 					}
+					//获取自检的质量复核标准
+					String reviewId="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						reviewId="1";
+					}else{
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+							reviewId="2";
+						}else{
+							reviewId="3";
+						}
+					}
+					//查询报告签发数据信息
+					ProjectReportDataTwo projectReportDataTwo = projectReportDataTwoService.getProjectReportDataTwoByProjectId(ruralProjectRecords.getId());
+					//拆线呢报告签发评分展示项
+					List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
+					//查询报告签发评分评论数据
+					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+					type = "4";
+					revAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+					revAudit.setType(type);
+					revAudit.setReportId(projectReportDataTwo.getId());
+					List<WorkReviewAudit> reviewAuditList = workReviewStandardService.findAuditList(revAudit);
+					for(WorkReviewAudit reAudit:workReviewAudits){
+						for (WorkReviewAudit audit:reviewAuditList){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
 					model.addAttribute("datalist", workReviewAuditList);
+					model.addAttribute("workReviewList", workReviewAudits);
 
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));

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

@@ -117,6 +117,11 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
         return listReturn;
     }
 
+    /**
+     * 查询评论信息
+     * @param workReviewAudit
+     * @return
+     */
     public List<WorkReviewAudit> findAuditList(WorkReviewAudit workReviewAudit) {
         List<WorkReviewAudit> workReviewStandards = Lists.newArrayList();
         Office company = UserUtils.getSelectCompany();
@@ -189,7 +194,7 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
     public Page<WorkReviewStandard> findPage(Page<WorkReviewStandard> page, WorkReviewStandard workReviewStandard) {
 		return super.findPage(page, workReviewStandard);
 	}
-	
+
 	@Transactional(readOnly = false)
     public void saveAudit(WorkReviewAudit workReviewAudit) {
         //设置序号
@@ -329,4 +334,4 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
         projectcontentinfo.getProjectReportData().setExaminScore(sore);
         bzshbExaminDao.updateBzshbExamin(projectcontentinfo.getProjectReportData());
     }
-}
+}

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataTwoDao.xml

@@ -729,6 +729,15 @@
 		limit 1
 	</select>
 
+	<select id="getProjectReportDataTwoByProjectId" resultType="com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo">
+		select
+		<include refid="projectReportDataColumns"/>
+		,a.bzshb_user_id as "bzshbUserId"
+		from project_report_data_two a
+		where a.del_flag = 0 AND a.project_id = #{projectId}
+		limit 1
+	</select>
+
 	<select id="processFindInfoByStatus" resultType="ProjectReportDataTwo" >
 		SELECT
 		<include refid="projectReportDataColumns"/>,

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1772,4 +1772,27 @@
 		plan_attachment_id = #{planAttachmentId}
 		where id = #{id}
 	</update>
+
+	<select id="getProjectReportTwoInfo" resultType="ProjectReportDataTwo">
+		select
+			t.create_date as "createDate",
+			t.process_instance_id as "processInstanceId"
+		from
+			work_activity_process t
+			join (
+					select
+					  substring_index( group_concat( id order by create_date desc ), ',', 1 ) as id
+					from
+					  work_activity_process
+					  where process_instance_id
+						in(select process_instance_id from project_report_data_two where status = 5 and audit_pass_date is null)
+					group by process_instance_id ) tmp
+		on t.id = tmp.id;
+	</select>
+
+	<update id="updateReportDataTwo">
+		update project_report_data_two
+		set audit_pass_date = #{createDate}
+		where process_instance_id = #{processInstanceId}
+	</update>
 </mapper>

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

@@ -1149,6 +1149,61 @@
 								</div>
 							</div>
 						</div>
+
+						<div>
+							<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 reviews no-bottom-margin">
+										<thead>
+										<tr>
+												<%--<th width="25%">序号</th>--%>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+												<%--								<th width="10%">最高分</th>--%>
+												<%--								<th width="10%">扣分</th>--%>
+											<th >意见</th>
+
+												<%--<th width="15%">操作</th>--%>
+										</tr>
+										</thead>
+										<tbody>
+										<c:forEach items="${workReviewList}" 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>
+											<%--							<tr>--%>
+											<%--								<td colspan="2" style="font-weight: bold">总分</td>--%>
+											<%--								<td id="maxTotal"></td>--%>
+											<%--								<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+											<%--								<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+											<%--							</tr>--%>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -62,6 +62,18 @@
                     <!--parent.layer.msg('获取通知失败，请稍后再试！',{icon:2}) -->
                 }
             });
+            /*$.ajax({
+                type : "get",
+                async : true, //同步请求
+                url : "${ctx}/workprojectnotify/workProjectNotify/readShowCount",
+                success:function(datas){
+                    //$("#mainContent").html(dates);//要刷新的div
+                    $("#haveFinishedNotifyCount").text((datas.count)>9?"10+":(datas.count));
+                },
+                error: function() {
+                    <!--parent.layer.msg('获取通知失败，请稍后再试！',{icon:2}) -->
+                }
+            });*/
         });
         window.setInterval("requesting()",600000);
         function startRequest(){
@@ -416,6 +428,13 @@
                             <%--</li>--%>
                         </ul>
                     </li>
+                    <li class="dropdown">
+                        <a class="dropdown-toggle count-info" data-toggle="dropdown" href="javascript:void(0)" onclick='top.openTab("${ctx }/workprojectnotify/workProjectNotify/backlogListReadShow","已办任务", false)' >
+                            <%--<i class="fa fa-bell"></i>--%>
+                            <i class="fa fa-list-ul"></i>
+                            <span class="label label-danger labelInfo" id="haveFinishedNotifyCount"></span>&nbsp;已办任务
+                        </a>
+                    </li>
                     <%--<li >--%>
                         <%--<a href="javascript:void(0);" class="roll-nav roll-right J_tabExit hide"><i class="fa fa fa-cog"></i>&nbsp;&nbsp;设置</a>--%>
                     <%--</li>--%>