From 987c4eeb38e6af879a8b444300da59fd8f55c1e6 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Tue, 12 Aug 2025 09:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=EF=BC=8C=E9=A1=B9=E7=9B=AEid?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dite/znpt/domain/entity/ContractEntity.java | 8 ++++---- .../java/com/dite/znpt/domain/vo/ContractListReq.java | 4 ++-- .../main/java/com/dite/znpt/domain/vo/ContractReq.java | 4 ++-- .../main/java/com/dite/znpt/domain/vo/ContractResp.java | 3 --- .../com/dite/znpt/service/impl/ContractServiceImpl.java | 8 +++++++- core/src/main/resources/mapper/ContractMapper.xml | 9 ++++----- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java index e33d747..cc70a24 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java @@ -45,10 +45,10 @@ public class ContractEntity extends AuditableEntity implements Serializable { @TableField("code") private String code; - @ExcelProperty("项目id") - @ApiModelProperty("项目id") - @TableField("project_id") - private String projectId; + @ExcelProperty("项目名称") + @ApiModelProperty("项目名称") + @TableField("project_name") + private String projectName; @ExcelProperty("业务员id") @ApiModelProperty("业务员id") diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java index facfb38..905971f 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java @@ -32,8 +32,8 @@ public class ContractListReq implements Serializable { @ApiModelProperty("合同编号") private String code; - @ApiModelProperty("项目id") - private String projectId; + @ApiModelProperty("项目名称") + private String projectName; @ApiModelProperty("业务员id") private String salespersonId; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java index e6030cb..06e760a 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java @@ -31,8 +31,8 @@ public class ContractReq implements Serializable { @ApiModelProperty("合同编号") private String code; - @ApiModelProperty("项目id") - private String projectId; + @ApiModelProperty("项目名称") + private String projectName; @ApiModelProperty("业务员id") private String salespersonId; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ContractResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ContractResp.java index a1f4ff0..e3c8e0a 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ContractResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ContractResp.java @@ -18,9 +18,6 @@ import java.math.BigDecimal; @ApiModel("合同响应实体") public class ContractResp extends ContractEntity { - @ApiModelProperty("项目名称") - private String projectName; - @ApiModelProperty("业务员姓名") private String salespersonName; diff --git a/core/src/main/java/com/dite/znpt/service/impl/ContractServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ContractServiceImpl.java index 8794210..73d183b 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ContractServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ContractServiceImpl.java @@ -4,15 +4,18 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dite.znpt.domain.entity.ContractEntity; +import com.dite.znpt.domain.entity.ContractSettlementEntity; import com.dite.znpt.domain.vo.ContractListReq; import com.dite.znpt.domain.vo.ContractReq; import com.dite.znpt.domain.vo.ContractResp; import com.dite.znpt.enums.ContractStatusEnum; import com.dite.znpt.mapper.ContractMapper; import com.dite.znpt.service.ContractService; +import com.dite.znpt.service.ContractSettlementService; import com.dite.znpt.util.PageUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -25,6 +28,8 @@ import java.util.List; @RequiredArgsConstructor public class ContractServiceImpl extends ServiceImpl implements ContractService { + private final ContractSettlementService contractSettlementService; + /** * 功能描述：查询合同列表 * @@ -96,9 +101,10 @@ public class ContractServiceImpl extends ServiceImpl - a.contract_id, a.customer, a.code, a.project_id, + a.contract_id, a.customer, a.code, a.project_name, a.salesperson_id, a.department_id, a.sign_date, a.duration, a.type, a.product_service, a.payment_date, a.payment_address, a.amount, a.account_number, a.notes, a.contract_status, @@ -14,11 +14,10 @@ select , u.name as salespersonName, d.dept_name as salespersonDeptName, - p.project_name, (select sum(cs.amount) from contract_settlement cs where a.contract_id=cs.contract_id) as settlementAmount + (select sum(cs.amount) from contract_settlement cs where a.contract_id=cs.contract_id) as settlementAmount from contract a left join user u on a.salesperson_id = u.user_id left join dept d on a.department_id=d.dept_id - left join project p on a.project_id=p.project_id and a.contract_id like concat ('%', #{contractId}, '%') @@ -29,8 +28,8 @@ and a.code like concat ('%', #{code}, '%') - - and a.project_id like concat ('%', #{projectId}, '%') + + and a.project_name like concat ('%', #{projectName}, '%') and a.salesperson_id like concat ('%', #{salespersonId}, '%')