Browse Source

修改出入记录

DESKTOP-USV654P\pc 1 year ago
parent
commit
9ac8fe378f

+ 1 - 0
src/main/java/com/xjrsoft/common/interceptor/MagicApiRequestInterceptor.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.exception.NotPermissionException;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.strategy.SaStrategy;
+import com.github.xiaoymin.knife4j.core.util.CommonUtils;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.ResponseCode;
 import com.xjrsoft.common.model.result.R;

+ 3 - 2
src/main/java/com/xjrsoft/module/personnel/controller/FaceIdentifyRecordsController.java

@@ -69,8 +69,9 @@ public class FaceIdentifyRecordsController {
         }
         MPJLambdaWrapper<FaceIdentifyRecords> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                .innerJoin(FaceManagement.class,FaceManagement::getFaceCode,FaceIdentifyRecords::getFaceCode)
-                .eq(FaceManagement::getUserId,dto.getUserId())
+                .innerJoin(FaceManagement.class, FaceManagement::getFaceCode, FaceIdentifyRecords::getFaceCode)
+                .eq(FaceManagement::getUserId, dto.getUserId())
+                .eq(ObjectUtil.isNotEmpty(dto.getInoutDirection()) && dto.getInoutDirection() > 0, FaceIdentifyRecords::getInoutDirection, dto.getInoutDirection())
                 .select(FaceIdentifyRecords.class, x -> VoToColumnUtil.fieldsToColumns(FaceIdentifyRecordsVo.class).contains(x.getProperty()))
                 .orderByDesc(FaceIdentifyRecords::getVerifyTime);
 

+ 3 - 0
src/main/java/com/xjrsoft/module/personnel/dto/FaceIdentifyRecordsPageUserDto.java

@@ -12,4 +12,7 @@ public class FaceIdentifyRecordsPageUserDto extends PageInput {
      */
     @ApiModelProperty("用户编号(如果不传,默认当前用户)")
     private Long userId;
+
+    @ApiModelProperty("出入类型")
+    private  Long inoutDirection;
 }