From 460ff3f2871187ae80f78e44563bbb8bfffa2a96 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 7 Nov 2024 17:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=A2=9E=E5=8A=A0=E9=80=80?= =?UTF-8?q?=E6=96=99=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/base/api/domain/SltAgreementInfo.java | 1 + .../src/main/resources/bootstrap-sgzb_cloud_local.yml | 9 +++++---- .../resources/mapper/material/SltAgreementInfoMapper.xml | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java index 242677b..8f16bda 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java @@ -211,6 +211,7 @@ public class SltAgreementInfo { */ private String outSourceCosts; private String remark; + private String outRemark; private String beginTime; private String offTime; private String partModelName; diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml index fdef011..3f6fc44 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_local.yml @@ -33,7 +33,8 @@ sgzb: job: settlementJobDay: 21 settlementJobCron: "0 0 1 21 * ?" - zlptUrl: - intelligentUrl: - intelligentAppKey: - intelligentAesKey: \ No newline at end of file + zlptUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications + updateItemStatusUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/updateItemStatus + intelligentUrl: https://sit.zhgkxt.com/api/clientapi/public/externalApi/acceptExternalMechanical + intelligentAppKey: abc123 + intelligentAesKey: abcdefghijklmnop diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index 5826d8a..ca367b2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -334,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.lease_price as leasePrice, sai.num as num, lai.remark, + bb.remark as outRemark, sai.is_slt as isSlt, sai.trim_day as trimDay, DATE(sai.start_time) as startTime, @@ -341,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays from slt_agreement_info sai LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id + LEFT JOIN back_apply_info bb on sai.back_id = bb.id LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id @@ -363,12 +365,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.lease_price as leasePrice, sai.num as num, lai.remark, + bb.remark as outRemark, sai.is_slt as isSlt, DATE(sai.start_time) as startTime, DATE(sai.end_time) as endTime, DATEDIFF(IF(sai.end_time is null,CURDATE(),sai.end_time), sai.start_time) + 1 as leaseDays from slt_agreement_info sai LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id + LEFT JOIN back_apply_info bb on sai.back_id = bb.id LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id