From 091bd6a9292b488d93b74be12802505ed0f0c961 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 14 Mar 2025 19:25:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/res/purchase/PurContractEntityResponse.java | 6 ++++++ .../resources/mybatis/mapper/purchase/PurContractMapper.xml | 4 +++- src/main/resources/schemas/schema_v2.4.sql | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/res/purchase/PurContractEntityResponse.java b/src/main/java/com/glxp/api/res/purchase/PurContractEntityResponse.java index 5b9619e2a..a8dd401cd 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurContractEntityResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurContractEntityResponse.java @@ -41,6 +41,12 @@ public class PurContractEntityResponse implements Serializable { @TableField(value = "fromCorp") private String fromCorp; + /** + * 往来单位/供应商 + */ + private String fromCorpName; + private String invCodeName; + /** * 合同签订日期 */ diff --git a/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml b/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml index 789e1fdc7..4e5758226 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml @@ -94,8 +94,10 @@ pc.id, pc.code, pc.`name`, pc.fromCorp, pc.contractDate, pc.invCode, pc.`type`, pc.payType, pc.startDate, pc.endDate, pc.amount, pc.payAmount, pc.payDate, pc.invoiceDate, pc.planOrderIdFk, pc.orderIdFk, pc.`createUser`, pc.updateUser, pc.createTime, pc.updateTime, pc.remark,pc.approvalFlowId,pc.isGenerateOrder,IFNULL(pc.status,0) as status, - saf.status as flowStatus, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType + saf.status as flowStatus, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType,bc.name as fromCorpName,aw.name AS invCodeName from pur_contract pc + left join basic_corp bc on pc.fromCorp = bc.erpId + left join auth_warehouse aw on pc.invCode = aw.code left join sys_approval_flow saf ON pc.approvalFlowId = saf.id pc.code is not null diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 69f6d5b85..8ec32530e 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2583,7 +2583,7 @@ CREATE TABLE IF NOT EXISTS `pur_contract` `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '当前仓库', `status` int(0) NULL DEFAULT NULL COMMENT '合同状态', `type` int(0) NULL DEFAULT NULL COMMENT '合同类型', - `payType` int(0) NULL DEFAULT NULL COMMENT '付款方式', + `payType` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '付款方式', `startDate` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', `endDate` datetime(0) NULL DEFAULT NULL COMMENT '截止时间', `amount` decimal(10, 3) NULL DEFAULT NULL COMMENT '合同金额',