feat(wms/attendance): 将考勤查询列表接口改为POST请求并支持员工ID集合筛选
在WmsAttendanceCheckBo中新增userIds字段用于接收员工ID集合查询条件。将WmsAttendanceCheckController的/list接口从GET改为POST,并添加@RequestBody注解以支持JSON参数传递。在WmsAttendanceCheckServiceImpl的查询条件构建中增加对userIds字段的筛选逻辑,实现按指定员工范围查询考勤数据。
This commit is contained in:
@@ -34,8 +34,8 @@ public class WmsAttendanceCheckController extends BaseController {
|
|||||||
|
|
||||||
private final IWmsAttendanceCheckService iWmsAttendanceCheckService;
|
private final IWmsAttendanceCheckService iWmsAttendanceCheckService;
|
||||||
|
|
||||||
@GetMapping("/list")
|
@PostMapping("/list")
|
||||||
public TableDataInfo<WmsAttendanceCheckVo> list(WmsAttendanceCheckBo bo, PageQuery pageQuery) {
|
public TableDataInfo<WmsAttendanceCheckVo> list(@RequestBody WmsAttendanceCheckBo bo, PageQuery pageQuery) {
|
||||||
return iWmsAttendanceCheckService.queryPageList(bo, pageQuery);
|
return iWmsAttendanceCheckService.queryPageList(bo, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
|
|||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@@ -41,4 +42,6 @@ public class WmsAttendanceCheckBo extends BaseEntity {
|
|||||||
private BigDecimal totalDeduct;
|
private BigDecimal totalDeduct;
|
||||||
private String overallStatus;
|
private String overallStatus;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
List<Long> userIds;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
|
|||||||
lqw.eq(bo.getShiftId() != null, WmsAttendanceCheck::getShiftId, bo.getShiftId());
|
lqw.eq(bo.getShiftId() != null, WmsAttendanceCheck::getShiftId, bo.getShiftId());
|
||||||
lqw.ge(bo.getStartDate() != null, WmsAttendanceCheck::getWorkDate, bo.getStartDate());
|
lqw.ge(bo.getStartDate() != null, WmsAttendanceCheck::getWorkDate, bo.getStartDate());
|
||||||
lqw.le(bo.getEndDate() != null, WmsAttendanceCheck::getWorkDate, bo.getEndDate());
|
lqw.le(bo.getEndDate() != null, WmsAttendanceCheck::getWorkDate, bo.getEndDate());
|
||||||
|
lqw.in(bo.getUserIds() != null, WmsAttendanceCheck::getUserId, bo.getUserIds());
|
||||||
lqw.orderByDesc(WmsAttendanceCheck::getWorkDate);
|
lqw.orderByDesc(WmsAttendanceCheck::getWorkDate);
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user