From d8838f8e01c63cafa39fcc60989452cb8ad68150 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Wed, 15 Oct 2025 22:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/XzdCsContractChangeVo.java | 3 + .../impl/XzdCsContractChangeServiceImpl.java | 15 ++ ...urchaseContractInformationServiceImpl.java | 5 + .../controller/XzdJsCgJinduController.java | 2 +- .../controller/XzdJsCgJungonController.java | 2 +- .../XzdJsCgJungonEditController.java | 2 +- .../controller/XzdJsZhfwJinduController.java | 2 +- .../settlement/domain/XzdJsCgJungonEdit.java | 9 +- .../xzd/settlement/domain/XzdJsZhfwJindu.java | 7 + .../settlement/domain/bo/XzdJsCgJinduBo.java | 6 +- .../settlement/domain/bo/XzdJsCgJungonBo.java | 8 +- .../domain/bo/XzdJsCgJungonEditBo.java | 13 +- .../domain/bo/XzdJsZhfwJinduBo.java | 12 +- .../settlement/domain/vo/XzdJsCgJinduVo.java | 6 +- .../domain/vo/XzdJsCgJungonEditVo.java | 18 +- .../settlement/domain/vo/XzdJsCgJungonVo.java | 6 +- .../domain/vo/XzdJsZhfwJinduVo.java | 10 +- .../service/impl/XzdJsCgJinduServiceImpl.java | 82 ++++++++- .../impl/XzdJsCgJungonEditServiceImpl.java | 128 +++++++++++++- .../impl/XzdJsCgJungonServiceImpl.java | 165 +++++++++++++++++- .../impl/XzdJsZhfwJinduServiceImpl.java | 56 ++++++ 21 files changed, 518 insertions(+), 39 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java index 9c24fdb6..8ba4c07c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java @@ -172,18 +172,21 @@ public class XzdCsContractChangeVo implements Serializable { */ @ExcelProperty(value = "变更后项目经理") private Long afterChangeProjectManager; + private String afterChangeProjectManagerName; /** * 变更后项目责任人 */ @ExcelProperty(value = "变更后项目责任人") private Long afterChangeProjectLeader; + private String afterChangeProjectLeaderName; /** * 变更后现场经理 */ @ExcelProperty(value = "变更后现场经理") private Long afterChangeSiteManager; + private String afterChangeSiteManagerName; /** * 变更后合同备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java index 5ee34a13..a55c573c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.service.ISysUserService; import org.dromara.system.service.impl.SysDeptServiceImpl; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation; @@ -56,6 +57,8 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl 0; } + @Override + public String queryCodeById(Long id) { + return baseMapper.selectVoById(id).getContractCode(); + } + public void setValue(List infos){ for (XzdPurchaseContractInformationVo item : infos) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java index c3e34322..54335a28 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java @@ -61,7 +61,7 @@ public class XzdJsCgJinduController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("settlement:jsCgJindu:query") +// @SaCheckPermission("settlement:jsCgJindu:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java index 3b8a98fa..b67c261c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java @@ -61,7 +61,7 @@ public class XzdJsCgJungonController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("settlement:jsCgJungon:query") +// @SaCheckPermission("settlement:jsCgJungon:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index 2bd5a708..0867cecf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java @@ -61,7 +61,7 @@ public class XzdJsCgJungonEditController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("settlement:jsCgJungonEdit:query") +// @SaCheckPermission("settlement:jsCgJungonEdit:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java index 120ea8bf..fdc1dc76 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java @@ -61,7 +61,7 @@ public class XzdJsZhfwJinduController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("settlement:jsZhfwJindu:query") +// @SaCheckPermission("settlement:jsZhfwJindu:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJungonEdit.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJungonEdit.java index 5a08b92d..bfa32c79 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJungonEdit.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJungonEdit.java @@ -47,7 +47,7 @@ public class XzdJsCgJungonEdit extends BaseEntity { /** * 决算单号（带*，必填） */ - private String finalAccountCode; + private Long finalAccountCode; /** * 合同名称 @@ -57,7 +57,7 @@ public class XzdJsCgJungonEdit extends BaseEntity { /** * 合同编号 */ - private String contractCode; + private Long contractCode; /** * 调整后决算金额（带*，必填） @@ -89,5 +89,10 @@ public class XzdJsCgJungonEdit extends BaseEntity { */ private String procurementMode; + /** + * 文件ID + */ + private String fileId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsZhfwJindu.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsZhfwJindu.java index 4ef772f3..d62615b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsZhfwJindu.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsZhfwJindu.java @@ -1,5 +1,8 @@ package org.dromara.xzd.settlement.domain; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -63,6 +66,10 @@ public class XzdJsZhfwJindu extends BaseEntity { * 计量开始 */ private LocalDate measureStart; + /** + * 计量结束 + */ + private LocalDate measureEnd; /** * 审批金额 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJinduBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJinduBo.java index 4a028a1b..55c94d70 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJinduBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJinduBo.java @@ -35,7 +35,7 @@ public class XzdJsCgJinduBo extends BaseEntity { /** * 单据编码（带*，必填） */ - @NotBlank(message = "单据编码（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "单据编码（带*，必填）不能为空", groups = {EditGroup.class }) private String docCode; /** @@ -53,6 +53,7 @@ public class XzdJsCgJinduBo extends BaseEntity { /** * 合同编码（带查询，关联合同表） */ + @NotNull(message = "合同编码不能为空", groups = { AddGroup.class, EditGroup.class }) private Long contractCode; /** @@ -75,12 +76,13 @@ public class XzdJsCgJinduBo extends BaseEntity { /** * 项目（带*，必填） */ - @NotBlank(message = "项目（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "项目（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class }) private Long project; /** * 审批金额（默认0.00） */ + @NotNull(message = "审批金额不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal approveAmount; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonBo.java index b092d629..2849b567 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonBo.java @@ -8,8 +8,11 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; + import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; /** * 采购合同竣工结算业务对象 xzd_js_cg_jungon @@ -31,7 +34,7 @@ public class XzdJsCgJungonBo extends BaseEntity { /** * 单据编号（带*，必填） */ - @NotBlank(message = "单据编号（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "单据编号（带*，必填）不能为空", groups = {EditGroup.class }) private String docCode; /** @@ -49,6 +52,7 @@ public class XzdJsCgJungonBo extends BaseEntity { /** * 合同编号（带*，关联合同表） */ + @NotNull(message = "合同编号不能为空", groups = { AddGroup.class, EditGroup.class }) private Long contractCode; /** @@ -142,5 +146,7 @@ public class XzdJsCgJungonBo extends BaseEntity { */ private String fileId; + List kkyjlx; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonEditBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonEditBo.java index 595eca8d..6a91e0eb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonEditBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonEditBo.java @@ -8,8 +8,11 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; + import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; /** * 采购合同竣工结算调整业务对象 xzd_js_cg_jungon_edit @@ -31,7 +34,7 @@ public class XzdJsCgJungonEditBo extends BaseEntity { /** * 单据编号（带*，必填） */ - @NotBlank(message = "单据编号（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "单据编号（带*，必填）不能为空", groups = { EditGroup.class }) private String docCode; /** @@ -60,7 +63,7 @@ public class XzdJsCgJungonEditBo extends BaseEntity { /** * 合同编号 */ - private String contractCode; + private Long contractCode; /** * 调整后决算金额（带*，必填） @@ -94,5 +97,11 @@ public class XzdJsCgJungonEditBo extends BaseEntity { */ private String procurementMode; + /** + * 文件ID + */ + private String fileId; + + List kkyjlx; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsZhfwJinduBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsZhfwJinduBo.java index 5be284fc..84a4e75a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsZhfwJinduBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsZhfwJinduBo.java @@ -1,5 +1,6 @@ package org.dromara.xzd.settlement.domain.bo; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsZhfwJindu; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -10,6 +11,7 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; /** * 综合服务合同进度结算业务对象 xzd_js_zhfw_jindu @@ -31,7 +33,7 @@ public class XzdJsZhfwJinduBo extends BaseEntity { /** * 单据编码（带*，必填） */ - @NotBlank(message = "单据编码（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "单据编码（带*，必填）不能为空", groups = { EditGroup.class }) private String docCode; /** @@ -49,6 +51,7 @@ public class XzdJsZhfwJinduBo extends BaseEntity { /** * 合同编码 */ + @NotNull(message = "合同编码不能为空", groups = { AddGroup.class, EditGroup.class }) private Long contractCode; /** @@ -65,7 +68,13 @@ public class XzdJsZhfwJinduBo extends BaseEntity { /** * 计量开始 */ + @NotNull(message = "计量开始不能为空", groups = { AddGroup.class, EditGroup.class }) private LocalDate measureStart; + /** + * 计量结束 + */ + @NotNull(message = "计量结束不能为空", groups = { AddGroup.class, EditGroup.class }) + private LocalDate measureEnd; /** * 审批金额 @@ -157,5 +166,6 @@ public class XzdJsZhfwJinduBo extends BaseEntity { */ private String fileId; + List kkyjlx; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJinduVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJinduVo.java index 0e0a1712..534282eb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJinduVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJinduVo.java @@ -8,12 +8,13 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.util.Date; - +import java.util.List; /** @@ -63,6 +64,7 @@ public class XzdJsCgJinduVo implements Serializable { @ExcelProperty(value = "合同编码", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "带=查询，关联合同表") private Long contractCode; + private String contractCodeName; /** * 合同名称（关联合同后显示） @@ -218,5 +220,5 @@ public class XzdJsCgJinduVo implements Serializable { @ExcelProperty(value = "文件ID") private String fileId; - + List kkyjlx; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonEditVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonEditVo.java index c15d1b93..3b420dfa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonEditVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonEditVo.java @@ -8,12 +8,13 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.util.Date; - +import java.util.List; /** @@ -62,7 +63,7 @@ public class XzdJsCgJungonEditVo implements Serializable { */ @ExcelProperty(value = "决算单号", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "带=*，必填") - private String finalAccountCode; + private Long finalAccountCode; /** * 合同名称 @@ -74,7 +75,9 @@ public class XzdJsCgJungonEditVo implements Serializable { * 合同编号 */ @ExcelProperty(value = "合同编号") - private String contractCode; + private Long contractCode; + private String contractCodeName; + /** * 调整后决算金额（带*，必填） @@ -89,12 +92,14 @@ public class XzdJsCgJungonEditVo implements Serializable { @ExcelProperty(value = "工程项目", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "带=*，必填") private Long projectId; + private String projectName; /** * 默认财务组织 */ @ExcelProperty(value = "默认财务组织") private Long defaultFinanceOrg; + private String defaultFinanceOrgName; /** * 调整说明 @@ -114,5 +119,12 @@ public class XzdJsCgJungonEditVo implements Serializable { @ExcelProperty(value = "集采模式") private String procurementMode; + /** + * 文件ID + */ + private String fileId; + + List kkyjlx; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java index 03c74884..b0c400c3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java @@ -8,12 +8,13 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.util.Date; - +import java.util.List; /** @@ -63,6 +64,7 @@ public class XzdJsCgJungonVo implements Serializable { @ExcelProperty(value = "合同编号", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "带=*，关联合同表") private Long contractCode; + private String contractCodeName; /** * 合同名称（关联合同后显示） @@ -186,5 +188,7 @@ public class XzdJsCgJungonVo implements Serializable { @ExcelProperty(value = "文件ID") private String fileId; + List kkyjlx; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsZhfwJinduVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsZhfwJinduVo.java index dce075ff..f77ab1f5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsZhfwJinduVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsZhfwJinduVo.java @@ -1,6 +1,8 @@ package org.dromara.xzd.settlement.domain.vo; import java.math.BigDecimal; + +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.domain.XzdJsZhfwJindu; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -13,7 +15,7 @@ import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.util.Date; - +import java.util.List; /** @@ -82,6 +84,11 @@ public class XzdJsZhfwJinduVo implements Serializable { @ExcelProperty(value = "计量开始") private LocalDate measureStart; + /** + * 计量结束 + */ + private LocalDate measureEnd; + /** * 审批金额 */ @@ -192,5 +199,6 @@ public class XzdJsZhfwJinduVo implements Serializable { @ExcelProperty(value = "文件ID") private String fileId; + List kkyjlx; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java index fa55e401..df315fdd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java @@ -12,7 +12,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; +import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractChangeVo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractInformationVo; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; import org.dromara.xzd.domain.XzdSettlementRules; @@ -31,10 +34,9 @@ import org.dromara.xzd.settlement.domain.vo.XzdJsCgJinduVo; import org.dromara.xzd.settlement.domain.XzdJsCgJindu; import org.dromara.xzd.settlement.mapper.XzdJsCgJinduMapper; import org.dromara.xzd.settlement.service.IXzdJsCgJinduService; +import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 采购合同进度结算Service业务层处理 @@ -48,11 +50,20 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); @@ -167,9 +180,24 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl().eq(XzdJsDeductionItems::getMainDocId, update.getId())); + //生成奖励与扣款数据 + String tableName = XzdClassEnum.JS_CG_JINDU.getClassName(); + if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { + throw new ServiceException("扣款与奖励项不能为空"); + } + //合同条款-扣款与奖励项 + for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) { + kkyjlx.setTableName(tableName); + kkyjlx.setMainDocId(update.getId()); + } + //新增奖励与扣款数据 + deductionItemsService.saveBatch(bo.getKkyjlx()); return baseMapper.updateById(update) > 0; } @@ -188,10 +216,26 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } + List deleteIds = new ArrayList<>(); + for (Long id : ids) { + XzdJsCgJinduVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + deleteIds.addAll(list); + } + } + } + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } + deductionItemsService.remove(new LambdaQueryWrapper().in(XzdJsDeductionItems::getMainDocId, ids)); return baseMapper.deleteByIds(ids) > 0; } @@ -207,12 +251,32 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl dtoR = iXzdCorrespondentList.getCustomerByid(item.getSettlementUnit()); - if (dtoR!=null){ - if (dtoR.getData().getXzdCustomerinformation() != null){ - item.setSettlementUnitName(dtoR.getData().getXzdCustomerinformation().getUnitName()); + if (item.getSettlementUnit() != null){ + String name = iXzdCorrespondentList.queryNameById(item.getSettlementUnit()); + if (name!=null){ + item.setSettlementUnitName(name); + } } } + + /** + * 获取结算扣款与奖励项内容 + * @param vo + */ + private void getHttk(XzdJsCgJinduVo vo) { + //结算扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + List list = deductionItemsService.list(lambdaQueryWrapper2); + vo.setKkyjlx(list); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java index c0a1d14c..99c93622 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.xzd.settlement.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -9,6 +10,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.utils.BatchNumberGenerator; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.service.impl.SysDeptServiceImpl; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.service.IXzdCorrespondentList; +import org.dromara.xzd.service.impl.XzdProjectServiceImpl; +import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJinduVo; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo; +import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonEditBo; import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonEditVo; @@ -16,9 +31,7 @@ import org.dromara.xzd.settlement.domain.XzdJsCgJungonEdit; import org.dromara.xzd.settlement.mapper.XzdJsCgJungonEditMapper; import org.dromara.xzd.settlement.service.IXzdJsCgJungonEditService; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 采购合同竣工结算调整Service业务层处理 @@ -32,6 +45,23 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl queryPageList(XzdJsCgJungonEditBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::getName); return TableDataInfo.build(result); } @@ -66,7 +100,9 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl queryList(XzdJsCgJungonEditBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + List vos = baseMapper.selectVoList(lqw); + vos.forEach(this::getName); + return vos; } private LambdaQueryWrapper buildQueryWrapper(XzdJsCgJungonEditBo bo) { @@ -78,7 +114,7 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); } + String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName(); + if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { + throw new ServiceException("扣款与奖励项不能为空"); + } + //合同条款-扣款与奖励项 + for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) { + kkyjlx.setTableName(tableName); + kkyjlx.setMainDocId(add.getId()); + } + deductionItemsService.saveBatch(bo.getKkyjlx()); return flag; } @@ -114,6 +162,20 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl().eq(XzdJsDeductionItems::getMainDocId, update.getId())); + //生成奖励与扣款数据 + String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName(); + if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { + throw new ServiceException("扣款与奖励项不能为空"); + } + //合同条款-扣款与奖励项 + for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) { + kkyjlx.setTableName(tableName); + kkyjlx.setMainDocId(update.getFinalAccountCode()); + } + //新增奖励与扣款数据 + deductionItemsService.saveBatch(bo.getKkyjlx()); return baseMapper.updateById(update) > 0; } @@ -136,6 +198,60 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl deleteIds = new ArrayList<>(); + for (Long id : ids) { + XzdJsCgJungonEditVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + deleteIds.addAll(list); + } + } + } + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 获取部分字段名称 + * @param item + */ + private void getName(XzdJsCgJungonEditVo item) { + //项目名称 + if (item.getProjectId() != null){ + String projectName = xzdProjectService.queryNameById(item.getProjectId()); + if (projectName != null){ + item.setProjectName(projectName); + } + } + //合同编码 + if (item.getContractCode() != null){ + String code = xzdPurchaseContractInformationService.queryCodeById(item.getContractCode()); + if (code != null){ + item.setContractCodeName(code); + } + } + //部门名称 + if (item.getDefaultFinanceOrg() != null){ + SysDeptVo sysDeptVo = sysDeptService.selectDeptById(item.getDefaultFinanceOrg()); + if (sysDeptVo != null){ + item.setDefaultFinanceOrgName(sysDeptVo.getDeptName()); + } + } + } + + /** + * 获取扣款与奖励项 + * @param vo + */ + private void getHttk(XzdJsCgJungonEditVo vo) { + //结算扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + List list = deductionItemsService.list(lambdaQueryWrapper2); + vo.setKkyjlx(list); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java index 71360c22..e6b2102f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.xzd.settlement.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -9,16 +10,26 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.utils.BatchNumberGenerator; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; +import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.service.IXzdCorrespondentList; +import org.dromara.xzd.service.impl.XzdProjectServiceImpl; +import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJinduVo; +import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.xzd.settlement.domain.bo.XzdJsCgJungonBo; import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo; import org.dromara.xzd.settlement.domain.XzdJsCgJungon; import org.dromara.xzd.settlement.mapper.XzdJsCgJungonMapper; import org.dromara.xzd.settlement.service.IXzdJsCgJungonService; +import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 采购合同竣工结算Service业务层处理 @@ -32,6 +43,24 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl queryPageList(XzdJsCgJungonBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::getName); return TableDataInfo.build(result); } @@ -66,7 +99,9 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl queryList(XzdJsCgJungonBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + List vos = baseMapper.selectVoList(lqw); + vos.forEach(this::getName); + return vos; } private LambdaQueryWrapper buildQueryWrapper(XzdJsCgJungonBo bo) { @@ -104,13 +139,27 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); } + + String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName(); + if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { + throw new ServiceException("扣款与奖励项不能为空"); + } + //合同条款-扣款与奖励项 + for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) { + kkyjlx.setTableName(tableName); + kkyjlx.setMainDocId(add.getId()); + } + deductionItemsService.saveBatch(bo.getKkyjlx()); return flag; } @@ -121,9 +170,24 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl().eq(XzdJsDeductionItems::getMainDocId, update.getId())); + //生成奖励与扣款数据 + String tableName = XzdClassEnum.JS_CG_JINDU.getClassName(); + if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) { + throw new ServiceException("扣款与奖励项不能为空"); + } + //合同条款-扣款与奖励项 + for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) { + kkyjlx.setTableName(tableName); + kkyjlx.setMainDocId(update.getId()); + } + //新增奖励与扣款数据 + deductionItemsService.saveBatch(bo.getKkyjlx()); return baseMapper.updateById(update) > 0; } @@ -142,10 +206,101 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } + List deleteIds = new ArrayList<>(); + for (Long id : ids) { + XzdJsCgJungonVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + deleteIds.addAll(list); + } + } + } + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } + deductionItemsService.remove(new LambdaQueryWrapper().in(XzdJsDeductionItems::getMainDocId, ids)); return baseMapper.deleteByIds(ids) > 0; } + + /** + * 获取部分字段名称 + * @param item + */ + private void getName(XzdJsCgJungonVo item) { + //项目名称 + if (item.getProjectId() != null){ + String projectName = xzdProjectService.queryNameById(item.getProjectId()); + if (projectName != null){ + item.setProjectName(projectName); + } + } + if (item.getContractCode() != null){ + String code = xzdPurchaseContractInformationService.queryCodeById(item.getContractCode()); + if (code != null){ + item.setContractCodeName(code); + } + } + //甲方单位(客户信息列表) + if (item.getPartyA() != null){ + String byid = iXzdCorrespondentList.queryNameById(item.getPartyA()); + if (byid!=null){ + item.setPartyAName(byid); + } + } + //乙方单位(供应商信息列表) + if (item.getPartyB() != null){ + String unitName = xzdSupplierInfoService.queryNameById(item.getPartyB()); + if (unitName != null){ + + item.setPartyBName(unitName); + } + } + //业主单位(客户信息列表) + if (item.getOwnerUnit() != null){ + String byid = iXzdCorrespondentList.queryNameById(item.getOwnerUnit()); + if (byid!=null){ + item.setOwnerUnitName(byid); + } + } + //监理单位(客户信息列表) + if (item.getSupervisionUnit() != null){ + String byid = iXzdCorrespondentList.queryNameById(item.getSupervisionUnit()); + if (byid!=null){ + item.setSupervisionUnitName(byid); + } + } + //施工单位(客户信息列表) + if (item.getConstructionUnit() != null){ + String byid = iXzdCorrespondentList.queryNameById(item.getConstructionUnit()); + if (byid!=null){ + item.setConstructionUnitName(byid); + } + } + //审核单位(客户信息列表) + if (item.getAuditUnit() != null){ + String byid = iXzdCorrespondentList.queryNameById(item.getAuditUnit()); + if (byid!=null){ + item.setAuditUnitName(byid); + } + } + } + + /** + * 获取扣款与奖励项 + * @param vo + */ + private void getHttk(XzdJsCgJungonVo vo) { + //结算扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + List list = deductionItemsService.list(lambdaQueryWrapper2); + vo.setKkyjlx(list); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java index 168fdd5b..707d6a53 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java @@ -9,6 +9,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.service.impl.SysDeptServiceImpl; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.service.impl.XzdProjectServiceImpl; +import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; +import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonEditVo; +import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.xzd.settlement.domain.bo.XzdJsZhfwJinduBo; import org.dromara.xzd.settlement.domain.vo.XzdJsZhfwJinduVo; @@ -32,6 +40,20 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl 0; } + + + /** + * 获取部分字段名称 + * @param item + */ +// private void getName(XzdJsZhfwJinduVo item) { +// //项目名称 +// if (item.getProjectId() != null){ +// String projectName = xzdProjectService.queryNameById(item.getProjectId()); +// if (projectName != null){ +// item.setProjectName(projectName); +// } +// } +// //部门名称 +// if (item.getDefaultFinanceOrg() != null){ +// SysDeptVo sysDeptVo = sysDeptService.selectDeptById(item.getDefaultFinanceOrg()); +// if (sysDeptVo != null){ +// item.setDefaultFinanceOrgName(sysDeptVo.getDeptName()); +// } +// } +// } + + /** + * 获取扣款与奖励项 + * @param vo + */ + private void getHttk(XzdJsZhfwJinduVo vo) { + //结算扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); + List list = deductionItemsService.list(lambdaQueryWrapper2); + vo.setKkyjlx(list); + } }