From 516a6fabac1eca611a8bbd0b79bdde3f0d39e843 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 01 十二月 2023 10:23:50 +0800
Subject: [PATCH] bom反馈附件路径逻辑更新
---
src/main/java/com/whyc/controller/ProductLockLogController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductLockLogController.java b/src/main/java/com/whyc/controller/ProductLockLogController.java
index 8211f0d..3292f8c 100644
--- a/src/main/java/com/whyc/controller/ProductLockLogController.java
+++ b/src/main/java/com/whyc/controller/ProductLockLogController.java
@@ -3,6 +3,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.ProductLockLog;
import com.whyc.service.ProductLockLogService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +12,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
+import java.util.Date;
import java.util.List;
@Api(tags = "浜у搧閿佸畾鏃ュ織")
@@ -22,10 +25,24 @@
private ProductLockLogService service;
@ApiOperation("鏌ヨ鍒楄〃-鏍规嵁姣嶆枡缂栫爜鍜屽畾鍒惰〃鍗曞彿")
- @GetMapping
+ @GetMapping("listByParentCodeAndCustomCode")
public Response getListByParentCodeAndCustomCode(@RequestParam String parentCode,@RequestParam String customCode){
List<ProductLockLog> lockLogList = service.getListByParentCodeAndCustomCode(parentCode,customCode);
return new Response().set(1,lockLogList);
}
+ @ApiOperation("鏌ヨ鍒楄〃-鏌ヨ鐢ㄦ埛鐨勮В閿佹搷浣�")
+ @GetMapping("getUnlockByOwner")
+ public Response getUnlockByOwner( @RequestParam String createTime, @RequestParam String createTime1,@RequestParam int pageCurr,@RequestParam int pageSize ){
+ Date testTime1= null;
+ Date testTime2= null;
+ try {
+ testTime1 = ActionUtil.sdfwithALL.parse(createTime);
+ testTime2 = ActionUtil.sdfwithALL.parse(createTime1);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return service.getUnlockByOwner(testTime1,testTime2,pageCurr,pageSize);
+ }
+
}
--
Gitblit v1.9.1