From d9843691332acafa39bba759b9fb9e0cfc9b9127 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 01 六月 2022 16:55:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 19 +++++++++++++++++++
src/main/webapp/views/wrkMastLog/wrkDetlLog.html | 5 +----
2 files changed, 20 insertions(+), 4 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..517e54d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -33,6 +33,25 @@
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,
diff --git a/src/main/webapp/views/wrkMastLog/wrkDetlLog.html b/src/main/webapp/views/wrkMastLog/wrkDetlLog.html
index b565548..dce76b5 100644
--- a/src/main/webapp/views/wrkMastLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkMastLog/wrkDetlLog.html
@@ -36,10 +36,7 @@
<script type="text/javascript">
var pageCur;
function getCol() {
- var cols = [
- {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',width:160}
- ];
+ let cols = [];
cols.push.apply(cols, detlCols);
cols.push({field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center', hide:true}
,{field: 'seqNo', title:'搴忓彿', align: 'center', width:80, hide:true});
--
Gitblit v1.9.1