From 664c33a8a82fc7ba9189078037469e2efd7023f6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 七月 2025 09:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java
index 688836a..0b54f4e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java
@@ -6,14 +6,14 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
-import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.eam.service.IEamWeekInspectionDetailService;
import org.jeecg.modules.eam.util.DateUtils;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -39,10 +39,10 @@
*/
@ApiOperation(value = "鍛ㄧ偣妫�宸ュ崟鏄庣粏-鏃ョ偣妫�瑙勮寖鍒楄〃鏌ヨ", notes = "鍛ㄧ偣妫�宸ュ崟鏄庣粏-鏃ョ偣妫�瑙勮寖鍒楄〃鏌ヨ")
@GetMapping(value = "/queryStandardList")
- public Result<?> queryStandardList(@RequestParam("standardId") String standardId) {
+ public Result<?> queryStandardList(@RequestParam("standardId") String standardId, @RequestParam("inspectionDate") String inspectionDate) {
LambdaQueryWrapper<EamWeekInspectionDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EamWeekInspectionDetail::getStandardId, standardId);
- queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(), DateUtils.getLastDayOfWeek());
+ queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(inspectionDate), DateUtils.getLastDayOfWeek(inspectionDate));
queryWrapper.orderByAsc(EamWeekInspectionDetail::getItemCode);
List<EamWeekInspectionDetail> list = eamWeekInspectionDetailService.list(queryWrapper);
return Result.OK(list);
--
Gitblit v1.9.3