Merge remote-tracking branch 'origin/master'

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

@@ -460,15 +460,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);
+        }
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -1002,15 +1010,23 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportDataTwo.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("processInstanceId",projectReportDataTwo.getProcessInstanceId());
         model.addAttribute("projectReportData",projectReportData);
         model.addAttribute("projectReportDataTwo",projectReportDataTwo);

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -1031,4 +1031,22 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         }
         return excels;
     }
+
+    public Page<WorkStaffBasicInfo> findQualificationsPage(Page<WorkStaffBasicInfo> page, WorkStaffBasicInfo workStaffBasicInfo) {
+//        if(!UserUtils.getUser().isAdmin()) {
+//            String dataScopeSql = dataScopeFilterOR(workStaffBasicInfo.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_STAFFBASICINFO.getValue());
+//            workStaffBasicInfo.getSqlMap().put("dsf", dataScopeSql);
+//            if(workStaffBasicInfo.getCurrentUser().getBranchOffice()==null){
+//                workStaffBasicInfo.getCurrentUser().setBranchOffice(workStaffBasicInfo.getCurrentUser().getCompany());
+//            }
+//        }
+//        if(null!= workStaffBasicInfo.getOffice() && StringUtils.isNotBlank(workStaffBasicInfo.getOffice().getId())){
+//            //查询该选择节点下所有的部门Id
+//            List<String> officeIdList = officeService.getChildrenOffice(workStaffBasicInfo.getOffice().getId());
+//            officeIdList.add(workStaffBasicInfo.getOffice().getId());
+//            workStaffBasicInfo.setOfficeIdList(officeIdList);
+//        }
+        return super.findPage(page, workStaffBasicInfo);
+    }
+
 }

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -902,4 +902,24 @@ public class WorkStaffBasicInfoController extends BaseController {
 		model.addAttribute("page", page);
 		return "modules/workstaff/workAddressBookList";
 	}
+
+	/**
+	 * 人员资质 导出excel文件
+	 * 无需数据权限
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:export")
+	@RequestMapping(value = "exportQualifications", method=RequestMethod.POST)
+	public String exportQualifications(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+		try {
+			String fileName = "员工信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+			Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findQualificationsPage(new Page<WorkStaffBasicInfo>(request, response, -1), workStaffBasicInfo);
+			List<WorkStaffBasicInfoExcel> excelData=workStaffBasicInfoService.getExcelData(page);
+			new ExportExcel("员工信息", WorkStaffBasicInfoExcel.class).setDataList(excelData).write(response, fileName).dispose();
+			addMessage(redirectAttributes, "导出员工信息记录成功！");
+			return null;
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "导出员工信息记录失败！失败信息："+e.getMessage());
+		}
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
+	}
 }

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -174,9 +174,9 @@
 			<if test="company != null and company.id != null and company.id != ''">
 				AND a.company_id = #{company.id}
 			</if>
-			<!--<if test="office != null and office.id != null and office.id != ''">
+			<if test="office != null and office.id != null and office.id != ''">
 				AND a.office_id = #{office.id}
-			</if>-->
+			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -711,17 +711,16 @@
 				<div class="nav-btns">
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
-						<button style="float: right" class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
-						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:reportedDownload">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('上报信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadReportedForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 上报信息导出</a></div>
+						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:export">
+							<table:exportExcel url="${ctx}/ruralProject/ruralProjectMessageAll/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:recordDownload">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('归档信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadRecordForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 归档信息导出</a></div>
+							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('归档信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadRecordForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 归档信息导出</a>
 						</shiro:hasPermission>
-						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:export">
-							<table:exportExcel url="${ctx}/ruralProject/ruralProjectMessageAll/export"></table:exportExcel><!-- 导出按钮 -->
+						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:reportedDownload">
+							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('上报信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadReportedForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 上报信息导出</a>
 						</shiro:hasPermission>
-
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
 						<div style="float: right;margin-right: 30px;">

src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -183,15 +183,11 @@
             <div class="contentShadow layui-form contentDetails">
                 <div class="nav-btns">
                     <div class="layui-btn-group">
+                        <shiro:hasPermission name="workstaff:workStaffBasicInfo:export">
+                            <table:exportExcel url="${ctx}/workstaff/workStaffBasicInfo/exportQualifications"></table:exportExcel><!-- 导出按钮 -->
+                        </shiro:hasPermission>
                         <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
                     </div>
-<%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">--%>
-<%--                        <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->--%>
-<%--                    </shiro:hasPermission>--%>
-<%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">--%>
-<%--                        <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->--%>
-<%--                    </shiro:hasPermission>--%>
-<%--                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
                     <div style="clear: both;"></div>
                 </div>
                 <table class="oa-table layui-table" id="contentTable" lay-filter="tableEvent"></table>