From 9f86196f0635a000094002d61416c3410fe7e7e1 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Mon, 7 Apr 2025 11:37:02 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/MdmModulePluginInitializer.java | 4 +- .../entity/ProjectMainFlowEntity.xml | 4 +- ...ectMainFlowArchivistPluginInitializer.java | 2 +- ...ProjectMainFlowAuditPluginInitializer.java | 2 +- .../salesContract/dao/ISalesContractDao.java | 29 ++ .../dao/impl/SalesContractDaoImpl.java | 22 ++ .../entity/SalesContractEntity.java | 249 ++++++++++++++++++ .../entity/SalesContractEntity.xml | 73 +++++ .../SalesContractPluginInitializer.java | 213 +++++++++++++++ .../service/ISalesContractService.java | 7 + .../impl/SalesContractServiceImpl.java | 18 ++ ...erviceDataDistributePluginInitializer.java | 6 +- 12 files changed, 621 insertions(+), 8 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/ISalesContractService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/impl/SalesContractServiceImpl.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index 2a84c1a3..bdd82a6f 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -743,7 +743,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { map1.put("tableName",mainDb); //map1.put("dataStatus", "F"); map1.put("updateStatus", "0"); - map1.put("size", 50); + //map1.put("size", 50); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); @@ -937,7 +937,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { map1.put("tableName",mainDb); //map1.put("dataStatus", "Y"); map1.put("addStatus", "0"); - map1.put("size", 50); + //map1.put("size", 50); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml index 29ffca4c..fef09f6e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml @@ -64,6 +64,7 @@ WHERE 1=1 and CTP_AFFAIR.node_policy = '审计完成' AND CTP_AFFAIR.complete_time is not null and CTP_AFFAIR.state = '4' and CTP_AFFAIR.sub_state = '0' and field0427 is null + and rownum < 100 and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001') and id = #{id} @@ -82,7 +83,8 @@ LEFT JOIN org_member m4 ON m4.id=field0081 WHERE 1=1 and CTP_AFFAIR.node_policy = '归档' AND CTP_AFFAIR.complete_time is not null - and CTP_AFFAIR.state = '4' and CTP_AFFAIR.sub_state = '0' and field0425 is null and formmain_0219.id='4000079310249084585' + and CTP_AFFAIR.state = '4' and CTP_AFFAIR.sub_state = '0' and field0425 is null + and rownum < 100 and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001') and id = #{id} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java index 9585fe46..22e1921e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java @@ -110,7 +110,7 @@ public class ProjectMainFlowArchivistPluginInitializer extends PluginBaseEntity //发送数据 String result = HttpRequest.post(url). header("appId", "800050"). - header("apiCode", "8000500016"). + header("apiCode", "8000500011"). header("access_token", tokenBody). header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java index 1ba41d6f..46a32cab 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java @@ -111,7 +111,7 @@ public class ProjectMainFlowAuditPluginInitializer extends PluginBaseEntity { //发送数据 String result = HttpRequest.post(url). header("appId", "800050"). - header("apiCode", "8000500016"). + header("apiCode", "8000500011"). header("access_token", tokenBody). header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java new file mode 100644 index 00000000..0cfea7f4 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java @@ -0,0 +1,29 @@ +package com.hzya.frame.plugin.salesContract.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.salesContract.entity.SalesContractEntity; + +import java.util.List; + +public interface ISalesContractDao extends IBaseDao { + + /** + * + * @content 查询未推送的销售合同 + * @Param + * @Return + * @Author hecan + * @Date 2025-04-03 11:07 + * **/ + List querySalesContract(SalesContractEntity salesContractEntity); + + /** + * + * @content 更新销售合同的推送标识 + * @Param + * @Return + * @Author hecan + * @Date 2025-04-03 11:09 + * **/ + Integer updateSalesContract(SalesContractEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java new file mode 100644 index 00000000..7a7d0ef0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java @@ -0,0 +1,22 @@ +package com.hzya.frame.plugin.salesContract.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.salesContract.dao.ISalesContractDao; +import com.hzya.frame.plugin.salesContract.entity.SalesContractEntity; + +import java.util.List; + +public class SalesContractDaoImpl extends MybatisGenericDao implements ISalesContractDao { + @DS("#entity.dataSourceCode") + @Override + public List querySalesContract(SalesContractEntity entity) { + return (List) super.selectList("querySalesContract",entity); + } + + @DS("#entity.dataSourceCode") + @Override + public Integer updateSalesContract(SalesContractEntity entity) { + return super.update("updateSalesContract",entity); + } +} 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 new file mode 100644 index 00000000..98691005 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.java @@ -0,0 +1,249 @@ +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 contractno;//合同号 + private String contractName;//合同名称 + private String creator;//创建人用户 + private String creationtime;//创建时间 + private String contractor;//订单负责人名称 + private String cdeptid;//事业部 + private String approvestatus;//审批状态默认-1 + private String belongtodeptid;//单据归属部门 + private String dpk_custclass;//合同对应客户大类 + private String dcustomerid;//合同对应客户大类 + private String zcustomerid;// + private String cinvoicecustid;//开票客户名称 + private String cemployeeid;//业务人员 + private String ccurrencyid;//币种 + private String totalamount;//原币总金额 + private String rmbtotalamount;//人民币总金额 + private String presentrate;//汇率 CPO汇率 + private String def13;//IPO合同号 + private String def16;//IPO汇率 + private String def8;//贸易方式 + private String def27;//IPO币种 + private String def17;//收款账期 + private String def18;//账簿本币金额 + private String def26;//当前账簿兑人民币汇率 + private String pushStatus;//推送标识 + + public String getPushStatus() { + return pushStatus; + } + + public void setPushStatus(String pushStatus) { + this.pushStatus = pushStatus; + } + + public String getPk_group() { + return pk_group; + } + + public void setPk_group(String pk_group) { + this.pk_group = pk_group; + } + + public String getPk_org() { + return pk_org; + } + + public void setPk_org(String pk_org) { + this.pk_org = pk_org; + } + + public String getContractno() { + return contractno; + } + + public void setContractno(String contractno) { + this.contractno = contractno; + } + + public String getContractName() { + return contractName; + } + + public void setContractName(String contractName) { + this.contractName = contractName; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getCreationtime() { + return creationtime; + } + + public void setCreationtime(String creationtime) { + this.creationtime = creationtime; + } + + public String getContractor() { + return contractor; + } + + public void setContractor(String contractor) { + this.contractor = contractor; + } + + public String getCdeptid() { + return cdeptid; + } + + public void setCdeptid(String cdeptid) { + this.cdeptid = cdeptid; + } + + public String getApprovestatus() { + return approvestatus; + } + + public void setApprovestatus(String approvestatus) { + this.approvestatus = approvestatus; + } + + public String getBelongtodeptid() { + return belongtodeptid; + } + + public void setBelongtodeptid(String belongtodeptid) { + this.belongtodeptid = belongtodeptid; + } + + public String getDpk_custclass() { + return dpk_custclass; + } + + public void setDpk_custclass(String dpk_custclass) { + this.dpk_custclass = dpk_custclass; + } + + public String getDcustomerid() { + return dcustomerid; + } + + public void setDcustomerid(String dcustomerid) { + this.dcustomerid = dcustomerid; + } + + public String getZcustomerid() { + return zcustomerid; + } + + public void setZcustomerid(String zcustomerid) { + this.zcustomerid = zcustomerid; + } + + public String getCinvoicecustid() { + return cinvoicecustid; + } + + public void setCinvoicecustid(String cinvoicecustid) { + this.cinvoicecustid = cinvoicecustid; + } + + public String getCemployeeid() { + return cemployeeid; + } + + public void setCemployeeid(String cemployeeid) { + this.cemployeeid = cemployeeid; + } + + public String getCcurrencyid() { + return ccurrencyid; + } + + public void setCcurrencyid(String ccurrencyid) { + this.ccurrencyid = ccurrencyid; + } + + public String getTotalamount() { + return totalamount; + } + + public void setTotalamount(String totalamount) { + this.totalamount = totalamount; + } + + public String getRmbtotalamount() { + return rmbtotalamount; + } + + public void setRmbtotalamount(String rmbtotalamount) { + this.rmbtotalamount = rmbtotalamount; + } + + public String getPresentrate() { + return presentrate; + } + + public void setPresentrate(String presentrate) { + this.presentrate = presentrate; + } + + public String getDef13() { + return def13; + } + + public void setDef13(String def13) { + this.def13 = def13; + } + + public String getDef16() { + return def16; + } + + public void setDef16(String def16) { + this.def16 = def16; + } + + public String getDef8() { + return def8; + } + + public void setDef8(String def8) { + this.def8 = def8; + } + + public String getDef27() { + return def27; + } + + public void setDef27(String def27) { + this.def27 = def27; + } + + public String getDef17() { + return def17; + } + + public void setDef17(String def17) { + this.def17 = def17; + } + + public String getDef18() { + return def18; + } + + public void setDef18(String def18) { + this.def18 = def18; + } + + public String getDef26() { + return def26; + } + + public void setDef26(String def26) { + this.def26 = def26; + } +} 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 new file mode 100644 index 00000000..09c7ede1 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/entity/SalesContractEntity.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + formmain_8694.id as id, + 'SW01' as pk_group, -- 集团编码 + field0132 as pk_org, -- 公司编码 + 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, -- 创建时间 + '' as contractor, -- 订单负责人名称 + '' as cdeptid, -- 事业部 + '-1' as approvestatus, -- 审批状态默认 + '' as belongtodeptid, -- 单据归属部门 + '' as dpk_custclass, -- 合同对应客户大类 + '' as dcustomerid, -- 合同对应客户大类 + '' as zcustomerid, + '' as cinvoicecustid, -- 开票客户名称 + field0145 as cemployeeid, -- 业务人员 + field0143 as ccurrencyid, -- 币种 + field0012 as totalamount, -- 原币总金额 + '' as rmbtotalamount, -- 人民币总金额 + '' as presentrate, -- 汇率 + '' as def13, -- IPO合同号 + '' as def16, -- IPO汇率 + myfs.SORTNUMBER as def8, -- 贸易方式 + '' as def27, -- IPO币种 + skzq.SORTNUMBER as def17, -- 收款账期 + '' as def18, -- 账簿本币金额 + '' as def26 -- 当前账簿兑人民币汇率 + + + + + + + + update formmain_8694 set field0146 = #{pushStatus} where 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 new file mode 100644 index 00000000..ecfd8bcf --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/SalesContractPluginInitializer.java @@ -0,0 +1,213 @@ +package com.hzya.frame.plugin.salesContract.plugin; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.projectMainFlow.entity.ProjectMainFlowEntity; +import com.hzya.frame.plugin.salesContract.dao.ISalesContractDao; +import com.hzya.frame.plugin.salesContract.entity.SalesContractEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; + +import java.util.Date; +import java.util.List; + +public class SalesContractPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(SalesContractPluginInitializer.class); + + @Autowired + private ISalesContractDao salesContractDao; + + @Autowired + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + + @Value("${zt.url}") + private String url; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "SalesContractPluginInitializer"; + } + + @Override + public String getPluginName() { + return "销售合同新增"; + } + + @Override + public String getPluginLabel() { + return "SalesContractPluginInitializer"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try { + logger.info("======开始执行销售合同推送BIP========"); + //重试方法 + if (null != requestJson) { + //如果这个id不为空，说明是重试的 + String id = requestJson.getString("integration_task_living_details_id"); + //执行重新发送 + SalesContractEntity salesContractEntity = new SalesContractEntity(); + salesContractEntity.setDataSourceCode("SW-OA"); + if (StrUtil.isNotEmpty(id)) { + salesContractEntity.setId(id); + } + //查询未推送的数据 + List salesContractEntities = salesContractDao.querySalesContract(salesContractEntity); + if(salesContractEntities == null || salesContractEntities.size() == 0){ + logger.info("=====没有需要推送BIP的销售合同=========="); + return BaseResult.getSuccessMessageEntity("查询成功"); + } + for (SalesContractEntity contractEntity : salesContractEntities) { + //组装数据 + JSONObject sendData = getSendData(contractEntity); + JSONObject tokenData = getBipTokenData(); + contractEntity.setDataSourceCode("SW-OA"); + //获取TOKEN + String tokenResult = HttpRequest.post(url). + header("appId", "800050"). + header("apiCode", "8000500003"). + header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). + header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + body(tokenData.toString()). + execute(). + body(); + logger.error("销售合同推送BIPtoken返回结果："+tokenResult); + JSONObject tokenResultJson = JSONObject.parseObject(tokenResult); + if(!tokenResultJson.getBoolean("flag")){ + logger.info("=========销售合同获取biptoken错误，开始修改销售合同推送标识为失败=========="); + contractEntity.setPushStatus("0"); + salesContractDao.updateSalesContract(contractEntity); + logger.info("=========销售合同获取biptoken错误，修改销售合同推送标识完毕=========="); + continue; + } + String tokenBody = tokenResultJson.getJSONObject("attribute").getJSONObject("data").getString("access_token"); + //发送数据 + String result = HttpRequest.post(url). + header("appId", "800050"). + header("apiCode", "8000500012"). + header("access_token", tokenBody). + header("publicKey", "ZJYAQ/VtQ66PqKXlV0EowrrlKkhBHYgS/Zk39Q5ezIQne51Ce7eDIk+3zDUT+v578prj"). + header("secretKey", "iLLk424Bmzknbu+ROeJoiVDMYY5EFXtbZY/aU13HmVYIiQrIw9c0Ag4ipxbfpUqqj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + body(sendData.toString()). + execute(). + body(); + logger.error("销售合同推送BIP返回结果："+result); + JSONObject resultJson = JSONObject.parseObject(result); + if(!resultJson.getBoolean("flag")){ + logger.info("=========销售合同获取bip返回结果错误，开始修改销售合同推送标识为失败=========="); + contractEntity.setPushStatus("0"); + salesContractDao.updateSalesContract(contractEntity); + logger.info("=========销售合同获取bip返回结果错误，修改销售合同推送标识为失败完毕=========="); + saveTaskLivingDetails(contractEntity.getId(),contractEntity.getContractno(),sendData.toString(),resultJson.toJSONString(),false); + }else { + logger.info("=========销售合同获取bip返回结果成功，开始修改销售合同推送标识为成功=========="); + contractEntity.setPushStatus("1"); + salesContractDao.updateSalesContract(contractEntity); + logger.info("=========销售合同获取bip返回结果成功，修改销售合同推送标识为成功完毕=========="); + saveTaskLivingDetails(contractEntity.getId(),contractEntity.getContractno(),sendData.toString(),resultJson.toJSONString(),true); + } + } + } + logger.info("=======销售合同推送BIP执行成功======="); + return BaseResult.getSuccessMessageEntity("销售合同执行成功"); + }catch (Exception e){ + logger.info("======执行销售合同推送BIP失败:{}========", e.getMessage()); + e.printStackTrace(); + } + return BaseResult.getFailureMessageEntity("销售合同执行失败"); + } + + 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("contractno",contractEntity.getContractno());//合同号 + bill.put("name",contractEntity.getContractName());//合同名称 + bill.put("creator",contractEntity.getCreator());//创建人用户 + bill.put("creationtime",contractEntity.getCreationtime());//创建时间 + bill.put("contractor",contractEntity.getContractor());//订单负责人名称 + bill.put("cdeptid",contractEntity.getCdeptid());//事业部 + bill.put("approvestatus",contractEntity.getApprovestatus());//审批状态默认 + bill.put("belongtodeptid",contractEntity.getBelongtodeptid());//单据归属部门 + bill.put("dpk_custclass",contractEntity.getDpk_custclass());//合同对应客户大类 + bill.put("dcustomerid",contractEntity.getDcustomerid());//合同对应客户大类 + bill.put("zcustomerid",contractEntity.getZcustomerid()); + bill.put("cinvoicecustid",contractEntity.getCinvoicecustid());//开票客户名称 + bill.put("cemployeeid",contractEntity.getCemployeeid());//业务人员 + bill.put("ccurrencyid",contractEntity.getCcurrencyid());//币种 + bill.put("totalamount",contractEntity.getTotalamount());//原币总金额 + bill.put("rmbtotalamount",contractEntity.getRmbtotalamount());//人民币总金额 + bill.put("presentrate",contractEntity.getPresentrate());//汇率 + bill.put("def13",contractEntity.getDef13());//IPO合同号 + bill.put("def16",contractEntity.getDef16());//IPO汇率 + bill.put("def8",contractEntity.getDef8());//贸易方式 + bill.put("def27",contractEntity.getDef27());//IPO币种 + bill.put("def17",contractEntity.getDef17());//收款账期 + bill.put("def18",contractEntity.getDef18());//账簿本币金额 + bill.put("def26",contractEntity.getDef26());//当前账簿兑人民币汇率 + JSONObject htdd01Master=new JSONObject(); + htdd01Master.put("htdd01Master",bill); + return htdd01Master; + } + + private JSONObject getBipTokenData() { + JSONObject jsonObject = new JSONObject(); + + + + return jsonObject; + } + + + private void saveTaskLivingDetails(String rootAppPk,String rootAppBill,String rootAppNewData,String newTransmitInfo,boolean flag) { + try { + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setId(UUIDUtils.getUUID()); + integrationTaskLivingDetailsEntity.setSts("Y"); + integrationTaskLivingDetailsEntity.setCreate_user_id("1"); + integrationTaskLivingDetailsEntity.setModify_user_id("1"); + integrationTaskLivingDetailsEntity.setCreate_time(new Date()); + integrationTaskLivingDetailsEntity.setModify_time(new Date()); + integrationTaskLivingDetailsEntity.setOrg_id("0"); + integrationTaskLivingDetailsEntity.setCompanyId("0"); + integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk); + integrationTaskLivingDetailsEntity.setRootAppBill(rootAppBill); + integrationTaskLivingDetailsEntity.setPluginId("SalesContractPluginInitializer"); + integrationTaskLivingDetailsEntity.setRootAppNewData(rootAppNewData); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(newTransmitInfo); + if (flag) { + taskLivingDetailsService.saveLogToSuccess(integrationTaskLivingDetailsEntity); + } else { + taskLivingDetailsService.saveLogToFail(integrationTaskLivingDetailsEntity); + } + } catch (Exception e) { + logger.info("保存日志到集成任务日志明细中失败:{}", e.getMessage()); + } + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/ISalesContractService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/ISalesContractService.java new file mode 100644 index 00000000..bb764464 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/ISalesContractService.java @@ -0,0 +1,7 @@ +package com.hzya.frame.plugin.salesContract.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.salesContract.entity.SalesContractEntity; + +public interface ISalesContractService extends IBaseService { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/impl/SalesContractServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/impl/SalesContractServiceImpl.java new file mode 100644 index 00000000..0e6c4e7a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/service/impl/SalesContractServiceImpl.java @@ -0,0 +1,18 @@ +package com.hzya.frame.plugin.salesContract.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.salesContract.dao.ISalesContractDao; +import com.hzya.frame.plugin.salesContract.entity.SalesContractEntity; +import com.hzya.frame.plugin.salesContract.service.ISalesContractService; +import org.springframework.beans.factory.annotation.Autowired; + +public class SalesContractServiceImpl extends BaseService implements ISalesContractService { + + private ISalesContractDao salesContractDao; + + @Autowired + public void setSalesContractDao(ISalesContractDao dao) { + this.salesContractDao = dao; + this.dao = dao; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java index 84f9389b..10e424c3 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java @@ -612,7 +612,7 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ map1.put("tableName",mainDb); map1.put("dataStatus", "N"); map1.put("deleteStatus", "0"); - map1.put("size", 50); + //map1.put("size", 50); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); @@ -807,7 +807,7 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ map1.put("tableName",mainDb); //map1.put("dataStatus", "F"); map1.put("updateStatus", "0"); - map1.put("size", 50); + //map1.put("size", 50); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); @@ -995,7 +995,7 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ map1.put("tableName",mainDb); //map1.put("dataStatus", "Y"); map1.put("addStatus", "0"); - map1.put("size", 50); + //map1.put("size", 50); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); From b882b4c581261ab7c24bfb0d0c16c46416ad6b46 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 9 Apr 2025 11:23:09 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8E=A8=E9=80=81BIP=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=9C=89=E8=BF=94=E5=9B=9Ebip?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=97=B6=E5=80=99=EF=BC=8C=E5=B0=86=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=BE=85?= =?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E5=A4=B1=E8=B4=A5=E5=8E=9F=E5=9B=A0=E5=9B=9E?= =?UTF-8?q?=E5=86=99=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erviceDataDistributePluginInitializer.java | 60 ++++++++++++++++--- .../serviceData/entity/ServiceDataEntity.xml | 2 +- .../service/impl/ServiceDataServiceImpl.java | 10 +--- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java index 10e424c3..e6f0dbdc 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/serviceData/plugin/ServiceDataDistributePluginInitializer.java @@ -1155,6 +1155,15 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ //组装数据发送 logger.info("=========开始执行正常业务数据下发脚本,第二次=============="); JsonResultEntity jsonResultEntity = sendData(apiEntity,headers,bodys,querys); + //根据OA单据编号更新BIP付款申请单号 + JSONObject jsonObjectBody = JSONObject.parseObject(bodys); + String parent = jsonObjectBody.getString("parent"); + JSONObject jsonObjectParent = JSONObject.parseObject(parent); + ServiceDataEntity serviceDataEntity=new ServiceDataEntity(); + serviceDataEntity.setBillCode(jsonObjectParent.getString("vdef1")); + serviceDataEntity.setDataSourceCode("SW-OA"); + logger.info("========正常业务数据下发开始根据单据编号:{}查询数据==========",jsonObjectParent.getString("vdef1")); + List query = serviceDataDao.query(serviceDataEntity); logger.info("=====业务数据下发调用BIP付款申请返回结果为:{}",JSONObject.parseObject(jsonResultEntity.getAttribute().toString()).toJSONString()); if(jsonResultEntity.isFlag()){ if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getBackScriptData() != null ) { @@ -1187,15 +1196,7 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); mdmModuleDistributeTripartiteEntity.setTripartiteId(backJsonResultEntity.getString("vbillno")); mdmModuleDistributeTripartiteDao.save(mdmModuleDistributeTripartiteEntity); - //根据OA单据编号更新BIP付款申请单号 - JSONObject jsonObjectBody = JSONObject.parseObject(bodys); - String parent = jsonObjectBody.getString("parent"); - JSONObject jsonObjectParent = JSONObject.parseObject(parent); - ServiceDataEntity serviceDataEntity=new ServiceDataEntity(); - serviceDataEntity.setBillCode(jsonObjectParent.getString("vdef1")); - serviceDataEntity.setDataSourceCode("SW-OA"); - logger.info("========正常业务数据下发开始根据单据编号:{}查询数据==========",jsonObjectParent.getString("vdef1")); - List query = serviceDataDao.query(serviceDataEntity); + if(CollectionUtils.isNotEmpty(query)){ logger.info("===正常下发时候，开始根据OA单据编号：{}更新BIP付款申请单号:{}",jsonObjectParent.getString("vdef1"),backJsonResultEntity.getString("vbillno")); serviceDataEntity.setTabName(query.get(0).getTabName()); @@ -1203,6 +1204,14 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ serviceDataEntity.setBipPaymentNumber(backJsonResultEntity.getString("vbillno")); serviceDataEntity.setId(query.get(0).getId()); serviceDataDao.updateBipPaymentNumber(serviceDataEntity); + //更新支付结果为待支付 + serviceDataEntity.setPayResult("待支付"); + serviceDataEntity.setPayResultFiled(query.get(0).getPayResultFiled()); + serviceDataEntity.setDataSourceCode("SW-OA"); + logger.info("====开始根据单据号:{},表名称:{},表单id:{}更新支付状态为待支付======", serviceDataEntity.getBillCode(), serviceDataEntity.getTabName(), serviceDataEntity.getId()); + serviceDataDao.updatePayResult(serviceDataEntity); + logger.info("====根据单据号:{},表名称:{},表单id:{}更新支付状态为待支付完成======", serviceDataEntity.getBillCode(), serviceDataEntity.getTabName(), serviceDataEntity.getId()); + //修改下发状态 logger.info("===正常下发时候，根据OA单据编号：{}更新BIP付款申请单号:{}完毕",jsonObjectParent.getString("vdef1"),backJsonResultEntity.getString("vbillno")); Map updateMap = new HashMap<>(); updateMap.put("tableName",mainDb); @@ -1213,6 +1222,21 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ }else{ logger.info("======正常下发时候根据单据编号:{}未能在三维OA查询到数据，Bip付款申请单号不回写",jsonObjectParent.getString("vdef1")); } + }else { + if (CollectionUtils.isNotEmpty(query)) { + //保存推送BIP返回的错误信息 + //将BIP返回的失败信息保存到支付结果中 + serviceDataEntity.setPayResult(backJsonResultEntity.getString("message")); + serviceDataEntity.setDataSourceCode("SW-OA"); + serviceDataEntity.setPayResultFiled(query.get(0).getPayResultFiled()); + serviceDataEntity.setId(query.get(0).getId()); + serviceDataEntity.setTabName(query.get(0).getTabName()); + logger.info("====开始根据单据号:{},表名称:{},表单id:{}更新支付状态为BIP返回的失败信息======", serviceDataEntity.getBillCode(), serviceDataEntity.getTabName(), serviceDataEntity.getId()); + serviceDataDao.updatePayResult(serviceDataEntity); + logger.info("====根据单据号:{},表名称:{},表单id:{}更新支付状态为BIP返回的失败信息======", serviceDataEntity.getBillCode(), serviceDataEntity.getTabName(), serviceDataEntity.getId()); + }else{ + logger.info("======正常下发时候根据单据编号:{}未能在三维OA查询到数据，不将BIP返回的失败信息体现在支付结果中",jsonObjectParent.getString("vdef1")); + } } } } catch (Exception e) { @@ -1231,6 +1255,24 @@ public class ServiceDataDistributePluginInitializer extends PluginBaseEntity{ saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1"); objects.get(i).put("sendsanfzt123",false); logger.info("========业务数据下发完成，日志保存为失败============"); + if (CollectionUtils.isNotEmpty(query)) { + //保存推送BIP返回的错误信息 + //将BIP返回的失败信息保存到支付结果中 + String str = JSONObject.parseObject(jsonResultEntity.getAttribute().toString()).toJSONString(); + JSONObject jsonObject = JSONObject.parseObject(str); + String attribute = jsonObject.getString("attribute"); + JSONObject jsonAttribute = JSONObject.parseObject(attribute); + serviceDataEntity.setPayResult(jsonAttribute.getString("message")); + serviceDataEntity.setDataSourceCode("SW-OA"); + serviceDataEntity.setPayResultFiled(query.get(0).getPayResultFiled()); + serviceDataEntity.setId(query.get(0).getId()); + serviceDataEntity.setTabName(query.get(0).getTabName()); + logger.info("====开始根据单据号:{},表名称:{},表单id:{}更新支付状态为BIP返回的失败信息======", serviceDataEntity.getBillCode(), serviceDataEntity.getTabName(), serviceDataEntity.getId()); + serviceDataDao.updatePayResult(serviceDataEntity); + logger.info("====根据单据号:{},表名称:{},表单id:{}更新支付状态为BIP返回的失败信息======", serviceDataEntity.getBillCode(), serviceDataEntity.getTabName(), serviceDataEntity.getId()); + }else{ + logger.info("======正常下发时候根据单据编号:{}未能在三维OA查询到数据，不将BIP返回的失败信息体现在支付结果中",jsonObjectParent.getString("vdef1")); + } continue; } } diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/entity/ServiceDataEntity.xml b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/entity/ServiceDataEntity.xml index fd6ee872..cace69b6 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/entity/ServiceDataEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/entity/ServiceDataEntity.xml @@ -14,7 +14,7 @@ - oa_id as id + data_id as id ,tab_name as tabName ,pay_result_field as payResultFiled ,pay_result as payResult diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java index 08ee168c..7fce0e60 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java @@ -300,11 +300,7 @@ public class ServiceDataServiceImpl extends BaseService List list = new ArrayList<>(); try { StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select oa_id as data_id,tab_name,title,pay_company,bill_name,pay_result_field,pay_date_field,receipt_filed,\n" + - "push_status_field,summary_id,bip_payment_number_field,bip_amount_field,\n" + - "vdef1,pk_acceptorg,creator,pk_group,pk_org,applydate,pk_trantypecode,pk_busitype,vdef2,pk_currtype,\n" + - "pk_supplier,pk_bankacc_r,pk_bankacc_p,pk_decidedept,vdef10,vdef12,vdef3,vdef4,vdef5,vdef6,applysum,\n" + - "vdef7,vdef8,vdef9,vdef21,vdef11,vdef17,vdef20 from v_cmp_apply where 1=1 and vdef1 is not null and push_status is null and applysum >0"); + stringBuffer.append("select * from v_cmp_apply where 1=1 and vdef1 is not null and push_status is null and applysum >0"); mdmModuleSourceEntity.setDataSourceCode(dbCode); List> hashMaps = serviceDataDao.queryListBySWSource(stringBuffer.toString(), mdmModuleSourceEntity); int i = 0; @@ -319,9 +315,7 @@ public class ServiceDataServiceImpl extends BaseService formmainId = cmp_apply.getString("data_id"); vdef1=cmp_apply.getString("vdef1"); StringBuffer stringBufferDetails = new StringBuffer(); - stringBufferDetails.append("select d_id as data_id,tab_name,pk_balatype,pk_acceptorg,pk_org,pk_group,pk_busitype,rowno,\n" + - "pk_supplier,pk_bankacc_r,customer,pk_currtype,pk_decidedept,gllcrate,applysum,applymny,vdef1,pk_project,vdef2,vdef3,\n" + - "vdef4,vdef10,vdef14 from v_cmp_apply_b where formmain_id= '"+formmainId+"' " ); + stringBufferDetails.append("select * from v_cmp_apply_b where f_id= '"+formmainId+"' " ); List> hashMapsDetails = serviceDataDao.queryListBySWSource(stringBufferDetails.toString(),mdmModuleSourceEntity); JSONArray cmp_apply_b = new JSONArray(); if(CollectionUtils.isNotEmpty(hashMapsDetails)){ 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 03/14] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B3=E8=AF=B7=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=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());//审批状态默认 From 45aaec8cfbe2399de3c586b5e3c72600ca42aa65 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 16 Apr 2025 13:48:07 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SalesContractEntity.java | 64 +++++++++++++++++++ .../entity/SalesContractEntity.xml | 21 ++++-- .../SalesContractPluginInitializer.java | 8 +++ 3 files changed, 87 insertions(+), 6 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 8ad14d90..66a1955b 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 @@ -31,6 +31,70 @@ public class SalesContractEntity extends BaseEntity { private String def26;//当前账簿兑人民币汇率 private String pushStatus;//推送标识 private String billdate;//申请日期 + private String custbillno;//CPO订单编码 + private String placementdate;//CPO下达日期 + private String country;//国家地区编码 + private String vnote;//备注 + private String def9;//合同类型 + private String def2;//合同性质 + private String def41;//单据归属区域 + + + public String getCustbillno() { + return custbillno; + } + + public void setCustbillno(String custbillno) { + this.custbillno = custbillno; + } + + public String getPlacementdate() { + return placementdate; + } + + public void setPlacementdate(String placementdate) { + this.placementdate = placementdate; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getVnote() { + return vnote; + } + + public void setVnote(String vnote) { + this.vnote = vnote; + } + + public String getDef9() { + return def9; + } + + public void setDef9(String def9) { + this.def9 = def9; + } + + public String getDef2() { + return def2; + } + + public void setDef2(String def2) { + this.def2 = def2; + } + + public String getDef41() { + return def41; + } + + public void setDef41(String def41) { + this.def41 = def41; + } public String getBilldate() { return billdate; 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 c7a7a818..a9456cbd 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 @@ -24,12 +24,12 @@ 'OA' as creator, -- 创建人用户 to_char(field0007,'yyyy-MM-dd HH24:mi:ss') as creationtime, -- 创建时间 to_char(field0007,'yyyy-MM-dd') as billdate, -- 申请日期 - '' as contractor, -- 订单负责人名称 + field0144 as contractor, -- 订单负责人名称 '' as cdeptid, -- 事业部 '-1' as approvestatus, -- 审批状态默认 - '' as belongtodeptid, -- 单据归属部门 + field0152 as belongtodeptid, -- 单据归属部门 '' as dpk_custclass, -- 合同对应客户大类 - '' as dcustomerid, -- 合同对应客户大类 + field0133 as dcustomerid, -- 合同对应客户大类 '' as zcustomerid, '' as cinvoicecustid, -- 开票客户名称 field0145 as cemployeeid, -- 业务人员 @@ -37,13 +37,20 @@ field0012 as totalamount, -- 原币总金额 '' as rmbtotalamount, -- 人民币总金额 '' as presentrate, -- 汇率 - '' as def13, -- IPO合同号 + field0148 as def13, -- IPO合同号 '' as def16, -- IPO汇率 myfs.SORTNUMBER as def8, -- 贸易方式 '' as def27, -- IPO币种 skzq.SORTNUMBER as def17, -- 收款账期 '' as def18, -- 账簿本币金额 - '' as def26 -- 当前账簿兑人民币汇率 + '' as def26, -- 当前账簿兑人民币汇率 + field0147 as custbillno, -- CPO订单编码 + '' as placementdate, -- CPO下达日期 + field0151 as country, -- 国家地区编码 + '' as vnote, --备注 + field0140 as def9, -- 合同类型 + htxz.SORTNUMBER as def2, -- 合同性质 + djgsqy.SORTNUMBER as def41 -- 单据归属区域 @@ -55,9 +62,11 @@ LEFT JOIN COL_SUMMARY summary ON summary.FORM_RECORDID = formmain_8694.id left join CTP_ENUM_ITEM myfs on myfs.id=field0141 left join CTP_ENUM_ITEM skzq on skzq.id=field0138 + left join CTP_ENUM_ITEM htxz on htxz.id=field0149 + left join CTP_ENUM_ITEM djgsqy on djgsqy.id=field0135 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 field0001='SW15-004-2025003491' + and field0132 is not null and field0001='SW15-004-2025003509' 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 a93893fd..11f5b414 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 @@ -173,6 +173,14 @@ public class SalesContractPluginInitializer extends PluginBaseEntity { bill.put("def17",contractEntity.getDef17());//收款账期 bill.put("def18",contractEntity.getDef18());//账簿本币金额 bill.put("def26",contractEntity.getDef26());//当前账簿兑人民币汇率 + + bill.put("custbillno",contractEntity.getCustbillno());//CPO订单编码 + bill.put("placementdate",contractEntity.getPlacementdate());//CPO下达日期 + bill.put("country",contractEntity.getCountry());//国家地区编码 + bill.put("vnote",contractEntity.getVnote());//备注 + bill.put("def9",contractEntity.getDef9());//合同类型 + bill.put("def2",contractEntity.getDef2());//合同性质 + bill.put("def41",contractEntity.getDef41());//单据归属区域 JSONObject htdd01Master=new JSONObject(); htdd01Master.put("htdd01Master",bill); return htdd01Master; From cea54893832db877074b7ae431e1c9394e2500e4 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 17 Apr 2025 11:22:29 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salesContract/dao/ISalesContractDao.java | 20 ++ .../dao/impl/SalesContractDaoImpl.java | 12 + .../entity/SalesContractEntity.java | 80 ++++++ .../entity/SalesContractEntity.xml | 42 ++- ...tractAnnexFileUploadPluginInitializer.java | 268 ++++++++++++++++++ 5 files changed, 420 insertions(+), 2 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/plugin/ContractAnnexFileUploadPluginInitializer.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java index 0cfea7f4..91b760d0 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/ISalesContractDao.java @@ -26,4 +26,24 @@ public interface ISalesContractDao extends IBaseDao * @Date 2025-04-03 11:09 * **/ Integer updateSalesContract(SalesContractEntity entity); + + /** + * + * @content 查询未上传文件的销售合同 + * @Param + * @Return + * @Author hecan + * @Date 2025-04-16 14:40 + * **/ + List queryContractAnnexFile(SalesContractEntity salesContractEntity); + + /** + * + * @content 更新销售合同附件和ipo附件上传标识 + * @Param + * @Return + * @Author hecan + * @Date 2025-04-16 16:48 + * **/ + Integer updateAnnexFile(SalesContractEntity entity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java index 7a7d0ef0..6dbbdba1 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/salesContract/dao/impl/SalesContractDaoImpl.java @@ -19,4 +19,16 @@ public class SalesContractDaoImpl extends MybatisGenericDao queryContractAnnexFile(SalesContractEntity entity) { + return (List) super.selectList("queryContractAnnexFile",entity); + } + + @DS("#entity.dataSourceCode") + @Override + public Integer updateAnnexFile(SalesContractEntity entity) { + return super.update("updateAnnexFile",entity); + } } 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 66a1955b..f4357660 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 @@ -38,7 +38,87 @@ public class SalesContractEntity extends BaseEntity { private String def9;//合同类型 private String def2;//合同性质 private String def41;//单据归属区域 + private String billid;//单据主键 + private String billtype;//单据类型 + private String billcode;//单据号 + private String ipofilename;//ipo附件 文件名称 + private String htnrfilename;//合同内容附件 文件名称 + private String htnrid;//合同内容附件id + private String ipoid;//IPO附件id + private String htnrpush;//合同附件上传标识 + private String ipopush;//ipo附件上传标识 + public String getHtnrpush() { + return htnrpush; + } + + public void setHtnrpush(String htnrpush) { + this.htnrpush = htnrpush; + } + + public String getIpopush() { + return ipopush; + } + + public void setIpopush(String ipopush) { + this.ipopush = ipopush; + } + + public String getHtnrid() { + return htnrid; + } + + public void setHtnrid(String htnrid) { + this.htnrid = htnrid; + } + + public String getIpoid() { + return ipoid; + } + + public void setIpoid(String ipoid) { + this.ipoid = ipoid; + } + + public String getBillid() { + return billid; + } + + public void setBillid(String billid) { + this.billid = billid; + } + + public String getBilltype() { + return billtype; + } + + public void setBilltype(String billtype) { + this.billtype = billtype; + } + + public String getBillcode() { + return billcode; + } + + public void setBillcode(String billcode) { + this.billcode = billcode; + } + + public String getIpofilename() { + return ipofilename; + } + + public void setIpofilename(String ipofilename) { + this.ipofilename = ipofilename; + } + + public String getHtnrfilename() { + return htnrfilename; + } + + public void setHtnrfilename(String htnrfilename) { + this.htnrfilename = htnrfilename; + } public String getCustbillno() { return custbillno; 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 a9456cbd..1f104bfe 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 @@ -53,7 +53,7 @@ djgsqy.SORTNUMBER as def41 -- 单据归属区域 - + + + + select formmain_8694.id as id, - formmain_8694.id as billid, -- 单据主键 + -- formmain_8694.id as billid, -- 单据主键 'HHHX0201' as billtype, -- 单据类型 field0009 as billcode, -- 单据号 合同订单可以传合同号 field0132 as pkOrg, -- 公司编码 - ipo_file.filename as ipofilename, -- ipo附件 文件名称 htnr_file.filename as htnrfilename, --合同内容附件 文件名称 htnr_file.id as htnrid, -- 合同内容附件id - ipo_file.id as ipoid, -- IPO附件id - field0153 as htnrpush, -- 合同附件上传标识 - field0154 as ipopush -- ipo附件上传标识 + field0153 as htnrpush -- 合同附件上传标识 from formmain_8694 LEFT JOIN COL_SUMMARY summary ON summary.FORM_RECORDID = formmain_8694.id left join CTP_ATTACHMENT htnr on htnr.sub_reference=field0020 - left join CTP_ATTACHMENT ipo on ipo.sub_reference=field0139 left join ctp_file htnr_file on htnr_file.id=htnr.file_url + where field0146 is not 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 field0153 is null and field0001='SW15-004-2025003497' + + and id = #{id} + + + + + @@ -57,6 +63,17 @@ + + + + select + + from formmain_9555 main + -- LEFT JOIN COL_SUMMARY summary ON summary.FORM_RECORDID = main.id + left join ORG_MEMBER on ORG_MEMBER.id=field0020 + WHERE 1=1 -- and summary.state in ('1','3') -- 2回退 + AND MODIFY_DATE >= TO_DATE('2025-03-07 11:00:00','yyyy-MM-dd HH24:mi:ss') + AND MODIFY_DATE >= TO_DATE(#{startTime},'yyyy-MM-dd HH24:mi:ss') + and field0047 ='L120250503-R' + + + + + insert into LEXMISC4_case( + + CA_BUDGETORG , + CA_BUDGETORGNM , + CA_NO , + CA_NAME , + CA_TYPENM , + CA_MANAGERNM , + CA_BEGINDATE , + CA_ENDDATE , + CA_FATHERNM , + CA_BUDGETAMT , + CA_FACTAMT , + CA_COVERAMT , + CA_FULLLEVELNO + + )values( + + #{caBudgetorg} , + #{caBudgetornm} , + #{caNo} , + #{caName} , + #{caTypenm} , + #{caManagernm} , + TO_TIMESTAMP(#{caBegindate}, 'SYYYY-MM-DD HH24:MI:SS:FF6') , + TO_TIMESTAMP(#{caEnddate}, 'SYYYY-MM-DD HH24:MI:SS:FF6') , + #{caFathernm} , + #{caBudgetamt} , + #{caFactmat} , + #{caCoveramt} , + #{caFulllevelno} + + ) + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/C4ProjectPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/C4ProjectPluginInitializer.java new file mode 100644 index 00000000..af0372ba --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/C4ProjectPluginInitializer.java @@ -0,0 +1,124 @@ +package com.hzya.frame.plugin.c4project.plugin; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.c4project.dao.IC4ProjectDao; +import com.hzya.frame.plugin.c4project.dao.impl.C4ProjectDaoImpl; +import com.hzya.frame.plugin.c4project.entity.C4ProjectEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Date; +import java.util.List; + +public class C4ProjectPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(C4ProjectPluginInitializer.class); + + @Autowired + private IC4ProjectDao ic4ProjectDao; + + @Autowired + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "C4ProjectPluginInitializer"; + } + + @Override + public String getPluginName() { + return "研发项目立项生成C4项目档案"; + } + + @Override + public String getPluginLabel() { + return "C4ProjectPluginInitializer"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + try { + String startTime = DateUtil.format(requestJson.getDate("startTime"),"yyyy-MM-dd HH:mm:ss");//定时任务执行时传入的开始时间 + String endTime = DateUtil.format(requestJson.getDate("endTime"),"yyyy-MM-dd HH:mm:ss");//定时任务执行时传入的开始时间 + logger.info("=======研发项目立项推送C4项目档案的开始时间为：{}=======",startTime); + logger.info("=======研发项目立项推送C4项目档案的结束时间为：{}=======",endTime); + if(StrUtil.isEmpty(startTime)){ + DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"); + } + + logger.info("=======在:{}时间查询研发项目立项推送C4项目档案=======",startTime); + C4ProjectEntity c4ProjectEntity=new C4ProjectEntity(); + c4ProjectEntity.setStartTime(startTime); + c4ProjectEntity.setDataSourceCode("SW-OA"); + List c4ProjectEntities = ic4ProjectDao.queryProjectToC4(c4ProjectEntity); + if(c4ProjectEntities == null || c4ProjectEntities.size() == 0){ + logger.info("=====查询研发项目立项推送C4项目档案数据有:{}条",c4ProjectEntities.size()); + return BaseResult.getSuccessMessageEntity("查询成功"); + } + for (C4ProjectEntity projectEntity : c4ProjectEntities) { + projectEntity.setDataSourceCode("SW-OA"); + projectEntity.setCaFulllevelno("@"+projectEntity.getCaNo()+"@"); + projectEntity.setCaTypenm(projectEntity.getCaTypenm()==null?"项目类型":projectEntity.getCaTypenm()); + logger.info("======开始将项目编号：{}，项目名称：{}新增到C4项目档案中=======",projectEntity.getCaNo(),projectEntity.getCaName()); + Integer integer = ic4ProjectDao.saveC4Project(projectEntity); + logger.info("======将项目编号：{}，项目名称：{}新增到C4项目档案中完毕=======",projectEntity.getCaNo(),projectEntity.getCaName()); + saveTaskLivingDetails(projectEntity.getId(),projectEntity.getCaNo(),JSONObject.parseObject(projectEntity.toString()).toJSONString(),String.valueOf(integer),true); + } + logger.info("=======研发项目立项推送C4项目档案执行成功======="); + return BaseResult.getSuccessMessageEntity("研发项目立项推送C4项目档案执行成功"); + }catch (Exception e){ + logger.info("========研发项目立项推送C4项目档案失败,:{}",e.getMessage()); + e.printStackTrace(); + } + return BaseResult.getFailureMessageEntity("研发项目立项推送C4项目档案执行成功"); + } + + private void saveTaskLivingDetails(String rootAppPk,String rootAppBill,String rootAppNewData,String newTransmitInfo,boolean flag) { + try { + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setId(UUIDUtils.getUUID()); + integrationTaskLivingDetailsEntity.setSts("Y"); + integrationTaskLivingDetailsEntity.setCreate_user_id("1"); + integrationTaskLivingDetailsEntity.setModify_user_id("1"); + integrationTaskLivingDetailsEntity.setCreate_time(new Date()); + integrationTaskLivingDetailsEntity.setModify_time(new Date()); + integrationTaskLivingDetailsEntity.setOrg_id("0"); + integrationTaskLivingDetailsEntity.setCompanyId("0"); + integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk); + integrationTaskLivingDetailsEntity.setRootAppBill(rootAppBill); + integrationTaskLivingDetailsEntity.setPluginId("C4ProjectPluginInitializer"); + integrationTaskLivingDetailsEntity.setRootAppNewData(rootAppNewData); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(newTransmitInfo); + if(flag){ + taskLivingDetailsService.saveLogToSuccess(integrationTaskLivingDetailsEntity); + }else { + taskLivingDetailsService.saveLogToFail(integrationTaskLivingDetailsEntity); + } + }catch (Exception e){ + logger.info("保存日志到集成任务日志明细中失败:{}",e.getMessage()); + } + } +} diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/pluginCfg.xml new file mode 100644 index 00000000..0a47fd4e --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/pluginCfg.xml @@ -0,0 +1,6 @@ + + +C4ProjectPluginInitializer +C4ProjectPluginInitializer +90000098 + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..29d92bf2 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/spring/spring-buildpackage-dao.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..ccd071a2 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/c4project/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java index 48af6450..17c005df 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java @@ -420,7 +420,7 @@ public class ServiceDataServiceImpl extends BaseService Object object = comparisonServiceimpl.saveEntity(jsonStr); logger.info("单据视图新增结果为：{}", JSON.toJSONString(object)); result.add(object); - } else { + }/* else { hashMap.put("appName","数智中台"); hashMap.put("appCode","800004"); hashMap.put("mdmCode", mdmCode); @@ -429,7 +429,7 @@ public class ServiceDataServiceImpl extends BaseService Object object = comparisonServiceimpl.updateEntity(jsonStr); logger.info("单据视图更新结果为：{}", JSON.toJSONString(result)); result.add(object); - } + }*/ } return result; }catch (Exception e){ From 015c06b7327134866caa17c845f6806b018c2152 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 20 May 2025 17:20:43 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=8F=91=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E7=BB=A7=E7=BB=AD=E6=89=A7=E8=A1=8C=E4=B8=8B?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/MdmModulePluginInitializer.java | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index bdd82a6f..62d9cb44 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -892,16 +892,30 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { if(jsonResultEntity.isFlag()){ //保存日志 saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"1","发送成功",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"2"); + logger.info("=========主数据修改下发成功，修改下发状态为成功======"); + Map updateMap = new HashMap<>(); + updateMap.put("tableName",mainDb); + //updateMap.put("dataStatus", "F"); + updateMap.put("updateStatus", "1"); + updateMap.put("id", objects.get(i).getString("id")); + mdmModuleDao.updateMdmSTs(updateMap); continue; }else { //保存日志 saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"2"); + logger.info("=========主数据修改下发失败，修改下发状态为失败======"); + Map updateMap = new HashMap<>(); + updateMap.put("tableName",mainDb); + //updateMap.put("dataStatus", "F"); + updateMap.put("updateStatus", "2"); + updateMap.put("id", objects.get(i).getString("id")); + mdmModuleDao.updateMdmSTs(updateMap); continue; } } } - //所有下发发送完成，修改数据状态 + /* //所有下发发送完成，修改数据状态 for (int i = 0; i < objects.size(); i++) { Map updateMap = new HashMap<>(); updateMap.put("tableName",mainDb); @@ -909,7 +923,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { updateMap.put("updateStatus", "1"); updateMap.put("id", objects.get(i).getString("id")); mdmModuleDao.updateMdmSTs(updateMap); - } + }*/ } /** @@ -1129,6 +1143,21 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId()); mdmModuleDistributeTripartiteEntity.setTripartiteId(backJsonResultEntity.getString("tripartiteId")); mdmModuleDistributeTripartiteDao.save(mdmModuleDistributeTripartiteEntity); + logger.info("=========主数据下发成功，修改下发状态为成功======"); + Map updateMap = new HashMap<>(); + updateMap.put("tableName",mainDb); + //updateMap.put("dataStatus", "Y"); + updateMap.put("addStatus", "1"); + updateMap.put("id", objects.get(i).getString("id")); + mdmModuleDao.updateMdmSTs(updateMap); + }else{ + logger.info("=========主数据下发失败，修改下发状态为失败======"); + Map updateMap = new HashMap<>(); + updateMap.put("tableName",mainDb); + //updateMap.put("dataStatus", "Y"); + updateMap.put("addStatus", "2"); + updateMap.put("id", objects.get(i).getString("id")); + mdmModuleDao.updateMdmSTs(updateMap); } } } catch (Exception e) { @@ -1147,12 +1176,19 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1"); objects.get(i).put("sendsanfzt123",false); logger.info("========主数据新增下发完成，日志保存为失败============"); + logger.info("=========主数据下发失败，修改下发状态为失败======"); + Map updateMap = new HashMap<>(); + updateMap.put("tableName",mainDb); + //updateMap.put("dataStatus", "Y"); + updateMap.put("addStatus", "2"); + updateMap.put("id", objects.get(i).getString("id")); + mdmModuleDao.updateMdmSTs(updateMap); continue; } } } - //所有下发发送完成，修改数据状态 + /* //所有下发发送完成，修改数据状态 for (int i = 0; i < objects.size(); i++) { if(objects.get(i).getBoolean("sendsanfzt123")){ Map updateMap = new HashMap<>(); @@ -1162,7 +1198,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { updateMap.put("id", objects.get(i).getString("id")); mdmModuleDao.updateMdmSTs(updateMap); } - } + }*/ } private void saveMdmModuleSendLogEntity(Long mdmCode,String distributeId,String dataType,String remark,String dbname,String formmain_id, String target_app, String appId, String target_api,String apiID, String source_data, String option_type) throws Exception { From 78488ee080de5aaafdf6f311ecfba259daab5437 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Mon, 26 May 2025 17:36:49 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectMainFlowEntity.java | 18 ++++++++++++++++++ .../entity/ProjectMainFlowEntity.xml | 6 ++++-- ...jectMainFlowArchivistPluginInitializer.java | 2 ++ .../ProjectMainFlowAuditPluginInitializer.java | 2 ++ .../service/impl/ServiceDataServiceImpl.java | 2 +- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.java index 4c21783f..63161603 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.java @@ -36,6 +36,24 @@ public class ProjectMainFlowEntity extends BaseEntity { private String archivistStatus;//归档推送状态 private String def8;//完工服务额 private String def7;//J审定服务金额 + private String def9;//D分包施工费率 + private String def10;//D辅材费率 + + public String getDef9() { + return def9; + } + + public void setDef9(String def9) { + this.def9 = def9; + } + + public String getDef10() { + return def10; + } + + public void setDef10(String def10) { + this.def10 = def10; + } public String getDef8() { return def8; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml index fef09f6e..a9bbd4d6 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml @@ -48,6 +48,8 @@ ,field0428 as auditResult -- 审定推送结果 ,field0426 as archivistResult -- 归档推送结果 ,field0425 as archivistStatus -- 归档推送状态 + ,field0032 as def9 -- D分包施工费率 + ,field0033 as def10 -- D辅材费率 @@ -64,7 +66,7 @@ WHERE 1=1 and CTP_AFFAIR.node_policy = '审计完成' AND CTP_AFFAIR.complete_time is not null and CTP_AFFAIR.state = '4' and CTP_AFFAIR.sub_state = '0' and field0427 is null - and rownum < 100 and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001') + and rownum < 100 -- and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001') and id = #{id} @@ -84,7 +86,7 @@ WHERE 1=1 and CTP_AFFAIR.node_policy = '归档' AND CTP_AFFAIR.complete_time is not null and CTP_AFFAIR.state = '4' and CTP_AFFAIR.sub_state = '0' and field0425 is null - and rownum < 100 and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001') + and rownum < 100 -- and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001') and id = #{id} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java index 22e1921e..beffe79b 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java @@ -184,6 +184,8 @@ public class ProjectMainFlowArchivistPluginInitializer extends PluginBaseEntity htdd01slave4_htdd01slave4.put("def6",projectMainFlowEntity.getDef6()); htdd01slave4_htdd01slave4.put("def7",projectMainFlowEntity.getDef7()); htdd01slave4_htdd01slave4.put("def8",projectMainFlowEntity.getDef8()); + htdd01slave4_htdd01slave4.put("def9",projectMainFlowEntity.getDef9()); + htdd01slave4_htdd01slave4.put("def10",projectMainFlowEntity.getDef10()); jsonArray.add(htdd01slave4_htdd01slave4); bill.put("htdd01Master",htdd01Master); bill.put("htdd01slave4_htdd01slave4",jsonArray); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java index 46a32cab..2368abbb 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java @@ -176,6 +176,8 @@ public class ProjectMainFlowAuditPluginInitializer extends PluginBaseEntity { htdd01slave4_htdd01slave4.put("def6",projectMainFlowEntity.getDef6()); htdd01slave4_htdd01slave4.put("def7",projectMainFlowEntity.getDef7()); htdd01slave4_htdd01slave4.put("def8",projectMainFlowEntity.getDef8()); + htdd01slave4_htdd01slave4.put("def9",projectMainFlowEntity.getDef9()); + htdd01slave4_htdd01slave4.put("def10",projectMainFlowEntity.getDef10()); jsonArray.add(htdd01slave4_htdd01slave4); bill.put("htdd01Master",htdd01Master); bill.put("htdd01slave4_htdd01slave4",jsonArray); diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java index 17c005df..2b7efaff 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java @@ -352,7 +352,7 @@ public class ServiceDataServiceImpl extends BaseService List list = new ArrayList<>(); try { StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select * from v_cmp_apply where 1=1 and vdef1 is not null and push_status is null and applysum >0"); + stringBuffer.append("select * from v_cmp_apply where 1=1 and vdef1 is not null and push_status is null "); mdmModuleSourceEntity.setDataSourceCode(dbCode); List> hashMaps = serviceDataDao.queryListBySWSource(stringBuffer.toString(), mdmModuleSourceEntity); int i = 0; From 123a9c30d1492d6523c75038032e151632fc7a74 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Thu, 5 Jun 2025 14:14:25 +0800 Subject: [PATCH 13/14] =?UTF-8?q?xel=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-buildpackage/pom.xml | 6 ++++++ .../src/main/resources/application-xel.yml | 16 ++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/base-buildpackage/pom.xml b/base-buildpackage/pom.xml index 8b09a3b0..de11141c 100644 --- a/base-buildpackage/pom.xml +++ b/base-buildpackage/pom.xml @@ -56,6 +56,12 @@ hclocal + + xel + + xel + + kangarooDataCenterV3 diff --git a/base-buildpackage/src/main/resources/application-xel.yml b/base-buildpackage/src/main/resources/application-xel.yml index e53ca4c4..829e8b72 100644 --- a/base-buildpackage/src/main/resources/application-xel.yml +++ b/base-buildpackage/src/main/resources/application-xel.yml @@ -19,17 +19,5 @@ spring: savefile: # 文件保存路径 path: /Users/xiangerlin/work/app/file/dev -cbs8: - appId: 1P4AGrpz - appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a - url: https://cbs8-openapi-reprd.csuat.cmburl.cn - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde - cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185 - #电子回单下载临时存放位置 - elec_path: /Users/xiangerlin/Downloads/ -OA: - data_source_code: yc-test +zt: + url: http://127.0.0.1:9011/kangarooDataCenterV3/entranceController/externalCallInterface From b3f3fdb7af2d51f90cb48e1f9d929057c692536b Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 6 Jun 2025 17:52:11 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9C=AA=E5=AE=9A=E5=90=88=E5=90=8C=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=92=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=20?= =?UTF-8?q?=E9=83=BD=E4=BC=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81=20?= =?UTF-8?q?=E8=83=A1=E9=A3=9E=E6=B4=B2=E8=AE=A9=E6=94=B9=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SendContract/plugin/SendContractPluginInitializer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java index 33bdf4b8..87dfb6b9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java @@ -185,7 +185,9 @@ public class SendContractPluginInitializer extends PluginBaseEntity { billhead.put("pk_group","SW01"); billhead.put("pk_org","666"); billhead.put("project_code",sendContractEntity.getProjectCode()); - billhead.put("project_name",sendContractEntity.getProjectName()); + //billhead.put("project_name",sendContractEntity.getProjectName()); + //2025年6月6日17:46:45 相二林修改， 三维通信BIP-致远OA接口群 胡飞洲让改的 + billhead.put("project_name",sendContractEntity.getProjectCode()); billhead.put("def1",sendContractEntity.getKhcode());//BIP客户编码 bill.put("billhead",billhead); ufinterface.put("bill",bill);