From abeb21fa6f672fd2ff978798dc7a56f47611ab27 Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 6 Dec 2023 13:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96,=20=E6=96=B0=E5=A2=9E=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=96=E6=B6=88=E6=97=A5=E7=BB=9F=E8=AE=A1=E6=9B=B4?= =?UTF-8?q?=E6=96=B0,=E7=BB=9F=E8=AE=A1=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=87=AA=E6=B5=8B=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cowr/ssjygl/actioncmdlog/ActionCmdLogController.java | 7 +++++-- .../com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java | 6 +++--- .../com/cowr/ssjygl/modifylog/ModifyLogController.java | 8 +++++--- .../java/com/cowr/ssjygl/modifylog/ModifyLogService.java | 5 +++-- .../local/ssjygl/transport/TransportQueryController.java | 8 +++++--- .../service/ssjygl/invoice/log/InvoiceLogController.java | 8 +++++--- .../service/ssjygl/ticket/log/TicketLogController.java | 7 +++++-- 7 files changed, 31 insertions(+), 18 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java index 15aad92..25c4a9a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java @@ -4,6 +4,9 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.jfinal.core.Controller; +import static com.cowr.common.utils.DateTimeUtil.TM_TIME; +import static com.cowr.common.utils.DateTimeUtil.now; + /** * Generated by COWR Fri Apr 17 16:59:38 CST 2020 * TableName: action_cmd_log @@ -23,8 +26,8 @@ public class ActionCmdLogController extends Controller { public void findRodLog() { PageParam pp = getBean(PageParam.class, "", true); String create_user_name = get("create_user_name"); - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); renderJson(Result.object(ActionCmdLogService.me.findRodLog(pp, create_user_name, stm, etm))); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java index e183f06..14135db 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java @@ -5,7 +5,6 @@ import com.cowr.common.Const; import com.cowr.common.enums.Enums; import com.cowr.common.view.PageParam; import com.cowr.model.ActionCmdLog; -import com.cowr.model.Sysuser; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -13,7 +12,6 @@ import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -50,7 +48,9 @@ public class ActionCmdLogService { public Page findRodLog(PageParam pp, String create_user_name, String stm, String etm) { String selectsql = "select * "; - String fromsql = "from action_cmd_log t where t.content -> '$.cmd' = 'rodUp' "; + String fromsql = "from action_cmd_log t where " + + "AND t.cmd = 'rodUp'"; +// "t.content -> '$.cmd' = 'rodUp' "; List paraList = new ArrayList<>(); if (StrKit.notBlank(create_user_name)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java index 90d3705..03dd9d9 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java @@ -3,10 +3,12 @@ package com.cowr.ssjygl.modifylog; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.ModifyLog; -import com.cowr.ssjygl.actioncmdlog.ActionCmdLogService; import com.jfinal.aop.Before; import com.jfinal.core.Controller; +import static com.cowr.common.utils.DateTimeUtil.TM_TIME; +import static com.cowr.common.utils.DateTimeUtil.now; + /** * Generated by COWR Sat Apr 04 17:23:04 CST 2020 * TableName: modify_log @@ -42,8 +44,8 @@ public class ModifyLogController extends Controller { public void findManualWeight() { PageParam pp = getBean(PageParam.class, "", true); String create_user_name = get("create_user_name"); - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); renderJson(Result.object(ModifyLogService.me.findManualWeight(pp, create_user_name, stm, etm))); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java index 49621aa..6c4eea3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java @@ -3,7 +3,6 @@ package com.cowr.ssjygl.modifylog; import com.alibaba.fastjson.JSONObject; import com.cowr.common.Const; import com.cowr.common.base.BaseModel; -import com.cowr.common.base.BaseService; import com.cowr.common.enums.Enums; import com.cowr.common.utils.StrUtil; import com.cowr.common.view.PageParam; @@ -120,9 +119,11 @@ public class ModifyLogService { } public Page findManualWeight(PageParam pp, String create_user_name, String stm, String etm) { + // t.id,t.create_user_id,t.create_user_name,t.`table`,t.pks,t.newdata,t.olddata,t.editdata,t.type,t.create_time String selectsql = "select * "; String fromsql = " from modify_log t where t.`table` = 'transport'\n" + - " and t.editdata -> '$.modify_content' = 'manualWeight'"; + " AND t.pks = 'id'" + + " AND t.editdata -> '$.modify_content' = 'manualWeight'"; List paraList = new ArrayList<>(); if (StrKit.notBlank(create_user_name)) { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java index 02db7b7..26a7a68 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java @@ -6,7 +6,6 @@ import com.cowr.common.enums.Enums; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.main.AuthInterceptor; -import com.cowr.local.ssjygl.main.Config; import com.cowr.model.Supermarket; import com.cowr.ssjygl.order.OrderSnValidator; import com.cowr.ssjygl.supermarket.SupermarketIdValidator; @@ -16,6 +15,9 @@ import com.jfinal.aop.Before; import com.jfinal.aop.Clear; import com.jfinal.kit.StrKit; +import static com.cowr.common.utils.DateTimeUtil.TM_TIME; +import static com.cowr.common.utils.DateTimeUtil.now; + /** * 出入场相关记录查询 */ @@ -32,8 +34,8 @@ public class TransportQueryController extends BaseController { PageParam pp = getBean(PageParam.class, "", true); Integer supermarket_id = getInt("supermarket_id"); String order_sn = get("order_sn"); - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); Integer trans_co_id = getInt("trans_co_id"); Integer state = getInt("state"); String truck_license = getUpperCaseVal("truck_license"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java index bc72759..8645df9 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java @@ -9,11 +9,13 @@ import com.cowr.model.Sysuser; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.invoice.log.InvoiceLogPKValidator; import com.cowr.ssjygl.invoice.log.InvoiceLogService; -import com.cowr.ssjygl.invoice.log.InvoiceLogValidator; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import org.apache.poi.ss.usermodel.Workbook; +import static com.cowr.common.utils.DateTimeUtil.TM_TIME; +import static com.cowr.common.utils.DateTimeUtil.now; + /** * Generated by COWR Thu Aug 13 23:09:29 CST 2020 * TableName: invoice_log @@ -43,8 +45,8 @@ public class InvoiceLogController extends Controller { Integer state = getInt("state"); String invoice_number = get("invoice_number"); String order_sn = get("order_sn"); - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); String code = get("code"); Integer invoice_type = getInt("invoice_type"); renderJson(Result.object(InvoiceLogService.me.find(pp, invoice_number, supermarket_id, state, order_sn, stm, etm, code, invoice_type))); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogController.java index c0ceb57..ac8e80b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogController.java @@ -13,6 +13,9 @@ import com.jfinal.aop.Before; import com.jfinal.core.Controller; import org.apache.poi.ss.usermodel.Workbook; +import static com.cowr.common.utils.DateTimeUtil.TM_TIME; +import static com.cowr.common.utils.DateTimeUtil.now; + /** * Generated by COWR Thu Aug 13 23:09:29 CST 2020 * TableName: ticket_log @@ -41,8 +44,8 @@ public class TicketLogController extends Controller { Integer supermarket_id = getInt("supermarket_id"); Integer state = getInt("state"); String order_sn = get("order_sn"); - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); + String etm = get("etm",now() + " 23:59:59"); String ticket_code = get("ticket_code"); renderJson(Result.object(TicketLogService.me.find(pp, supermarket_id, state, order_sn, stm, etm, ticket_code))); }