From 6fda8745fe9266f00b3310b1034b1480e43bbc42 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Thu, 23 Apr 2026 09:39:18 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=8E=A5=E5=85=A5=E5=A4=A7?= =?UTF-8?q?=E5=8D=8E=E4=B8=80=E7=BA=A7=E5=8F=A3=E9=97=A8=E8=BF=9B=E5=87=BA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/MkmjSwipeCardRecordController.java | 19 +++++++------------ .../MkmjSwipeCardRecordRepositoryImpl.java | 3 +++ 2 files changed, 10 insertions(+), 12 deletions(-) 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());