From ad336981b5382c7dc0853550288718a383382b01 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 10 Apr 2025 14:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=B3=E8=AF=B7=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SalesContractEntity.java | 29 ++++++++++++------- .../entity/SalesContractEntity.xml | 9 +++--- .../SalesContractPluginInitializer.java | 6 ++-- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java index 98691005..8ad14d90 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java @@ -3,8 +3,8 @@ package com.hzya.frame.plugin.salesContract.entity; import com.hzya.frame.web.entity.BaseEntity; public class SalesContractEntity extends BaseEntity { - private String pk_group;//集团编码 - private String pk_org;//公司编码 + private String pkGroup;//集团编码 + private String pkOrg;//公司编码 private String contractno;//合同号 private String contractName;//合同名称 private String creator;//创建人用户 @@ -30,6 +30,15 @@ public class SalesContractEntity extends BaseEntity { private String def18;//账簿本币金额 private String def26;//当前账簿兑人民币汇率 private String pushStatus;//推送标识 + private String billdate;//申请日期 + + public String getBilldate() { + return billdate; + } + + public void setBilldate(String billdate) { + this.billdate = billdate; + } public String getPushStatus() { return pushStatus; @@ -39,20 +48,20 @@ public class SalesContractEntity extends BaseEntity { this.pushStatus = pushStatus; } - public String getPk_group() { - return pk_group; + public String getPkGroup() { + return pkGroup; } - public void setPk_group(String pk_group) { - this.pk_group = pk_group; + public void setPkGroup(String pkGroup) { + this.pkGroup = pkGroup; } - public String getPk_org() { - return pk_org; + public String getPkOrg() { + return pkOrg; } - public void setPk_org(String pk_org) { - this.pk_org = pk_org; + public void setPkOrg(String pkOrg) { + this.pkOrg = pkOrg; } public String getContractno() { diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml index 09c7ede1..c7a7a818 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml @@ -15,14 +15,15 @@ formmain_8694.id as id, - 'SW01' as pk_group, -- 集团编码 - field0132 as pk_org, -- 公司编码 + 'SW01' as pkGroup, -- 集团编码 + field0132 as pkOrg, -- 公司编码 field0009 as contractno, -- 合同号 field0010 as contractName, -- 合同名称 'field0146' as pushStatusFiald, -- 推送标识字段 field0146 as pushStatus, -- 推送标识 'OA' as creator, -- 创建人用户 to_char(field0007,'yyyy-MM-dd HH24:mi:ss') as creationtime, -- 创建时间 + to_char(field0007,'yyyy-MM-dd') as billdate, -- 申请日期 '' as contractor, -- 订单负责人名称 '' as cdeptid, -- 事业部 '-1' as approvestatus, -- 审批状态默认 @@ -55,8 +56,8 @@ left join CTP_ENUM_ITEM myfs on myfs.id=field0141 left join CTP_ENUM_ITEM skzq on skzq.id=field0138 where field0146 is null and to_char(field0007,'yyyy-MM-dd HH24:mi:ss')>'2025-01-01' - and summary.state in ('1','3') - and field0132 is not null and field0009='4501889245' + -- and summary.state in ('1','3') + and field0132 is not null and field0001='SW15-004-2025003491' and id = #{id} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java index ecfd8bcf..a93893fd 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java @@ -107,6 +107,7 @@ public class SalesContractPluginInitializer extends PluginBaseEntity { continue; } String tokenBody = tokenResultJson.getJSONObject("attribute").getJSONObject("data").getString("access_token"); + logger.error("销售合同推送BIP请求参数："+sendData.toJSONString()); //发送数据 String result = HttpRequest.post(url). header("appId", "800050"). @@ -145,12 +146,13 @@ public class SalesContractPluginInitializer extends PluginBaseEntity { private JSONObject getSendData(SalesContractEntity contractEntity) { JSONObject bill = new JSONObject(); - bill.put("pk_group",contractEntity.getPk_group());//集团编码 - bill.put("pk_org",contractEntity.getPk_org());//公司编码 + bill.put("pk_group",contractEntity.getPkGroup());//集团编码 + bill.put("pk_org",contractEntity.getPkOrg());//公司编码 bill.put("contractno",contractEntity.getContractno());//合同号 bill.put("name",contractEntity.getContractName());//合同名称 bill.put("creator",contractEntity.getCreator());//创建人用户 bill.put("creationtime",contractEntity.getCreationtime());//创建时间 + bill.put("billdate",contractEntity.getBilldate());//申请日期 bill.put("contractor",contractEntity.getContractor());//订单负责人名称 bill.put("cdeptid",contractEntity.getCdeptid());//事业部 bill.put("approvestatus",contractEntity.getApprovestatus());//审批状态默认