From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 十月 2024 20:39:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 20 ++++++ server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 2 server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 2 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 1 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 10 +++ server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java | 3 + server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 2 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 14 ++++ server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java | 2 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java | 2 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 13 ++++ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 2 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java | 2 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 12 ++++ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 11 +++ server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java | 2 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 2 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 12 ++++ admin/src/views/meeting/userStatistics.vue | 2 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 11 +++ server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 3 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 43 ++++++++----- 22 files changed, 149 insertions(+), 24 deletions(-) diff --git a/admin/src/views/meeting/userStatistics.vue b/admin/src/views/meeting/userStatistics.vue index 9d9e37f..22722a3 100644 --- a/admin/src/views/meeting/userStatistics.vue +++ b/admin/src/views/meeting/userStatistics.vue @@ -166,7 +166,7 @@ userList({ page: 1, capacity: 9999, - model: { realname: this.filterText }, + model: { realname: this.filterText, companyType: 1 }, }) .then(res => { console.log('userList', res); diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java index b2e49ca..045ba54 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java @@ -98,6 +98,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:bookings:query") public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(bookingsService.findPage(pageWrap)); } @@ -105,6 +106,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:bookings:exportExcel") public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response); } diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java index db0499c..19d048f 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java @@ -471,6 +471,26 @@ queryWrapper.orderByDesc(Bookings::getCreateDate); queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO); + //鏁版嵁鏉冮檺寮�濮�--------------------start---------------- + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙湅鑷繁 + queryWrapper.and(wrapper ->{ + wrapper.eq(Bookings::getCreator,userInfo.getId()) + .or().exists("select rel.id from meeting_user_rel rel where rel.OBJ_TYPE=0 and rel.obj_id=t.id and rel.isdeleted=0 and rel.user_id="+userInfo.getId()); + }); + queryWrapper.eq(Bookings::getCreator,userInfo.getId()); + }else{ + //鏉冮檺鑼冨洿鍐� + queryWrapper.and(wrapper ->{ + wrapper.in(SystemUser::getCompanyId ,userInfo.getCompanyIdList()) + .or().exists("select rel.id from meeting_user_rel rel where rel.OBJ_TYPE=0 and rel.obj_id=t.id and rel.isdeleted=0 and rel.user_id="+userInfo.getId()); + }); + } + } + //鏁版嵁鏉冮檺寮�濮�--------------------end---------------- + queryWrapper.eq(pageWrap.getModel().getRoomId() != null, Bookings::getRoomId, pageWrap.getModel().getRoomId()); queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName()); queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus()); diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java index c3333cc..ffefc01 100644 --- a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java +++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java @@ -49,7 +49,7 @@ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍙告満 锛� 2=鍐呴儴浜哄憳" ,hidden = true) private Integer memberType; - @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍔冲姟锛�1=鍐呴儴" ,hidden = true) + @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鐩稿叧鏂癸紱1=鍐呴儴" ,hidden = true) private Integer companyType; diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java index 881133f..575fb48 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java @@ -71,6 +71,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:carusebook:query") public ApiResponse<PageData<CarUseBook>> findPage (@RequestBody PageWrap<CarUseBook> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(carUseBookService.findPage(pageWrap)); } @@ -78,6 +79,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:carusebook:exportExcel") public void exportExcel (@RequestBody PageWrap<CarUseBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�", response); } diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java index ae392f1..d0b260c 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java @@ -83,6 +83,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:cars:query") public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(carsService.findPage(pageWrap)); } @@ -91,6 +92,7 @@ @PostMapping("/list") @CloudRequiredPermission("business:cars:query") public ApiResponse<List<Cars>> findList (@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + cars.setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(carsService.findList(cars)); } @@ -98,6 +100,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:cars:exportExcel") public void exportExcel (@RequestBody PageWrap<Cars> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Cars.class).export(carsService.findPage(pageWrap).getRecords(), "杞﹁締淇℃伅琛�", response); } diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java index c46649f..d860b74 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java @@ -71,6 +71,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:empower:query") public ApiResponse<PageData<Empower>> findPage (@RequestBody PageWrap<Empower> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(empowerService.findPage(pageWrap)); } @@ -78,6 +79,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:empower:exportExcel") public void exportExcel (@RequestBody PageWrap<Empower> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "鎺堟潈璁板綍", response); } diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java index 6c0dcb7..a4960d6 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java @@ -67,6 +67,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:hiddendanger:query") public ApiResponse<PageData<HiddenDanger>> findPage (@RequestBody PageWrap<HiddenDanger> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(hiddenDangerService.findPage(pageWrap)); } @@ -74,6 +75,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:hiddendanger:exportExcel") public void exportExcel (@RequestBody PageWrap<HiddenDanger> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(HiddenDanger.class).export(hiddenDangerService.findPage(pageWrap).getRecords(), "闅愭偅淇℃伅琛�", response); } diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java index 7343cc6..8d65a14 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java @@ -293,6 +293,7 @@ if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){ return ApiResponse.success(memberService.findVisitPage(pageWrap)); }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(memberService.findMemberInfoPage(pageWrap)); }else { return ApiResponse.success(null); diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java index 3b28614..dd401ae 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java @@ -90,6 +90,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:parkbook:query") public ApiResponse<PageData<ParkBook>> findPage (@RequestBody PageWrap<ParkBook> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(parkBookService.findPage(pageWrap)); } @@ -97,6 +98,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:parkbook:exportExcel") public void exportExcel (@RequestBody PageWrap<ParkBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(ParkBook.class).export(parkBookService.findPage(pageWrap).getRecords(), "杞﹁締棰勭害璁板綍淇℃伅琛�", response); } diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java index 078c0d8..d09f453 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java @@ -72,6 +72,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:visitor:query") public ApiResponse<PageData<Visitor>> findPage (@RequestBody PageWrap<Visitor> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(visitorService.findPage(pageWrap)); } @@ -79,6 +80,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:visitor:exportExcel") public void exportExcel (@RequestBody PageWrap<Visitor> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Visitor.class).export(visitorService.findPage(pageWrap).getRecords(), "璁垮淇℃伅琛�", response); } diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java index 1178e83..3ed8c63 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java @@ -99,6 +99,7 @@ @CloudRequiredPermission("business:visits:query") public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ // pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(visitsService.findPage(pageWrap)); } @@ -106,6 +107,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:visits:exportExcel") public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Visits.class).export(visitsService.findPage(pageWrap).getRecords(), "璁垮鐢宠淇℃伅琛�", response); } diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java index 39a3028..dcd9bf8 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java @@ -1,6 +1,7 @@ package com.doumee.dao.admin.request; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; @@ -14,7 +15,7 @@ */ @Data @ApiModel("浜哄憳鏌ヨ 鍙傛暟") -public class MemberQuery implements Serializable { +public class MemberQuery extends LoginUserModel implements Serializable { @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿") private String keyword; diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java index 0f9ed9a..a864f48 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java @@ -27,93 +27,100 @@ @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") - @ExcelColumn(name="涓婚敭") +// @ExcelColumn(name="涓婚敭") private Integer id; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") - @ExcelColumn(name="鍒涘缓浜虹紪鐮�") +// @ExcelColumn(name="鍒涘缓浜虹紪鐮�") private Integer creator; @ApiModelProperty(value = "鍒涘缓鏃堕棿") - @ExcelColumn(name="鍒涘缓鏃堕棿") +// @ExcelColumn(name="鍒涘缓鏃堕棿") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") - @ExcelColumn(name="鏇存柊浜虹紪鐮�") +// @ExcelColumn(name="鏇存柊浜虹紪鐮�") private Integer editor; @ApiModelProperty(value = "鏇存柊鏃堕棿") - @ExcelColumn(name="鏇存柊鏃堕棿") +// @ExcelColumn(name="鏇存柊鏃堕棿") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") - @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") +// @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; @ApiModelProperty(value = "澶囨敞") - @ExcelColumn(name="澶囨敞") +// @ExcelColumn(name="澶囨敞") private String remark; @ApiModelProperty(value = "闅愭偅鍖哄煙缂栫爜锛堝叧鑱攈idden_danger_param)", example = "1") - @ExcelColumn(name="闅愭偅鍖哄煙缂栫爜锛堝叧鑱攈idden_danger_param)") +// @ExcelColumn(name="闅愭偅鍖哄煙缂栫爜锛堝叧鑱攈idden_danger_param)") private Integer areaId; @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插鐞� 2涓嶅鐞�", example = "1") - @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插鐞� 2涓嶅鐞�") + @ExcelColumn(name="澶勭悊缁撴灉" ,valueMapping ="0=0寰呭鐞�;1=宸插鐞�;2=涓嶅鐞�;",index = 6) private Integer status; @ApiModelProperty(value = "鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)", example = "1") - @ExcelColumn(name="鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)") +// @ExcelColumn(name="鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)") private Integer applyCheckUserId; @ApiModelProperty(value = "闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)", example = "1") - @ExcelColumn(name="闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)") +// @ExcelColumn(name="闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)") private Integer cateId; @ApiModelProperty(value = "鎯呭喌璇存槑") - @ExcelColumn(name="鎯呭喌璇存槑") +// @ExcelColumn(name="鎯呭喌璇存槑") private String content; @ApiModelProperty(value = "鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�", example = "1") - @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") +// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") private Integer memberId; @ApiModelProperty(value = "澶勭悊鏃堕棿") - @ExcelColumn(name="澶勭悊鏃堕棿") +// @ExcelColumn(name="澶勭悊鏃堕棿") private Date checkDate; @ApiModelProperty(value = "澶勭悊璇存槑") - @ExcelColumn(name="澶勭悊璇存槑") +// @ExcelColumn(name="澶勭悊璇存槑") private String checkInfo; @ApiModelProperty(value = "澶勭悊浜虹紪鐮侊紙鍏宠仈member)", example = "1") - @ExcelColumn(name="澶勭悊浜虹紪鐮侊紙鍏宠仈member)") +// @ExcelColumn(name="澶勭悊浜虹紪鐮侊紙鍏宠仈member)") private Integer checkUserId; @ApiModelProperty(value = "鍖哄煙鍚嶇О") - @ExcelColumn(name="鍖哄煙鍚嶇О") + @ExcelColumn(name="闅愭偅鍖哄煙",index = 1) private String areaName; @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1") @TableField(exist = false) + @ExcelColumn(name="鎻愭姤浜哄鍚�",index = 3) private String memberName; @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1") @TableField(exist = false) + @ExcelColumn(name="鎵�灞炵粍缁�",index = 4) private String companyName; @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1") @TableField(exist = false) +// @ExcelColumn(name="鐢宠浜烘墜鏈哄彿") private String memberPhone; @ApiModelProperty(value = "澶勭悊浜哄鍚�", example = "1") @TableField(exist = false) +// @ExcelColumn(name="澶勭悊浜哄鍚�") private String checkorName; @ApiModelProperty(value = "澶勭悊浜烘墍灞炵粍缁囧悕绉�", example = "1") @TableField(exist = false) +// @ExcelColumn(name="澶勭悊浜烘墍灞炵粍缁囧悕绉�") private String checkorCompanyName; @ApiModelProperty(value = "澶勭悊浜烘墜鏈哄彿", example = "1") @TableField(exist = false) +// @ExcelColumn(name="澶勭悊浜烘墜鏈哄彿") private String checkorPhone; @ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1") @TableField(exist = false) + @ExcelColumn(name="闅愭偅绫诲瀷",index = 2) private String categoryName; @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50") @@ -134,10 +141,12 @@ @ApiModelProperty(value = "鎻愭姤鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelColumn(name="鎻愭姤鏃堕棿",index = 5) private Date submitTime; @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelColumn(name="澶勭悊鏃堕棿",index = 7) private Date dealTime; @ApiModelProperty(value = "闄勪欢淇℃伅") diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java index 2c53046..7d1f53c 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java @@ -1165,7 +1165,7 @@ .last(" limit 1") ); if(Objects.isNull(approve)){ - throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒鏁版嵁"); + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠宸茶浠栦汉瀹℃壒"); } if(!approve.getStatus().equals(Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒璁板綍鐘舵�侀敊璇�!"); diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java index 5c44198..1ba80f2 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java @@ -250,7 +250,18 @@ queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName); queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId) - .leftJoin("company t4 on t1.company_id=t4.id"); + .leftJoin("company t4 on t1.company_id=t4.id"); //鏁版嵁鏉冮檺寮�濮�--------------------start---------------- + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸� + queryWrapper.eq(CarUseBook::getCreator,userInfo.getId()); + }else{ + queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList()); + } + } + //鏁版嵁鏉冮檺寮�濮�--------------------end---------------- + queryWrapper .eq(pageWrap.getModel().getId() != null, CarUseBook::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, CarUseBook::getCreator, pageWrap.getModel().getCreator()) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java index 2d61cee..dc2a845 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java @@ -300,6 +300,18 @@ queryWrapper.eq(pageWrap.getModel().getType()!=null,Cars::getType,pageWrap.getModel().getType()); queryWrapper.eq(pageWrap.getModel().getAuthStatus()!=null,Cars::getAuthStatus,pageWrap.getModel().getAuthStatus()); queryWrapper.orderByDesc(Cars::getCreateDate); + //鏁版嵁鏉冮檺寮�濮�--------------------start---------------- + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸�(鎷滆浜猴級 + queryWrapper.eq(Cars::getMemberId,userInfo.getMemberId()); + }else{ + queryWrapper.in(Cars::getGroupId ,userInfo.getCompanyIdList()); + } + } + //鏁版嵁鏉冮檺寮�濮�--------------------end---------------- + IPage<Cars> result = carJoinMapper.selectJoinPage(page, Cars.class,queryWrapper); if(result!=null && result.getRecords()!=null && result.getRecords().size()>0){ List<String> codes = new ArrayList<>(); diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java index e09145c..980ba2e 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java @@ -1,5 +1,6 @@ package com.doumee.service.business.impl; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -114,7 +115,15 @@ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Empower::getCreator); queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId); - + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸� + queryWrapper.eq(Member::getId,userInfo.getMemberId()); + }else{ + queryWrapper.in(Company::getId,userInfo.getCompanyIdList()); + } + } queryWrapper /* .eq(Empower::getIsdeleted, Constants.ZERO)*/ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java index ecf0723..474604d 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java @@ -8,6 +8,7 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -322,6 +323,19 @@ .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId) .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId) .leftJoin("company t4 on t1.company_id=t4.id"); + + //鏁版嵁鏉冮檺寮�濮�--------------------start---------------- + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸� + queryWrapper.eq(HiddenDanger::getCreator,userInfo.getId()); + }else{ + queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList()); + } + } + //鏁版嵁鏉冮檺寮�濮�--------------------end---------------- queryWrapper .eq(pageWrap.getModel().getId() != null, HiddenDanger::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, HiddenDanger::getCreator, pageWrap.getModel().getCreator()) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java index c6875d3..541925d 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java @@ -1379,6 +1379,15 @@ queryWrapper.selectAs(Position::getName,Member::getPositionName); queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId); queryWrapper.eq(Member::getType,pageWrap.getModel().getType()); + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸� + queryWrapper.eq(Member::getId,userInfo.getMemberId()); + }else{ + queryWrapper.in(Company::getId,userInfo.getCompanyIdList()); + } + } // queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId()) queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0, Member::getCompanyId,pageWrap.getModel().getCompanyIds()) @@ -1733,6 +1742,7 @@ .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName()) .eq(Member::getIsdeleted,Constants.ZERO) .eq(Member::getStatus,Constants.ZERO) + .eq(Member::getWorkStatus,Constants.ZERO) .eq(Member::getCanVisit,Constants.ONE) .eq(Member::getType,Constants.memberType.internal) ); diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java index 40f01f6..c11c859 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java @@ -254,7 +254,16 @@ queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId); queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); - + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸� + queryWrapper.eq(Member::getId,userInfo.getMemberId()); + }else{ + queryWrapper.in(Company::getId,userInfo.getCompanyIdList()); + } + } + //鏁版嵁鏉冮檺寮�濮�--------------------end---------------- queryWrapper // .eq(ParkBook::getIsdeleted, Constants.ZERO) .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName()) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index cad0a48..6ed3d47 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -1228,6 +1228,18 @@ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); + //鏁版嵁鏉冮檺寮�濮�--------------------start---------------- + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸�(鎷滆浜猴級 + queryWrapper.eq(Member::getId,userInfo.getMemberId()); + }else{ + queryWrapper.in(Company::getId ,userInfo.getCompanyIdList()); + } + } + //鏁版嵁鏉冮檺寮�濮�--------------------end---------------- + queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO); queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType())&&Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,pageWrap.getModel().getType()); queryWrapper.ne(Objects.nonNull(pageWrap.getModel().getType())&&!Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,Constants.TWO); -- Gitblit v1.9.3