From 14eea54b8de98b918a9e8e5549a358d91074e57b Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Mon, 1 Sep 2025 15:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E3=80=81=E5=8F=B0=E8=B4=A6=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3=E8=8E=B7=E5=8F=96=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InvoiceController.java | 3 +++ .../tzcontroller/DeliveryReqController.java | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/management/controller/InvoiceController.java b/src/main/java/com/management/controller/InvoiceController.java index 7c27661..b48b395 100644 --- a/src/main/java/com/management/controller/InvoiceController.java +++ b/src/main/java/com/management/controller/InvoiceController.java @@ -244,6 +244,9 @@ public class InvoiceController { invoiceMap.put("issoftworks", isHasSoftBool); + //软件名称-登记号 + invoiceMap.put("cwsoftworks_number", invoiceData.getString("registration_number_financ__c") != null ? invoiceData.getString("registration_number_financ__c") : ""); + //软著版本编码 invoiceMap.put("softworks_number", invoiceData.getString("positive_number__c") != null ? invoiceData.getString("positive_number__c") : ""); invoiceMap.put("isbzqr", invoiceData.getBoolean("note_confirmed_with_custom__c"));//备注栏信息是否与客户确认 diff --git a/src/main/java/com/management/tzcontroller/DeliveryReqController.java b/src/main/java/com/management/tzcontroller/DeliveryReqController.java index 248ae2d..49db41b 100644 --- a/src/main/java/com/management/tzcontroller/DeliveryReqController.java +++ b/src/main/java/com/management/tzcontroller/DeliveryReqController.java @@ -15,6 +15,8 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.*; /** @@ -46,12 +48,18 @@ public class DeliveryReqController { public void syncDeliveryReq() { CrmRequestUtil crmRequestUtil = new CrmRequestUtil(); + long twoDaysAgo = LocalDateTime.now() + .minusDays(5) + .atZone(ZoneId.systemDefault()) + .toInstant() + .toEpochMilli(); + log.info("开始执行发货申请单台账新增"); String[] syncStatus = {"option_pending_sync__c", "option_resync__c"}; JSONObject getDelivery = crmRequestUtil.getCRMList(Arrays.asList( - new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")), + new Filter("GT", "last_modified_time", Arrays.asList(String.valueOf(twoDaysAgo))), new Filter("EQ", "life_status", Arrays.asList("normal")), new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")), //new Filter("EQ", "name", Arrays.asList("FHSQ202505270013")), @@ -284,10 +292,16 @@ public class DeliveryReqController { public void syncRefund() { CrmRequestUtil crmRequestUtil = new CrmRequestUtil(); + long twoDaysAgo = LocalDateTime.now() + .minusDays(5) + .atZone(ZoneId.systemDefault()) + .toInstant() + .toEpochMilli(); + String[] syncStatus = {"option_pending_sync__c", "option_resync__c"}; JSONObject getRefund = crmRequestUtil.getCRMList(Arrays.asList( - new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")), + new Filter("GT", "last_modified_time", Arrays.asList(String.valueOf(twoDaysAgo))), new Filter("EQ", "life_status", Arrays.asList("normal")), new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")), //new Filter("EQ", "name", Arrays.asList("FHSQ202505270013")),