From b3760efa1d2150c3607fa07f404a93cfd0ebbe22 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Fri, 18 Jul 2025 14:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=9C=9F=E5=9C=BA=E7=A0=82=E7=AB=99?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/ordertemp/OrderTempService.java | 4 +-- .../TicketInvalidVerifyService.java | 11 +++++--- ...SupermarketSandfarmDistanceController.java | 2 +- ...upermarketSandfarmDistanceSyncService.java | 25 +++++++++++++++++-- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index ab04458..a868d82 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -120,8 +120,8 @@ public class OrderTempService extends BaseService { ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + ", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" + - ", p.arrive_time, p.type, p.memo transport_memo, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name \n" + - ", s1.name customer_name \n" + + ", p.arrive_time, p.type, p.memo transport_memo, s.name supermarket_name \n" + + ", case when t.supermarket_id = 5 then '巴河' else s1.name end as customer_name \n" + ", t.trans_price in_trans_price, t.weight in_weight,ot.ticket_code as old_ticket_code \n"; fromsql = "from order_transfer t \n" + " left join transport p on p.order_sn = t.sn \n" + diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java index 8273cb2..6df0515 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java @@ -32,7 +32,7 @@ public class TicketInvalidVerifyService extends BaseService { Integer supermarket_type, Integer state ) { - String selectsql = "select t.*, s.name supermarket_name "; + String selectsql = "select t.*, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name "; String fromsql = "from ticket_invalid_verify t \n" + " left join supermarket s on s.id = t.supermarket_id \n" + " where 1=1 "; @@ -64,8 +64,13 @@ public class TicketInvalidVerifyService extends BaseService { } if (supermarket_id != null) { - fromsql += " and t.supermarket_id = ? \n"; - paraList.add(supermarket_id); + if(supermarket_id == 4){ + fromsql += " and t.supermarket_id in (4,5) \n"; + } else { + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + } if (supermarket_type != null) { diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java index 5d1e7aa..a5111e5 100644 --- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java +++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java @@ -93,7 +93,7 @@ public class SupermarketSandfarmDistanceController extends Controller { } SupermarketSandfarmDistance model = getModel(SupermarketSandfarmDistance.class, "", true); // 忽略不在model中的字段 - renderJson(SupermarketSandfarmDistanceService.me.update(model, tokenuser)); + renderJson(SupermarketSandfarmDistanceSyncService.me.update(model, tokenuser)); } /** diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java index 19187a1..0abd0bd 100644 --- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java +++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java @@ -9,7 +9,8 @@ public class SupermarketSandfarmDistanceSyncService extends BaseSyncService { public static SupermarketSandfarmDistanceSyncService me = new SupermarketSandfarmDistanceSyncService(); public Result save(SupermarketSandfarmDistance model, Sysuser sysuser) { - Supermarket supermarket = SvrCacheData.SUP_CACHE.get(model.getSupermarketId()); + Integer supermarket_id = model.getSupermarketId(); + Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id); if (supermarket == null) { return Result.failed("未找到对应砂站信息"); @@ -22,6 +23,26 @@ public class SupermarketSandfarmDistanceSyncService extends BaseSyncService { return Result.failed("未找到对应砂场信息"); } - return super.save(model, sysuser); + Result result = super.save(model, sysuser); + if(supermarket_id == 4){ + SupermarketSandfarmDistance newmodel = new SupermarketSandfarmDistance(); + newmodel.setSupermarketId(5); + newmodel.setSandfarmId(model.getSandfarmId()); + super.save(newmodel, sysuser); + } + return result; + } + + public Result update(SupermarketSandfarmDistance model, Sysuser sysuser) { + Integer supermarket_id = model.getSupermarketId(); + + Result result = super.update(model, sysuser); + if(supermarket_id == 4){ + SupermarketSandfarmDistance newmodel = new SupermarketSandfarmDistance(); + newmodel.setSupermarketId(5); + newmodel.setSandfarmId(model.getSandfarmId()); + super.update(newmodel, sysuser); + } + return result; } }