From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java |   85 ++++++++++++++++++++++++++++++++----------
 1 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 831135c..1106f24 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -33,27 +33,72 @@
         return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
     }
 
+    /**
+     * 鏍规嵁宸ヤ綔涓绘。鏌ョ湅鏄庣粏鏃讹紝宸ヤ綔鍙疯繃婊ゆ槑缁�
+     */
+    @RequestMapping(value = "/wrkDetlLogByMast/list/auth")
+    @ManagerAuth
+    public R list1(@RequestParam(defaultValue = "1") Integer curr,
+                   @RequestParam(defaultValue = "10") Integer limit,
+                   @RequestParam Integer wrk_no,
+                   @RequestParam String ioTime) {
+        EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+        if (!Cools.isEmpty(wrk_no) && wrk_no != 0) {
+            wrapper.eq("wrk_no", wrk_no);
+        }
+        if (!Cools.isEmpty(ioTime)) {
+            wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
+        }
+        return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
     @RequestMapping(value = "/wrkDetlLog/list/auth")
     @ManagerAuth
-    public R list(@RequestParam(defaultValue = "1")Integer curr,
-                  @RequestParam(defaultValue = "10")Integer limit,
-                  @RequestParam(required = false)String orderByField,
-                  @RequestParam(required = false)String orderByType,
-                  @RequestParam Map<String, Object> param){
+    public R list(@RequestParam(defaultValue = "1") Integer curr,
+                  @RequestParam(defaultValue = "10") Integer limit,
+                  @RequestParam(required = false) String orderByField,
+                  @RequestParam(required = false) String orderByType,
+                  @RequestParam Map<String, Object> param) {
         EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-        else {
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        } else {
             wrapper.orderBy("modi_time", false);
         }
         return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
-    private void convert(Map<String, Object> map, EntityWrapper wrapper){
-        for (Map.Entry<String, Object> entry : map.entrySet()){
+    //    12.12鏂板锛屽伐浣滄槑缁嗗巻鍙叉。杩囨护鎵嬪姩鍙栨秷鐨勫伐浣滄槑缁�
+    @RequestMapping(value = "/wrkDetlLogs/list/auth")
+    @ManagerAuth
+    public R listWrkDetlLogs(@RequestParam(defaultValue = "1") Integer curr,
+                             @RequestParam(defaultValue = "10") Integer limit,
+                             @RequestParam(required = false) String orderByField,
+                             @RequestParam(required = false) String orderByType,
+                             @RequestParam(required = false) String condition,
+                             @RequestParam Map<String, Object> param) {
+        try {
+            excludeTrash(param);
+            EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+            convert(param, wrapper);
+            allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
+            if (!Cools.isEmpty(orderByField)) {
+                wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+            } else {
+                wrapper.orderBy("appe_time", false);
+            }
+            return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+        } catch (Exception e) {
+            return R.error("寮傚父" + e);
+        }
+    }
+
+    private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
             String val = String.valueOf(entry.getValue());
-            if (val.contains(RANGE_TIME_LINK)){
+            if (val.contains(RANGE_TIME_LINK)) {
                 String[] dates = val.split(RANGE_TIME_LINK);
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -70,10 +115,10 @@
         return R.ok();
     }
 
-	@RequestMapping(value = "/wrkDetlLog/update/auth")
-	@ManagerAuth
-    public R update(WrkDetlLog wrkDetlLog){
-        if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getWrkNo()){
+    @RequestMapping(value = "/wrkDetlLog/update/auth")
+    @ManagerAuth
+    public R update(WrkDetlLog wrkDetlLog) {
+        if (Cools.isEmpty(wrkDetlLog) || null == wrkDetlLog.getWrkNo()) {
             return R.error();
         }
         wrkDetlLogService.updateById(wrkDetlLog);
@@ -82,12 +127,12 @@
 
     @RequestMapping(value = "/wrkDetlLog/delete/auth")
     @ManagerAuth
-    public R delete(@RequestParam String param){
+    public R delete(@RequestParam String param) {
         List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
-        if (Cools.isEmpty(list)){
+        if (Cools.isEmpty(list)) {
             return R.error();
         }
-        for (WrkDetlLog entity : list){
+        for (WrkDetlLog entity : list) {
             wrkDetlLogService.delete(new EntityWrapper<>(entity));
         }
         return R.ok();
@@ -95,7 +140,7 @@
 
     @RequestMapping(value = "/wrkDetlLog/export/auth")
     @ManagerAuth
-    public R export(@RequestBody JSONObject param){
+    public R export(@RequestBody JSONObject param) {
         EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetlLog"));
@@ -111,7 +156,7 @@
         wrapper.like("id", condition);
         Page<WrkDetlLog> page = wrkDetlLogService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
-        for (WrkDetlLog wrkDetlLog : page.getRecords()){
+        for (WrkDetlLog wrkDetlLog : page.getRecords()) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", wrkDetlLog.getWrkNo());
             map.put("value", wrkDetlLog.getWrkNo());
@@ -124,7 +169,7 @@
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
         Wrapper<WrkDetlLog> wrapper = new EntityWrapper<WrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != wrkDetlLogService.selectOne(wrapper)){
+        if (null != wrkDetlLogService.selectOne(wrapper)) {
             return R.parse(BaseRes.REPEAT).add(getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
         }
         return R.ok();

--
Gitblit v1.9.1