weiloong_zhang/zhyManagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开票申请新增字段、台账发货申请优化时间戳获取时间

Browse Source
This commit is contained in:
itzhang 2025-09-01 15:58:43 +08:00
parent 1120b834e5
commit 14eea54b8d
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/management/controller/InvoiceController.java
View File

@ -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"));//备注栏信息是否与客户确认

18
src/main/java/com/management/tzcontroller/DeliveryReqController.java
View File

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