diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java index e37d6b8..e6671b7 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java @@ -78,11 +78,6 @@ public class MkmjSwipeCardRecordController { return mkmjSwipeCardRecordService.listPage(qry); } - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } @ApiOperation("详情") @GetMapping("/{id}") @@ -106,12 +101,12 @@ public class MkmjSwipeCardRecordController { mkmjSwipeCardRecordService.removeBatch(idsList); return SingleResponse.buildSuccess(); } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjSwipeCardRecordUpdateCmd mkmjSwipeCardRecordUpdateCmd) { - mkmjSwipeCardRecordService.edit(mkmjSwipeCardRecordUpdateCmd); - return SingleResponse.buildSuccess(); - } +// +// @ApiOperation("修改") +// @PutMapping("/edit") +// public SingleResponse edit(@Validated @RequestBody MkmjSwipeCardRecordUpdateCmd mkmjSwipeCardRecordUpdateCmd) { +// mkmjSwipeCardRecordService.edit(mkmjSwipeCardRecordUpdateCmd); +// return SingleResponse.buildSuccess(); +// } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java index 3a2ca46..e970714 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.persistence.repository.impl; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; import com.zcloud.primeport.persistence.mapper.MkmjSwipeCardRecordMapper; import com.zcloud.primeport.persistence.repository.MkmjSwipeCardRecordRepository; @@ -32,6 +33,8 @@ public class MkmjSwipeCardRecordRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.eq("paper_number",params.get("cardNo")); + queryWrapper.ge(Tools.notEmpty(String.valueOf(params.get("swingTimeStart"))),"swing_time", params.get("swingTimeStart")); + queryWrapper.le(Tools.notEmpty(String.valueOf(params.get("swingTimeEnd"))),"swing_time", params.get("swingTimeEnd")); queryWrapper.orderByDesc("swing_time"); IPage result = mkmjSwipeCardRecordMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords());