xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页查询接口优化, 新增订单取消日统计更新,统计历史数据自测调试

dev
徐杰盟 2023-12-06 13:57:22 +08:00
parent 6b301cefa2
commit abeb21fa6f
7 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java
View File

@ -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)));
}
}

6
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java
View File

@ -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<Record> 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<Object> paraList = new ArrayList<>();
if (StrKit.notBlank(create_user_name)) {

8
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java
View File

@ -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)));
}
}

5
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java
View File

@ -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<Record> 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<Object> paraList = new ArrayList<>();
if (StrKit.notBlank(create_user_name)) {

8
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java
View File

@ -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");

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java
View File

@ -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)));

7
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogController.java
View File

@ -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)));
}