diff --git a/YLErpDAL/Modules/TradeModule/TradeOAService.cs b/YLErpDAL/Modules/TradeModule/TradeOAService.cs index 41b31fab..17a76d2e 100644 --- a/YLErpDAL/Modules/TradeModule/TradeOAService.cs +++ b/YLErpDAL/Modules/TradeModule/TradeOAService.cs @@ -257,11 +257,11 @@ namespace YLErp.Modules.TradeModule { title = $"固定收益部申请【{contractCode}】TRS交易确认书", urgentLevel = "正常", - applyDate = DateTime.Now.ToString("yyyyMMdd"), - applicant = UserInfo.UserName, + applyDate = DateTime.Now.ToString("yyyy-MM-dd"), + applicant = "guoj", applicantComp = "国联民生证券总部", - contractType = "业务", - businessType = "金融交易类合同(除股票质押式回购业务部分购回、购回协议)", + contractType = 0, + businessType = 1, contractSecretLevel = "一般", contractUrgentLevel = "一般", //去除后缀 @@ -281,7 +281,8 @@ namespace YLErp.Modules.TradeModule signIntegrityAgreement = "无需签订", contractBackground = $"我司与{trade.ClientName}已完成NAFMII协议签署,并开展TRS交易:{contractCode},参与标的{trade.UnderlyingCode} {trade.UnderlyingName},参与标的数量面额{trade.OriginalStockEqvNotional}元人民币", // 使用annexId替代Base64编码 - annexIds = annexIds + annexIds = annexIds, + creater = "guoj" }; // 构建查询参数(不包含dataMap,dataMap放在请求体中) diff --git a/YLErpWeb/appsettings.dev.json b/YLErpWeb/appsettings.dev.json index 99e05c75..cf0fb784 100644 --- a/YLErpWeb/appsettings.dev.json +++ b/YLErpWeb/appsettings.dev.json @@ -75,13 +75,13 @@ "SendKafakaCron": "10 0 * * *", "MaxThreadPercent": 0.6, //占系统资源最多60%的线程数量 "oa_confg": { - "BaseUrl": "http://10.52.130.11", - "SubUrl": "/ZSZQ/fileDraft", + "BaseUrl": "http://10.250.202.40:13590", + "SubUrl": "/gateway/oaflow/createOaFlow", "SystemToken": "123", //OA系统key "SystemName": "ZSZQ_CWYSPJYQRSDZWF", //OA文件类别 "IsNextFlow": 0, //是否自动提交 默认0 "FlowId": 723606, - "UploadUrl": "http://172.28.40.132:13590/gateway/oaflow/uploadDoc" + "UploadUrl": "http://10.250.202.40:13590/gateway/oaflow/uploadDoc" }, "GeneralSSO": { "enable": true, //是否启用通用SSO登录