酒测未通过审核

liujun001
1 parent 09e06927
Showing 6 changed files with 48 additions and 0 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/service/driver/NewDriverService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/exception/report/EquipmentExceptionReportServiceImpl.java
@@ -54,6 +54,25 @@ public class EquipmentExceptionReportController extends BaseController {
     @ApiOperation("分页查询-用于对外")
     @PostMapping(value = "/list/limit/contact/{page}/{pageLimit}")
     public IPage<EquipmentExceptionReportVO> listLimitOfContact(@RequestBody EquipmentExceptionReportQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+        if (!Objects.equals("1", request.getSupperAuh())) {
+            Set<String> driverJobs = new HashSet<>();
+            NewDriver driver = driverService.getOneByPhone(request.getTelPhone());
+            if (Objects.isNull(driver)) {
+                logger.error("没有查到用户信息:[{}]", request);
+                return null;
+            }
+            NewDriver d1 = new NewDriver();
+            d1.setFleetName(driver.getFleetName());
+            List<NewDriver> drivers1 = driverService.list(d1);
+            if (CollectionUtils.isEmpty(drivers1)) {
+                logger.error("该车队没有人员:[{}],[{}]", request, d1);
+            }
+
+            driverJobs = drivers1.stream().map(NewDriver::getJobCode).collect(Collectors.toSet());
+            request.setDriverJobs(driverJobs);
+        }
+
+
         IPage<EquipmentExceptionReportVO> voiPage = listLimit(request, orderEntity, page, pageLimit, model);
         if (Objects.nonNull(voiPage) && CollectionUtils.isNotEmpty(voiPage.getRecords())) {
             Set<String> jobs = voiPage.getRecords().stream().map(EquipmentExceptionReportVO::getJobCode).collect(Collectors.toSet());
 package com.ruoyi.domain.sign.in.exception.report;
  
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
  
+import java.util.Collection;
 import java.util.Date;
  
  
@@ -132,6 +134,9 @@ public class EquipmentExceptionReport {
     @Excel(name = "签到ID")
     private java.lang.Long signId;
  
+    @TableField(exist = false)
+    private Collection<String> driverJobs;
+
  
     @Override
     public String toString() {
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
  
+import java.util.Collection;
+
 @Data
 @ApiModel(value = "打卡异常上报表的查询DTO")
 @Accessors(chain = true)
@@ -82,6 +84,12 @@ public class EquipmentExceptionReportQueryDTO implements java.io.Serializable {
     /***签到ID*/
     @ApiModelProperty(value="签到ID",example ="1")
     private java.lang.Long signId;
+    @ApiModelProperty(value = "登陆人员的手机号码")
+    private String telPhone;
+    @ApiModelProperty(value = "超级权限用户")
+    private String supperAuh;
+    @ApiModelProperty(value = "需要查询的工号集合")
+    private Collection<String> driverJobs;
  
  
     public void clearStrEmpty() {
@@ -51,6 +51,7 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
     NewDriver getOne(NewDriver entity);
  
     NewDriver getOne(String jobCode);
+    NewDriver getOneByPhone(String phone);
  
     Integer countId(NewDriver entity);
  
@@ -170,6 +170,13 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     }
  
     @Override
+    public NewDriver getOneByPhone(String phone) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(NewDriver::getTelphone, phone);
+        return getOne(wrapper);
+    }
+
+    @Override
     public Integer countId(NewDriver entity) {
         LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(NewDriver::getJobCode);
@@ -10,6 +10,7 @@ import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.mapper.sign.in.exception.report.EquipmentExceptionReportMapper;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
@@ -30,12 +31,19 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
     public IPage<EquipmentExceptionReport> pageList(Page<EquipmentExceptionReport> page, EquipmentExceptionReport entity, OrderEntity orderEntity) {
         LambdaQueryWrapper<EquipmentExceptionReport> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(EquipmentExceptionReport::getId);
+        if(CollectionUtils.isNotEmpty(entity.getDriverJobs())){
+            countWrapper.in(EquipmentExceptionReport::getJobCode,entity.getDriverJobs());
+        }
         int count = count(countWrapper);
  
         List<EquipmentExceptionReport> lists = Collections.emptyList();
         if (count > 0) {
             PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
             LambdaQueryWrapper<EquipmentExceptionReport> selectWrapper = new LambdaQueryWrapper<>(entity);
+            if(CollectionUtils.isNotEmpty(entity.getDriverJobs())){
+                selectWrapper.in(EquipmentExceptionReport::getJobCode,entity.getDriverJobs());
+            }
+
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }