lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

综合服务进度、采购进度、竣工、竣工调整添加底部计量结算内容

Browse Source
This commit is contained in:
dfdg
2025-10-20 20:07:40 +08:00
parent fce5d0e7fc
commit a464a1236d
31 changed files with 2467 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java
View File

@ -165,4 +165,6 @@ public interface ISysDeptService {
int deleteDeptById(Long deptId);
List<SysDeptVo> querListDept();
String selectDeptNameById(Long id);
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
View File

@ -538,6 +538,11 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
return sysDeptVos;
}
@Override
public String selectDeptNameById(Long id) {
return baseMapper.selectById(id).getDeptName();
}
/**
* 获取当前部门的祖先ID、自己ID、以及所有祖先的“同级部门ID”
*

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java
View File

@ -142,9 +142,9 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
private void getName(XzdCsContractInformationVo item) {
//部门名称
if (item.getDepartmentId() != null){
SysDeptVo sysDeptVo = sysDeptService.selectDeptById(item.getDepartmentId());
if (sysDeptVo != null){
item.setDepartmentName(sysDeptVo.getDeptName());
String deptName = sysDeptService.selectDeptNameById(item.getDepartmentId());
if (deptName != null){
item.setDepartmentName(deptName);
}
}
//项目名称

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/XzdClassEnum.java
View File

@ -11,6 +11,7 @@ public enum XzdClassEnum {
CS_CONTRACT_CHANGE("xzd_cs_contract_change"), //综合服务合同变更
JS_ZHFW_JINDU("xzd_js_zhfw_jindu"), //综合服务合同进度结算
JS_CG_JUNGON("xzd_js_cg_jungon"), //采购合同竣工结算
XZD_JS_CG_JUNGON_EDIT("xzd_js_cg_jungon_edit"), //采购合同竣工结算
JS_CG_JINDU("xzd_js_cg_jindu"), //采购合同进度结算
FENBAOHETONG_INFORMATION("xzd_subcontract"),//分包合同
FENBAOHETONGBINGGENG_INFORMATION("xzd_subcontract_change"),//分包合同变更

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java
View File

@ -6,6 +6,8 @@ public enum ZxdEnum {
TYPE_CORRESPONDENT("客户","1"),
TYPE_SUPPLIER("供应商","2"),
FENBAOHET("分包合同","2"),
CAIGOUHET("采购合同","3"),
ZONHEFUWUHET("综合服务合同","4"),
HETONGLEIXING("合同外清单","1"),
HETONGLEIXINGNEI("合同内清单","2"),
PURCHASE_PREFIX("采购合同信息前缀","CCTEG(CWZ)"),

182
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCghtCgrkqd.java Normal file
View File

@ -0,0 +1,182 @@
package org.dromara.xzd.settlement.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serial;
/**
* 结算-采购合同进度结算-采购入库清单对象 xzd_js_cght_cgrkqd
*
* @author Lion Li
* @date 2025-10-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("xzd_js_cght_cgrkqd")
public class XzdJsCghtCgrkqd extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 主表id
*/
private Long mainDocId;
/**
* 编码
*/
private String code;
/**
* 合同清单名称
*/
private String contractName;
/**
* 项目名称
*/
private String projectName;
/**
* 资源编码
*/
private String resourceCode;
/**
* 资源名称
*/
private String resourceName;
/**
* 规格
*/
private String specification;
/**
* 品牌
*/
private String brand;
/**
* 计量单位
*/
private String unit;
/**
* 单价
*/
private BigDecimal price;
/**
* 含税单价
*/
private BigDecimal taxIncludedPrice;
/**
* 累计入库数量
*/
private BigDecimal cumulativeInventoryQuantity;
/**
* 累计退货数量
*/
private BigDecimal cumulativeIssueQuantity;
/**
* 累计实际入库数量
*/
private BigDecimal cumulativeActualInventoryQuantity;
/**
* 本期结算数量
*/
private BigDecimal currentIssueQuantity;
/**
* 本期结算不含税金额
*/
private BigDecimal currentIssueInvalidQuantity;
/**
* 本期审批数量
*/
private BigDecimal currentApprovedQuantity;
/**
* 本期结算金额
*/
private BigDecimal currentIssueAmount;
/**
* 本期结算本币金额
*/
private BigDecimal currentIssueAmountInCurrency;
/**
* 本期审批金额
*/
private BigDecimal currentIssueTaxAmount;
/**
* 税率
*/
private BigDecimal taxRate;
/**
* 税额
*/
private BigDecimal taxAmount;
/**
* WBS
*/
private String wbs;
/**
* CBS
*/
private String cbs;
/**
* 引用来源
*/
private String source;
/**
* 进度完成百分比
*/
private BigDecimal selectionCompletionPercentage;
/**
* CBS预算总额
*/
private BigDecimal cbsBudgetTotal;
/**
* CBS余额
*/
private BigDecimal cbsBalance;
/**
* 备注
*/
private String remark;
/**
* 合同累计签订成本预算金额
*/
private BigDecimal costBudgetAmount;
}

296
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCghtJstzqd.java Normal file
View File

@ -0,0 +1,296 @@
package org.dromara.xzd.settlement.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.io.Serial;
/**
* 采购合同竣工结算-决算清单（调整）对象 xzd_js_cght_jstzqd
*
* @author Lion Li
* @date 2025-10-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("xzd_js_cght_jstzqd")
public class XzdJsCghtJstzqd extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 主表id
*/
private Long mainDocId;
/**
* 类型 1决算清单 2决算清单调整
*/
private String type;
/**
* 编码
*/
private String code;
/**
* 合同清单名称
*/
private String contractListName;
/**
* 项目名称
*/
private String projectName;
/**
* 资源编码
*/
private String resourceCode;
/**
* 资源名称
*/
private String resourceName;
/**
* 资源别名
*/
private String resourceAlias;
/**
* 清单编号
*/
private String listNumber;
/**
* 工程量清单名称
*/
private String engineeringListName;
/**
* 原规格
*/
private String originalSpecification;
/**
* 规格
*/
private String specification;
/**
* 原工程量类型
*/
private String originalEngineeringType;
/**
* 工程量类型
*/
private String engineeringType;
/**
* 计量单位
*/
private String unit;
/**
* 原决算数量
*/
private BigDecimal originalBudgetQuantity;
/**
* 原决算单价
*/
private BigDecimal originalBudgetUnitPrice;
/**
* 原决算含税单价
*/
private BigDecimal originalBudgetTaxUnitPrice;
/**
* 原决算金额
*/
private BigDecimal originalBudgetAmount;
/**
* 原本币决算金额
*/
private BigDecimal originalBudgetLocalCurrencyAmount;
/**
* 原决算价税合计
*/
private BigDecimal originalBudgetTaxAmount;
/**
* 原本币价税合计
*/
private BigDecimal originalBudgetLocalCurrencyTaxAmount;
/**
* 原税率
*/
private BigDecimal originalTaxRate;
/**
* 原决算税额
*/
private BigDecimal originalTaxAmount;
/**
* 调整后决算数量
*/
private BigDecimal adjustedBudgetQuantity;
/**
* 调整后决算单价
*/
private BigDecimal adjustedBudgetUnitPrice;
/**
* 调整后决算含税单价
*/
private BigDecimal adjustedBudgetTaxUnitPrice;
/**
* 调整后决算金额
*/
private BigDecimal adjustedBudgetAmount;
/**
* 调整后本币金额
*/
private BigDecimal adjustedBudgetLocalCurrencyAmount;
/**
* 调整后决算价税合计
*/
private BigDecimal adjustedBudgetTaxAmount;
/**
* 调整后本币价税合计
*/
private BigDecimal adjustedBudgetLocalCurrencyTaxAmount;
/**
* 调整后税率
*/
private BigDecimal adjustedTaxRate;
/**
* 调整后税额
*/
private BigDecimal adjustedTaxAmount;
/**
* 项目特征
*/
private String projectFeature;
/**
* 送审造价
*/
private BigDecimal selectedAuditCost;
/**
* 本币送审造价
*/
private BigDecimal localCurrencySelectedAuditCost;
/**
* 审定造价
*/
private BigDecimal approvedCost;
/**
* 本币审定造价
*/
private BigDecimal localCurrencyApprovedCost;
/**
* 累计结算
*/
private BigDecimal cumulativeSettlement;
/**
* 决算与结算差额
*/
private BigDecimal finalSettlementDifference;
/**
* 浮动百分比
*/
private BigDecimal floatingPercentage;
/**
* 原WBS
*/
private String originalWbs;
/**
* WBS
*/
private String wbs;
/**
* 原CBS
*/
private String originalCbs;
/**
* CBS
*/
private String cbs;
/**
* 成本预算总额
*/
private Long costBudgetTotal;
/**
* 合同累计签订成本预算金额
*/
private Long contractCumulativeSignedCostBudgetAmount;
/**
* 成本预算余额
*/
private Long costBudgetBalance;
/**
* 数据来源
*/
private String dataSource;
/**
* 备注
*/
private String remark;
/**
* 事物特性
*/
private String objectCharacteristics;
/**
* 辅助项1
*/
private String auxiliaryItem1;
/**
* 辅助项2
*/
private String auxiliaryItem2;
/**
* 辅助项3
*/
private String auxiliaryItem3;
}

26
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJinduBo.java
View File

@ -1,7 +1,7 @@
package org.dromara.xzd.settlement.domain.bo;
import org.dromara.xzd.domain.XzdDeductionItems;
import org.dromara.xzd.settlement.domain.XzdJsCgJindu;
import org.dromara.xzd.settlement.domain.*;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@ -9,7 +9,6 @@ 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;
@ -171,7 +170,30 @@ public class XzdJsCgJinduBo extends BaseEntity {
*/
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 合同内清单
*/
List<XzdContractInventory> htnqd;
/**
* 变更增加清单
*/
List<XzdAlterationInventory> bgzjqd;
/**
* 合同外清单
*/
List<XzdContractInventory> htwqd;
/**
* 采购入库清单
*/
List<XzdJsCghtCgrkqd> cgrkqd;
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonBo.java
View File

@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import java.math.BigDecimal;
@ -146,7 +147,14 @@ public class XzdJsCgJungonBo extends BaseEntity {
*/
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 决算清单
*/
List<XzdJsCghtJstzqd> jsqd;
}

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonEditBo.java
View File

@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import java.math.BigDecimal;
@ -52,7 +53,7 @@ public class XzdJsCgJungonEditBo extends BaseEntity {
/**
* 决算单号（带*，必填）
*/
@NotBlank(message = "决算单号（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "决算单号（带*，必填）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long finalAccountCode;
/**
@ -102,6 +103,14 @@ public class XzdJsCgJungonEditBo extends BaseEntity {
*/
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 决算调整清单
*/
List<XzdJsCghtJstzqd> jstzqd;
}

187
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCghtCgrkqdBo.java Normal file
View File

@ -0,0 +1,187 @@
package org.dromara.xzd.settlement.domain.bo;
import org.dromara.xzd.settlement.domain.XzdJsCghtCgrkqd;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 结算-采购合同进度结算-采购入库清单业务对象 xzd_js_cght_cgrkqd
*
* @author Lion Li
* @date 2025-10-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdJsCghtCgrkqd.class, reverseConvertGenerate = false)
public class XzdJsCghtCgrkqdBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 主表id
*/
// @NotNull(message = "主表id不能为空", groups = { EditGroup.class })
private Long mainDocId;
/**
* 编码
*/
private String code;
/**
* 合同清单名称
*/
private String contractName;
/**
* 项目名称
*/
private String projectName;
/**
* 资源编码
*/
private String resourceCode;
/**
* 资源名称
*/
private String resourceName;
/**
* 规格
*/
private String specification;
/**
* 品牌
*/
private String brand;
/**
* 计量单位
*/
private String unit;
/**
* 单价
*/
private BigDecimal price;
/**
* 含税单价
*/
// @NotNull(message = "含税单价不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal taxIncludedPrice;
/**
* 累计入库数量
*/
private BigDecimal cumulativeInventoryQuantity;
/**
* 累计退货数量
*/
private BigDecimal cumulativeIssueQuantity;
/**
* 累计实际入库数量
*/
private BigDecimal cumulativeActualInventoryQuantity;
/**
* 本期结算数量
*/
// @NotNull(message = "本期结算数量不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal currentIssueQuantity;
/**
* 本期结算不含税金额
*/
private BigDecimal currentIssueInvalidQuantity;
/**
* 本期审批数量
*/
// @NotNull(message = "本期审批数量不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal currentApprovedQuantity;
/**
* 本期结算金额
*/
// @NotNull(message = "本期结算金额不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal currentIssueAmount;
/**
* 本期结算本币金额
*/
private BigDecimal currentIssueAmountInCurrency;
/**
* 本期审批金额
*/
// @NotNull(message = "本期审批金额不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal currentIssueTaxAmount;
/**
* 税率
*/
private BigDecimal taxRate;
/**
* 税额
*/
private BigDecimal taxAmount;
/**
* WBS
*/
private String wbs;
/**
* CBS
*/
private String cbs;
/**
* 引用来源
*/
private String source;
/**
* 进度完成百分比
*/
private BigDecimal selectionCompletionPercentage;
/**
* CBS预算总额
*/
private BigDecimal cbsBudgetTotal;
/**
* CBS余额
*/
private BigDecimal cbsBalance;
/**
* 备注
*/
private String remark;
/**
* 合同累计签订成本预算金额
*/
private BigDecimal costBudgetAmount;
}

296
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCghtJstzqdBo.java Normal file
View File

@ -0,0 +1,296 @@
package org.dromara.xzd.settlement.domain.bo;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 采购合同竣工结算-决算清单（调整）业务对象 xzd_js_cght_jstzqd
*
* @author Lion Li
* @date 2025-10-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdJsCghtJstzqd.class, reverseConvertGenerate = false)
public class XzdJsCghtJstzqdBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 主表id
*/
// @NotNull(message = "主表id不能为空", groups = { EditGroup.class })
private Long mainDocId;
/**
* 类型 1决算清单 2决算清单调整
*/
private String type;
/**
* 编码
*/
private String code;
/**
* 合同清单名称
*/
private String contractListName;
/**
* 项目名称
*/
private String projectName;
/**
* 资源编码
*/
private String resourceCode;
/**
* 资源名称
*/
private String resourceName;
/**
* 资源别名
*/
private String resourceAlias;
/**
* 清单编号
*/
private String listNumber;
/**
* 工程量清单名称
*/
private String engineeringListName;
/**
* 原规格
*/
private String originalSpecification;
/**
* 规格
*/
private String specification;
/**
* 原工程量类型
*/
private String originalEngineeringType;
/**
* 工程量类型
*/
private String engineeringType;
/**
* 计量单位
*/
private String unit;
/**
* 原决算数量
*/
private BigDecimal originalBudgetQuantity;
/**
* 原决算单价
*/
private BigDecimal originalBudgetUnitPrice;
/**
* 原决算含税单价
*/
private BigDecimal originalBudgetTaxUnitPrice;
/**
* 原决算金额
*/
private BigDecimal originalBudgetAmount;
/**
* 原本币决算金额
*/
private BigDecimal originalBudgetLocalCurrencyAmount;
/**
* 原决算价税合计
*/
private BigDecimal originalBudgetTaxAmount;
/**
* 原本币价税合计
*/
private BigDecimal originalBudgetLocalCurrencyTaxAmount;
/**
* 原税率
*/
private BigDecimal originalTaxRate;
/**
* 原决算税额
*/
private BigDecimal originalTaxAmount;
/**
* 调整后决算数量
*/
private BigDecimal adjustedBudgetQuantity;
/**
* 调整后决算单价
*/
private BigDecimal adjustedBudgetUnitPrice;
/**
* 调整后决算含税单价
*/
private BigDecimal adjustedBudgetTaxUnitPrice;
/**
* 调整后决算金额
*/
private BigDecimal adjustedBudgetAmount;
/**
* 调整后本币金额
*/
private BigDecimal adjustedBudgetLocalCurrencyAmount;
/**
* 调整后决算价税合计
*/
private BigDecimal adjustedBudgetTaxAmount;
/**
* 调整后本币价税合计
*/
private BigDecimal adjustedBudgetLocalCurrencyTaxAmount;
/**
* 调整后税率
*/
private BigDecimal adjustedTaxRate;
/**
* 调整后税额
*/
private BigDecimal adjustedTaxAmount;
/**
* 项目特征
*/
private String projectFeature;
/**
* 送审造价
*/
private BigDecimal selectedAuditCost;
/**
* 本币送审造价
*/
private BigDecimal localCurrencySelectedAuditCost;
/**
* 审定造价
*/
private BigDecimal approvedCost;
/**
* 本币审定造价
*/
private BigDecimal localCurrencyApprovedCost;
/**
* 累计结算
*/
private BigDecimal cumulativeSettlement;
/**
* 决算与结算差额
*/
private BigDecimal finalSettlementDifference;
/**
* 浮动百分比
*/
private BigDecimal floatingPercentage;
/**
* 原WBS
*/
private String originalWbs;
/**
* WBS
*/
private String wbs;
/**
* 原CBS
*/
private String originalCbs;
/**
* CBS
*/
private String cbs;
/**
* 成本预算总额
*/
private Long costBudgetTotal;
/**
* 合同累计签订成本预算金额
*/
private Long contractCumulativeSignedCostBudgetAmount;
/**
* 成本预算余额
*/
private Long costBudgetBalance;
/**
* 数据来源
*/
private String dataSource;
/**
* 备注
*/
private String remark;
/**
* 事物特性
*/
private String objectCharacteristics;
/**
* 辅助项1
*/
private String auxiliaryItem1;
/**
* 辅助项2
*/
private String auxiliaryItem2;
/**
* 辅助项3
*/
private String auxiliaryItem3;
}

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsZhfwJinduBo.java
View File

@ -1,5 +1,7 @@
package org.dromara.xzd.settlement.domain.bo;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.domain.XzdJsZhfwJindu;
import org.dromara.common.mybatis.core.domain.BaseEntity;
@ -166,6 +168,24 @@ public class XzdJsZhfwJinduBo extends BaseEntity {
*/
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 合同内清单
*/
List<XzdContractInventory> htnqd;
/**
* 变更增加清单
*/
List<XzdAlterationInventory> bgzjqd;
/**
* 合同外清单
*/
List<XzdContractInventory> htwqd;
}

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJinduVo.java
View File

@ -1,14 +1,14 @@
package org.dromara.xzd.settlement.domain.vo;
import java.math.BigDecimal;
import org.dromara.xzd.settlement.domain.XzdJsCgJindu;
import org.dromara.xzd.settlement.domain.*;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
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;
@ -220,5 +220,29 @@ public class XzdJsCgJinduVo implements Serializable {
@ExcelProperty(value = "文件ID")
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 合同内清单
*/
List<XzdContractInventory> htnqd;
/**
* 变更增加清单
*/
List<XzdAlterationInventory> bgzjqd;
/**
* 合同外清单
*/
List<XzdContractInventory> htwqd;
/**
* 采购入库清单
*/
List<XzdJsCghtCgrkqd> cgrkqd;
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonEditVo.java
View File

@ -8,6 +8,7 @@ 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.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import java.io.Serial;
@ -126,7 +127,13 @@ public class XzdJsCgJungonEditVo implements Serializable {
*/
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 决算调整清单
*/
List<XzdJsCghtJstzqd> jstzqd;
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java
View File

@ -8,6 +8,7 @@ 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.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import java.io.Serial;
@ -188,7 +189,14 @@ public class XzdJsCgJungonVo implements Serializable {
@ExcelProperty(value = "文件ID")
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 决算清单
*/
List<XzdJsCghtJstzqd> jsqd;
}

219
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCghtCgrkqdVo.java Normal file
View File

@ -0,0 +1,219 @@
package org.dromara.xzd.settlement.domain.vo;
import java.math.BigDecimal;
import org.dromara.xzd.settlement.domain.XzdJsCghtCgrkqd;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 结算-采购合同进度结算-采购入库清单视图对象 xzd_js_cght_cgrkqd
*
* @author Lion Li
* @date 2025-10-20
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = XzdJsCghtCgrkqd.class)
public class XzdJsCghtCgrkqdVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 主表id
*/
@ExcelProperty(value = "主表id")
private Long mainDocId;
/**
* 编码
*/
@ExcelProperty(value = "编码")
private String code;
/**
* 合同清单名称
*/
@ExcelProperty(value = "合同清单名称")
private String contractName;
/**
* 项目名称
*/
@ExcelProperty(value = "项目名称")
private String projectName;
/**
* 资源编码
*/
@ExcelProperty(value = "资源编码")
private String resourceCode;
/**
* 资源名称
*/
@ExcelProperty(value = "资源名称")
private String resourceName;
/**
* 规格
*/
@ExcelProperty(value = "规格")
private String specification;
/**
* 品牌
*/
@ExcelProperty(value = "品牌")
private String brand;
/**
* 计量单位
*/
@ExcelProperty(value = "计量单位")
private String unit;
/**
* 单价
*/
@ExcelProperty(value = "单价")
private BigDecimal price;
/**
* 含税单价
*/
@ExcelProperty(value = "含税单价")
private BigDecimal taxIncludedPrice;
/**
* 累计入库数量
*/
@ExcelProperty(value = "累计入库数量")
private BigDecimal cumulativeInventoryQuantity;
/**
* 累计退货数量
*/
@ExcelProperty(value = "累计退货数量")
private BigDecimal cumulativeIssueQuantity;
/**
* 累计实际入库数量
*/
@ExcelProperty(value = "累计实际入库数量")
private BigDecimal cumulativeActualInventoryQuantity;
/**
* 本期结算数量
*/
@ExcelProperty(value = "本期结算数量")
private BigDecimal currentIssueQuantity;
/**
* 本期结算不含税金额
*/
@ExcelProperty(value = "本期结算不含税金额")
private BigDecimal currentIssueInvalidQuantity;
/**
* 本期审批数量
*/
@ExcelProperty(value = "本期审批数量")
private BigDecimal currentApprovedQuantity;
/**
* 本期结算金额
*/
@ExcelProperty(value = "本期结算金额")
private BigDecimal currentIssueAmount;
/**
* 本期结算本币金额
*/
@ExcelProperty(value = "本期结算本币金额")
private BigDecimal currentIssueAmountInCurrency;
/**
* 本期审批金额
*/
@ExcelProperty(value = "本期审批金额")
private BigDecimal currentIssueTaxAmount;
/**
* 税率
*/
@ExcelProperty(value = "税率")
private BigDecimal taxRate;
/**
* 税额
*/
@ExcelProperty(value = "税额")
private BigDecimal taxAmount;
/**
* WBS
*/
@ExcelProperty(value = "WBS")
private String wbs;
/**
* CBS
*/
@ExcelProperty(value = "CBS")
private String cbs;
/**
* 引用来源
*/
@ExcelProperty(value = "引用来源")
private String source;
/**
* 进度完成百分比
*/
@ExcelProperty(value = "进度完成百分比")
private BigDecimal selectionCompletionPercentage;
/**
* CBS预算总额
*/
@ExcelProperty(value = "CBS预算总额")
private BigDecimal cbsBudgetTotal;
/**
* CBS余额
*/
@ExcelProperty(value = "CBS余额")
private BigDecimal cbsBalance;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 合同累计签订成本预算金额
*/
@ExcelProperty(value = "合同累计签订成本预算金额")
private BigDecimal costBudgetAmount;
}

347
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCghtJstzqdVo.java Normal file
View File

@ -0,0 +1,347 @@
package org.dromara.xzd.settlement.domain.vo;
import java.math.BigDecimal;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 采购合同竣工结算-决算清单（调整）视图对象 xzd_js_cght_jstzqd
*
* @author Lion Li
* @date 2025-10-20
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = XzdJsCghtJstzqd.class)
public class XzdJsCghtJstzqdVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 主表id
*/
@ExcelProperty(value = "主表id")
private Long mainDocId;
/**
* 类型 1决算清单 2决算清单调整
*/
private String type;
/**
* 编码
*/
private String code;
/**
* 合同清单名称
*/
private String contractListName;
/**
* 项目名称
*/
@ExcelProperty(value = "项目名称")
private String projectName;
/**
* 资源编码
*/
@ExcelProperty(value = "资源编码")
private String resourceCode;
/**
* 资源名称
*/
@ExcelProperty(value = "资源名称")
private String resourceName;
/**
* 资源别名
*/
@ExcelProperty(value = "资源别名")
private String resourceAlias;
/**
* 清单编号
*/
@ExcelProperty(value = "清单编号")
private String listNumber;
/**
* 工程量清单名称
*/
@ExcelProperty(value = "工程量清单名称")
private String engineeringListName;
/**
* 原规格
*/
@ExcelProperty(value = "原规格")
private String originalSpecification;
/**
* 规格
*/
@ExcelProperty(value = "规格")
private String specification;
/**
* 原工程量类型
*/
@ExcelProperty(value = "原工程量类型")
private String originalEngineeringType;
/**
* 工程量类型
*/
@ExcelProperty(value = "工程量类型")
private String engineeringType;
/**
* 计量单位
*/
@ExcelProperty(value = "计量单位")
private String unit;
/**
* 原决算数量
*/
@ExcelProperty(value = "原决算数量")
private BigDecimal originalBudgetQuantity;
/**
* 原决算单价
*/
@ExcelProperty(value = "原决算单价")
private BigDecimal originalBudgetUnitPrice;
/**
* 原决算含税单价
*/
@ExcelProperty(value = "原决算含税单价")
private BigDecimal originalBudgetTaxUnitPrice;
/**
* 原决算金额
*/
@ExcelProperty(value = "原决算金额")
private BigDecimal originalBudgetAmount;
/**
* 原本币决算金额
*/
@ExcelProperty(value = "原本币决算金额")
private BigDecimal originalBudgetLocalCurrencyAmount;
/**
* 原决算价税合计
*/
@ExcelProperty(value = "原决算价税合计")
private BigDecimal originalBudgetTaxAmount;
/**
* 原本币价税合计
*/
@ExcelProperty(value = "原本币价税合计")
private BigDecimal originalBudgetLocalCurrencyTaxAmount;
/**
* 原税率
*/
@ExcelProperty(value = "原税率")
private BigDecimal originalTaxRate;
/**
* 原决算税额
*/
@ExcelProperty(value = "原决算税额")
private BigDecimal originalTaxAmount;
/**
* 调整后决算数量
*/
@ExcelProperty(value = "调整后决算数量")
private BigDecimal adjustedBudgetQuantity;
/**
* 调整后决算单价
*/
@ExcelProperty(value = "调整后决算单价")
private BigDecimal adjustedBudgetUnitPrice;
/**
* 调整后决算含税单价
*/
@ExcelProperty(value = "调整后决算含税单价")
private BigDecimal adjustedBudgetTaxUnitPrice;
/**
* 调整后决算金额
*/
@ExcelProperty(value = "调整后决算金额")
private BigDecimal adjustedBudgetAmount;
/**
* 调整后本币金额
*/
@ExcelProperty(value = "调整后本币金额")
private BigDecimal adjustedBudgetLocalCurrencyAmount;
/**
* 调整后决算价税合计
*/
@ExcelProperty(value = "调整后决算价税合计")
private BigDecimal adjustedBudgetTaxAmount;
/**
* 调整后本币价税合计
*/
@ExcelProperty(value = "调整后本币价税合计")
private BigDecimal adjustedBudgetLocalCurrencyTaxAmount;
/**
* 调整后税率
*/
@ExcelProperty(value = "调整后税率")
private BigDecimal adjustedTaxRate;
/**
* 调整后税额
*/
@ExcelProperty(value = "调整后税额")
private BigDecimal adjustedTaxAmount;
/**
* 项目特征
*/
@ExcelProperty(value = "项目特征")
private String projectFeature;
/**
* 送审造价
*/
private BigDecimal selectedAuditCost;
/**
* 本币送审造价
*/
private BigDecimal localCurrencySelectedAuditCost;
/**
* 审定造价
*/
private BigDecimal approvedCost;
/**
* 本币审定造价
*/
private BigDecimal localCurrencyApprovedCost;
/**
* 累计结算
*/
private BigDecimal cumulativeSettlement;
/**
* 决算与结算差额
*/
private BigDecimal finalSettlementDifference;
/**
* 浮动百分比
*/
private BigDecimal floatingPercentage;
/**
* 原WBS
*/
@ExcelProperty(value = "原WBS")
private String originalWbs;
/**
* WBS
*/
@ExcelProperty(value = "WBS")
private String wbs;
/**
* 原CBS
*/
@ExcelProperty(value = "原CBS")
private String originalCbs;
/**
* CBS
*/
@ExcelProperty(value = "CBS")
private String cbs;
/**
* 成本预算总额
*/
@ExcelProperty(value = "成本预算总额")
private Long costBudgetTotal;
/**
* 合同累计签订成本预算金额
*/
@ExcelProperty(value = "合同累计签订成本预算金额")
private Long contractCumulativeSignedCostBudgetAmount;
/**
* 成本预算余额
*/
@ExcelProperty(value = "成本预算余额")
private Long costBudgetBalance;
/**
* 数据来源
*/
@ExcelProperty(value = "数据来源")
private String dataSource;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 事物特性
*/
@ExcelProperty(value = "事物特性")
private String objectCharacteristics;
/**
* 辅助项1
*/
@ExcelProperty(value = "辅助项1")
private String auxiliaryItem1;
/**
* 辅助项2
*/
@ExcelProperty(value = "辅助项2")
private String auxiliaryItem2;
/**
* 辅助项3
*/
@ExcelProperty(value = "辅助项3")
private String auxiliaryItem3;
}

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsZhfwJinduVo.java
View File

@ -2,6 +2,8 @@ package org.dromara.xzd.settlement.domain.vo;
import java.math.BigDecimal;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.domain.XzdJsZhfwJindu;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@ -202,6 +204,24 @@ public class XzdJsZhfwJinduVo implements Serializable {
@ExcelProperty(value = "文件ID")
private String fileId;
/**
* 奖励与扣款
*/
List<XzdJsDeductionItems> kkyjlx;
/**
* 合同内清单
*/
List<XzdContractInventory> htnqd;
/**
* 变更增加清单
*/
List<XzdAlterationInventory> bgzjqd;
/**
* 合同外清单
*/
List<XzdContractInventory> htwqd;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdJsCghtCgrkqdMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.xzd.settlement.mapper;
import org.dromara.xzd.settlement.domain.XzdJsCghtCgrkqd;
import org.dromara.xzd.settlement.domain.vo.XzdJsCghtCgrkqdVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 结算-采购合同进度结算-采购入库清单Mapper接口
*
* @author Lion Li
* @date 2025-10-20
*/
public interface XzdJsCghtCgrkqdMapper extends BaseMapperPlus<XzdJsCghtCgrkqd, XzdJsCghtCgrkqdVo> {
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdJsCghtJstzqdMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.xzd.settlement.mapper;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.domain.vo.XzdJsCghtJstzqdVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 采购合同竣工结算-决算清单（调整）Mapper接口
*
* @author Lion Li
* @date 2025-10-20
*/
public interface XzdJsCghtJstzqdMapper extends BaseMapperPlus<XzdJsCghtJstzqd, XzdJsCghtJstzqdVo> {
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/IXzdJsCghtCgrkqdService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.xzd.settlement.service;
import org.dromara.xzd.settlement.domain.vo.XzdJsCghtCgrkqdVo;
import org.dromara.xzd.settlement.domain.bo.XzdJsCghtCgrkqdBo;
import org.dromara.xzd.settlement.domain.XzdJsCghtCgrkqd;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 结算-采购合同进度结算-采购入库清单Service接口
*
* @author Lion Li
* @date 2025-10-20
*/
public interface IXzdJsCghtCgrkqdService extends IService<XzdJsCghtCgrkqd>{
/**
* 查询结算-采购合同进度结算-采购入库清单
*
* @param id 主键
* @return 结算-采购合同进度结算-采购入库清单
*/
XzdJsCghtCgrkqdVo queryById(Long id);
/**
* 分页查询结算-采购合同进度结算-采购入库清单列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 结算-采购合同进度结算-采购入库清单分页列表
*/
TableDataInfo<XzdJsCghtCgrkqdVo> queryPageList(XzdJsCghtCgrkqdBo bo, PageQuery pageQuery);
/**
* 查询符合条件的结算-采购合同进度结算-采购入库清单列表
*
* @param bo 查询条件
* @return 结算-采购合同进度结算-采购入库清单列表
*/
List<XzdJsCghtCgrkqdVo> queryList(XzdJsCghtCgrkqdBo bo);
/**
* 新增结算-采购合同进度结算-采购入库清单
*
* @param bo 结算-采购合同进度结算-采购入库清单
* @return 是否新增成功
*/
Boolean insertByBo(XzdJsCghtCgrkqdBo bo);
/**
* 修改结算-采购合同进度结算-采购入库清单
*
* @param bo 结算-采购合同进度结算-采购入库清单
* @return 是否修改成功
*/
Boolean updateByBo(XzdJsCghtCgrkqdBo bo);
/**
* 校验并批量删除结算-采购合同进度结算-采购入库清单信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/IXzdJsCghtJstzqdService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.xzd.settlement.service;
import org.dromara.xzd.settlement.domain.vo.XzdJsCghtJstzqdVo;
import org.dromara.xzd.settlement.domain.bo.XzdJsCghtJstzqdBo;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 采购合同竣工结算-决算清单（调整）Service接口
*
* @author Lion Li
* @date 2025-10-20
*/
public interface IXzdJsCghtJstzqdService extends IService<XzdJsCghtJstzqd>{
/**
* 查询采购合同竣工结算-决算清单（调整）
*
* @param id 主键
* @return 采购合同竣工结算-决算清单（调整）
*/
XzdJsCghtJstzqdVo queryById(Long id);
/**
* 分页查询采购合同竣工结算-决算清单（调整）列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 采购合同竣工结算-决算清单（调整）分页列表
*/
TableDataInfo<XzdJsCghtJstzqdVo> queryPageList(XzdJsCghtJstzqdBo bo, PageQuery pageQuery);
/**
* 查询符合条件的采购合同竣工结算-决算清单（调整）列表
*
* @param bo 查询条件
* @return 采购合同竣工结算-决算清单（调整）列表
*/
List<XzdJsCghtJstzqdVo> queryList(XzdJsCghtJstzqdBo bo);
/**
* 新增采购合同竣工结算-决算清单（调整）
*
* @param bo 采购合同竣工结算-决算清单（调整）
* @return 是否新增成功
*/
Boolean insertByBo(XzdJsCghtJstzqdBo bo);
/**
* 修改采购合同竣工结算-决算清单（调整）
*
* @param bo 采购合同竣工结算-决算清单（调整）
* @return 是否修改成功
*/
Boolean updateByBo(XzdJsCghtJstzqdBo bo);
/**
* 校验并批量删除采购合同竣工结算-决算清单（调整）信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

122
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java
View File

@ -21,19 +21,18 @@ import org.dromara.xzd.domain.XzdDeductionItems;
import org.dromara.xzd.domain.XzdSettlementRules;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.enums.XzdClassEnum;
import org.dromara.xzd.enums.ZxdEnum;
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.*;
import org.dromara.xzd.settlement.domain.bo.XzdJsDeductionItemsBo;
import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService;
import org.dromara.xzd.settlement.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.xzd.settlement.domain.bo.XzdJsCgJinduBo;
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.*;
@ -67,6 +66,15 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
@Autowired
private IXzdJsDeductionItemsService deductionItemsService;
@Autowired
private IXzdContractInventoryService contractInventoryService;
@Autowired
private IXzdAlterationInventoryService alterationInventoryService;
@Autowired
private IXzdJsCghtCgrkqdService jsCghtCgrkqdService;
/**
* 查询采购合同进度结算
*
@ -161,15 +169,36 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
}
String tableName = XzdClassEnum.JS_CG_JINDU.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
//变更增加清单
if (bo.getBgzjqd() != null && !bo.getBgzjqd().isEmpty()) {
bo.getBgzjqd().forEach(item -> {item.setPrimaryMeterId(add.getId());});
alterationInventoryService.saveBatch(bo.getBgzjqd());
}
List<XzdContractInventory> list = new ArrayList<>();
//合同内清单和合同外清单
if (bo.getHtnqd() != null && !bo.getHtnqd().isEmpty()) {
list.addAll(bo.getHtnqd());
}
if (bo.getHtwqd() != null && !bo.getHtwqd().isEmpty()) {
list.addAll(bo.getHtwqd());
}
if (!list.isEmpty()) {
list.forEach(item -> {item.setPrimaryMeterId(add.getId());});
contractInventoryService.saveBatch(list);
}
//采购入库清单
if (bo.getCgrkqd() != null && !bo.getCgrkqd().isEmpty()) {
bo.getCgrkqd().forEach(item->{item.setMainDocId(add.getId());});
jsCghtCgrkqdService.saveBatch(bo.getCgrkqd());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
return flag;
}
@ -186,18 +215,42 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
validEntityBeforeSave(update);
//删除奖励与扣款对应数据
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().eq(XzdJsDeductionItems::getMainDocId, update.getId()));
alterationInventoryService.remove(new LambdaQueryWrapper<XzdAlterationInventory>().eq(XzdAlterationInventory::getPrimaryMeterId, update.getId()));
contractInventoryService.remove(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, update.getId()));
jsCghtCgrkqdService.remove(new LambdaQueryWrapper<XzdJsCghtCgrkqd>().eq(XzdJsCghtCgrkqd::getMainDocId, update.getId()));
//生成奖励与扣款数据
String tableName = XzdClassEnum.JS_CG_JINDU.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
//变更增加清单
if (bo.getBgzjqd() != null && !bo.getBgzjqd().isEmpty()) {
bo.getBgzjqd().forEach(item -> {item.setPrimaryMeterId(bo.getId());});
alterationInventoryService.saveBatch(bo.getBgzjqd());
}
List<XzdContractInventory> list = new ArrayList<>();
//合同内清单和合同外清单
if (bo.getHtnqd() != null && !bo.getHtnqd().isEmpty()) {
list.addAll(bo.getHtnqd());
}
if (bo.getHtwqd() != null && !bo.getHtwqd().isEmpty()) {
list.addAll(bo.getHtwqd());
}
if (!list.isEmpty()) {
list.forEach(item -> {item.setPrimaryMeterId(bo.getId());});
contractInventoryService.saveBatch(list);
}
//采购入库清单
if (bo.getCgrkqd() != null && !bo.getCgrkqd().isEmpty()) {
bo.getCgrkqd().forEach(item->{item.setMainDocId(bo.getId());});
jsCghtCgrkqdService.saveBatch(bo.getCgrkqd());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
return baseMapper.updateById(update) > 0;
}
@ -236,6 +289,9 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
sysOssService.deleteWithValidByIds(deleteIds, false);
}
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().in(XzdJsDeductionItems::getMainDocId, ids));
alterationInventoryService.remove(new LambdaQueryWrapper<XzdAlterationInventory>().in(XzdAlterationInventory::getPrimaryMeterId, ids));
contractInventoryService.remove(new LambdaQueryWrapper<XzdContractInventory>().in(XzdContractInventory::getPrimaryMeterId, ids));
jsCghtCgrkqdService.remove(new LambdaQueryWrapper<XzdJsCghtCgrkqd>().in(XzdJsCghtCgrkqd::getMainDocId, ids));
return baseMapper.deleteByIds(ids) > 0;
}
@ -278,5 +334,33 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
List<XzdJsDeductionItems> list = deductionItemsService.list(lambdaQueryWrapper2);
vo.setKkyjlx(list);
//变更增加清单
List<XzdAlterationInventory> list1 = alterationInventoryService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdAlterationInventory>()
.eq(XzdAlterationInventory::getPrimaryMeterId, vo.getId())
.eq(XzdAlterationInventory::getContractType, ZxdEnum.CAIGOUHET.getTypeValue()));
vo.setBgzjqd(list1);
//获取合同内外清单
List<XzdContractInventory> list2 = contractInventoryService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdContractInventory>()
.eq(XzdContractInventory::getPrimaryMeterId, vo.getId())
.eq(XzdContractInventory::getContractType, ZxdEnum.CAIGOUHET.getTypeValue()));
if (list2 != null && !list2.isEmpty()){
List<XzdContractInventory> nList = new ArrayList<>();
List<XzdContractInventory> wList = new ArrayList<>();
for (XzdContractInventory item : list2) {
if (ZxdEnum.HETONGLEIXING.getTypeValue().equals(item.getType())) {
wList.add(item);
} else {
nList.add(item);
}
}
//合同内清单
vo.setHtnqd(nList);
//合同外清单
vo.setHtwqd(wList);
}
//采购入库清单
List<XzdJsCghtCgrkqd> list3 = jsCghtCgrkqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdJsCghtCgrkqd>().eq(XzdJsCghtCgrkqd::getMainDocId, vo.getId()));
vo.setCgrkqd(list3);
}
}

77
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java
View File

@ -1,7 +1,6 @@
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;
@ -11,18 +10,16 @@ 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.enums.ZxdEnum;
import org.dromara.xzd.service.impl.XzdProjectServiceImpl;
import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
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.IXzdJsCgJungonService;
import org.dromara.xzd.settlement.service.IXzdJsCghtJstzqdService;
import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -67,6 +64,9 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
@Autowired
private IXzdJsCgJungonService jungonService;
@Autowired
private IXzdJsCghtJstzqdService jsCghtJstzqdService;
/**
* 查询采购合同竣工结算调整
*
@ -145,16 +145,20 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
if (flag) {
bo.setId(add.getId());
}
String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
String tableName = XzdClassEnum.XZD_JS_CG_JUNGON_EDIT.getClassName();
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
//决算清单
if (bo.getJstzqd() != null && !bo.getJstzqd().isEmpty()) {
bo.getJstzqd().forEach(item -> {item.setMainDocId(add.getId());});
jsCghtJstzqdService.saveBatch(bo.getJstzqd());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
return flag;
}
@ -171,18 +175,25 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
validEntityBeforeSave(update);
//删除奖励与扣款对应数据
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().eq(XzdJsDeductionItems::getMainDocId, update.getId()));
jsCghtJstzqdService.remove(new LambdaQueryWrapper<XzdJsCghtJstzqd>()
.eq(XzdJsCghtJstzqd::getType, ZxdEnum.SFWJSD_TZ.getTypeValue())
.eq(XzdJsCghtJstzqd::getMainDocId, update.getId()));
//生成奖励与扣款数据
String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
String tableName = XzdClassEnum.XZD_JS_CG_JUNGON_EDIT.getClassName();
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
//决算清单
if (bo.getJstzqd() != null && !bo.getJstzqd().isEmpty()) {
bo.getJstzqd().forEach(item -> {item.setMainDocId(bo.getId());});
jsCghtJstzqdService.saveBatch(bo.getJstzqd());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
return baseMapper.updateById(update) > 0;
}
@ -220,6 +231,9 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
if (!deleteIds.isEmpty()) {
sysOssService.deleteWithValidByIds(deleteIds, false);
}
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().in(XzdJsDeductionItems::getMainDocId, ids));
jsCghtJstzqdService.remove(new LambdaQueryWrapper<XzdJsCghtJstzqd>().eq(XzdJsCghtJstzqd::getType, ZxdEnum.SFWJSD_TZ.getTypeValue())
.in(XzdJsCghtJstzqd::getMainDocId, ids));
return baseMapper.deleteByIds(ids) > 0;
}
@ -251,9 +265,9 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
}
//部门名称
if (item.getDefaultFinanceOrg() != null){
SysDeptVo sysDeptVo = sysDeptService.selectDeptById(item.getDefaultFinanceOrg());
if (sysDeptVo != null){
item.setDefaultFinanceOrgName(sysDeptVo.getDeptName());
String deptName = sysDeptService.selectDeptNameById(item.getDefaultFinanceOrg());
if (deptName != null){
item.setDefaultFinanceOrgName(deptName);
}
}
}
@ -267,6 +281,15 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
LambdaQueryWrapper<XzdJsDeductionItems> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
List<XzdJsDeductionItems> list = deductionItemsService.list(lambdaQueryWrapper2);
vo.setKkyjlx(list);
if (list != null && !list.isEmpty()) {
vo.setKkyjlx(list);
}
//决算清单
List<XzdJsCghtJstzqd> list1 = jsCghtJstzqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdJsCghtJstzqd>()
.eq(XzdJsCghtJstzqd::getMainDocId, vo.getId())
.eq(XzdJsCghtJstzqd::getType, ZxdEnum.SFWJSD_TZ.getTypeValue()));
if (list1 != null && !list1.isEmpty()) {
vo.setJstzqd(list1);
}
}
}

61
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java
View File

@ -14,11 +14,14 @@ 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.enums.ZxdEnum;
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.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.domain.vo.XzdJsCgJinduVo;
import org.dromara.xzd.settlement.service.IXzdJsCghtJstzqdService;
import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -60,6 +63,8 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
@Autowired
private IXzdJsDeductionItemsService deductionItemsService;
@Autowired
private IXzdJsCghtJstzqdService jsCghtCgrkqdService;
/**
* 查询采购合同竣工结算
@ -151,15 +156,19 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
}
String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
//决算清单
if (bo.getJsqd() != null && !bo.getJsqd().isEmpty()) {
bo.getJsqd().forEach(item -> {item.setMainDocId(add.getId());});
jsCghtCgrkqdService.saveBatch(bo.getJsqd());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
return flag;
}
@ -176,18 +185,25 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
validEntityBeforeSave(update);
//删除奖励与扣款对应数据
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().eq(XzdJsDeductionItems::getMainDocId, update.getId()));
jsCghtCgrkqdService.remove(new LambdaQueryWrapper<XzdJsCghtJstzqd>()
.eq(XzdJsCghtJstzqd::getType, ZxdEnum.SFWJSD_S.getTypeValue())
.eq(XzdJsCghtJstzqd::getMainDocId, update.getId()));
//生成奖励与扣款数据
String tableName = XzdClassEnum.JS_CG_JINDU.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
String tableName = XzdClassEnum.JS_CG_JUNGON.getClassName();
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
//决算清单
if (bo.getJsqd() != null && !bo.getJsqd().isEmpty()) {
bo.getJsqd().forEach(item -> {item.setMainDocId(bo.getId());});
jsCghtCgrkqdService.saveBatch(bo.getJsqd());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
return baseMapper.updateById(update) > 0;
}
@ -226,6 +242,8 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
sysOssService.deleteWithValidByIds(deleteIds, false);
}
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().in(XzdJsDeductionItems::getMainDocId, ids));
jsCghtCgrkqdService.remove(new LambdaQueryWrapper<XzdJsCghtJstzqd>().eq(XzdJsCghtJstzqd::getType, ZxdEnum.SFWJSD_S.getTypeValue())
.in(XzdJsCghtJstzqd::getMainDocId, ids));
return baseMapper.deleteByIds(ids) > 0;
}
@ -306,6 +324,15 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
LambdaQueryWrapper<XzdJsDeductionItems> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
List<XzdJsDeductionItems> list = deductionItemsService.list(lambdaQueryWrapper2);
vo.setKkyjlx(list);
if (list != null && !list.isEmpty()) {
vo.setKkyjlx(list);
}
//决算清单
List<XzdJsCghtJstzqd> list1 = jsCghtCgrkqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdJsCghtJstzqd>()
.eq(XzdJsCghtJstzqd::getMainDocId, vo.getId())
.eq(XzdJsCghtJstzqd::getType, ZxdEnum.SFWJSD_S.getTypeValue()));
if (list1 != null && !list1.isEmpty()) {
vo.setJsqd(list1);
}
}
}

159
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCghtCgrkqdServiceImpl.java Normal file
View File

@ -0,0 +1,159 @@
package org.dromara.xzd.settlement.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.springframework.stereotype.Service;
import org.dromara.xzd.settlement.domain.bo.XzdJsCghtCgrkqdBo;
import org.dromara.xzd.settlement.domain.vo.XzdJsCghtCgrkqdVo;
import org.dromara.xzd.settlement.domain.XzdJsCghtCgrkqd;
import org.dromara.xzd.settlement.mapper.XzdJsCghtCgrkqdMapper;
import org.dromara.xzd.settlement.service.IXzdJsCghtCgrkqdService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 结算-采购合同进度结算-采购入库清单Service业务层处理
*
* @author Lion Li
* @date 2025-10-20
*/
@RequiredArgsConstructor
@Service
public class XzdJsCghtCgrkqdServiceImpl extends ServiceImpl<XzdJsCghtCgrkqdMapper, XzdJsCghtCgrkqd> implements IXzdJsCghtCgrkqdService {
private final XzdJsCghtCgrkqdMapper baseMapper;
/**
* 查询结算-采购合同进度结算-采购入库清单
*
* @param id 主键
* @return 结算-采购合同进度结算-采购入库清单
*/
@Override
public XzdJsCghtCgrkqdVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询结算-采购合同进度结算-采购入库清单列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 结算-采购合同进度结算-采购入库清单分页列表
*/
@Override
public TableDataInfo<XzdJsCghtCgrkqdVo> queryPageList(XzdJsCghtCgrkqdBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdJsCghtCgrkqd> lqw = buildQueryWrapper(bo);
Page<XzdJsCghtCgrkqdVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的结算-采购合同进度结算-采购入库清单列表
*
* @param bo 查询条件
* @return 结算-采购合同进度结算-采购入库清单列表
*/
@Override
public List<XzdJsCghtCgrkqdVo> queryList(XzdJsCghtCgrkqdBo bo) {
LambdaQueryWrapper<XzdJsCghtCgrkqd> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<XzdJsCghtCgrkqd> buildQueryWrapper(XzdJsCghtCgrkqdBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdJsCghtCgrkqd> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdJsCghtCgrkqd::getId);
lqw.eq(bo.getMainDocId() != null, XzdJsCghtCgrkqd::getMainDocId, bo.getMainDocId());
lqw.eq(StringUtils.isNotBlank(bo.getCode()), XzdJsCghtCgrkqd::getCode, bo.getCode());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCghtCgrkqd::getContractName, bo.getContractName());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), XzdJsCghtCgrkqd::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getResourceCode()), XzdJsCghtCgrkqd::getResourceCode, bo.getResourceCode());
lqw.like(StringUtils.isNotBlank(bo.getResourceName()), XzdJsCghtCgrkqd::getResourceName, bo.getResourceName());
lqw.eq(StringUtils.isNotBlank(bo.getSpecification()), XzdJsCghtCgrkqd::getSpecification, bo.getSpecification());
lqw.eq(StringUtils.isNotBlank(bo.getBrand()), XzdJsCghtCgrkqd::getBrand, bo.getBrand());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), XzdJsCghtCgrkqd::getUnit, bo.getUnit());
lqw.eq(bo.getPrice() != null, XzdJsCghtCgrkqd::getPrice, bo.getPrice());
lqw.eq(bo.getTaxIncludedPrice() != null, XzdJsCghtCgrkqd::getTaxIncludedPrice, bo.getTaxIncludedPrice());
lqw.eq(bo.getCumulativeInventoryQuantity() != null, XzdJsCghtCgrkqd::getCumulativeInventoryQuantity, bo.getCumulativeInventoryQuantity());
lqw.eq(bo.getCumulativeIssueQuantity() != null, XzdJsCghtCgrkqd::getCumulativeIssueQuantity, bo.getCumulativeIssueQuantity());
lqw.eq(bo.getCumulativeActualInventoryQuantity() != null, XzdJsCghtCgrkqd::getCumulativeActualInventoryQuantity, bo.getCumulativeActualInventoryQuantity());
lqw.eq(bo.getCurrentIssueQuantity() != null, XzdJsCghtCgrkqd::getCurrentIssueQuantity, bo.getCurrentIssueQuantity());
lqw.eq(bo.getCurrentIssueInvalidQuantity() != null, XzdJsCghtCgrkqd::getCurrentIssueInvalidQuantity, bo.getCurrentIssueInvalidQuantity());
lqw.eq(bo.getCurrentApprovedQuantity() != null, XzdJsCghtCgrkqd::getCurrentApprovedQuantity, bo.getCurrentApprovedQuantity());
lqw.eq(bo.getCurrentIssueAmount() != null, XzdJsCghtCgrkqd::getCurrentIssueAmount, bo.getCurrentIssueAmount());
lqw.eq(bo.getCurrentIssueAmountInCurrency() != null, XzdJsCghtCgrkqd::getCurrentIssueAmountInCurrency, bo.getCurrentIssueAmountInCurrency());
lqw.eq(bo.getCurrentIssueTaxAmount() != null, XzdJsCghtCgrkqd::getCurrentIssueTaxAmount, bo.getCurrentIssueTaxAmount());
lqw.eq(bo.getTaxRate() != null, XzdJsCghtCgrkqd::getTaxRate, bo.getTaxRate());
lqw.eq(bo.getTaxAmount() != null, XzdJsCghtCgrkqd::getTaxAmount, bo.getTaxAmount());
lqw.eq(StringUtils.isNotBlank(bo.getWbs()), XzdJsCghtCgrkqd::getWbs, bo.getWbs());
lqw.eq(StringUtils.isNotBlank(bo.getCbs()), XzdJsCghtCgrkqd::getCbs, bo.getCbs());
lqw.eq(StringUtils.isNotBlank(bo.getSource()), XzdJsCghtCgrkqd::getSource, bo.getSource());
lqw.eq(bo.getSelectionCompletionPercentage() != null, XzdJsCghtCgrkqd::getSelectionCompletionPercentage, bo.getSelectionCompletionPercentage());
lqw.eq(bo.getCbsBudgetTotal() != null, XzdJsCghtCgrkqd::getCbsBudgetTotal, bo.getCbsBudgetTotal());
lqw.eq(bo.getCbsBalance() != null, XzdJsCghtCgrkqd::getCbsBalance, bo.getCbsBalance());
lqw.eq(bo.getCostBudgetAmount() != null, XzdJsCghtCgrkqd::getCostBudgetAmount, bo.getCostBudgetAmount());
return lqw;
}
/**
* 新增结算-采购合同进度结算-采购入库清单
*
* @param bo 结算-采购合同进度结算-采购入库清单
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(XzdJsCghtCgrkqdBo bo) {
XzdJsCghtCgrkqd add = MapstructUtils.convert(bo, XzdJsCghtCgrkqd.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改结算-采购合同进度结算-采购入库清单
*
* @param bo 结算-采购合同进度结算-采购入库清单
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(XzdJsCghtCgrkqdBo bo) {
XzdJsCghtCgrkqd update = MapstructUtils.convert(bo, XzdJsCghtCgrkqd.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(XzdJsCghtCgrkqd entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除结算-采购合同进度结算-采购入库清单信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

173
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCghtJstzqdServiceImpl.java Normal file
View File

@ -0,0 +1,173 @@
package org.dromara.xzd.settlement.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
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.springframework.stereotype.Service;
import org.dromara.xzd.settlement.domain.bo.XzdJsCghtJstzqdBo;
import org.dromara.xzd.settlement.domain.vo.XzdJsCghtJstzqdVo;
import org.dromara.xzd.settlement.domain.XzdJsCghtJstzqd;
import org.dromara.xzd.settlement.mapper.XzdJsCghtJstzqdMapper;
import org.dromara.xzd.settlement.service.IXzdJsCghtJstzqdService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 采购合同竣工结算-决算清单（调整）Service业务层处理
*
* @author Lion Li
* @date 2025-10-20
*/
@RequiredArgsConstructor
@Service
public class XzdJsCghtJstzqdServiceImpl extends ServiceImpl<XzdJsCghtJstzqdMapper, XzdJsCghtJstzqd> implements IXzdJsCghtJstzqdService {
private final XzdJsCghtJstzqdMapper baseMapper;
/**
* 查询采购合同竣工结算-决算清单（调整）
*
* @param id 主键
* @return 采购合同竣工结算-决算清单（调整）
*/
@Override
public XzdJsCghtJstzqdVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询采购合同竣工结算-决算清单（调整）列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 采购合同竣工结算-决算清单（调整）分页列表
*/
@Override
public TableDataInfo<XzdJsCghtJstzqdVo> queryPageList(XzdJsCghtJstzqdBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdJsCghtJstzqd> lqw = buildQueryWrapper(bo);
Page<XzdJsCghtJstzqdVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的采购合同竣工结算-决算清单（调整）列表
*
* @param bo 查询条件
* @return 采购合同竣工结算-决算清单（调整）列表
*/
@Override
public List<XzdJsCghtJstzqdVo> queryList(XzdJsCghtJstzqdBo bo) {
LambdaQueryWrapper<XzdJsCghtJstzqd> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<XzdJsCghtJstzqd> buildQueryWrapper(XzdJsCghtJstzqdBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdJsCghtJstzqd> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdJsCghtJstzqd::getId);
lqw.eq(bo.getMainDocId() != null, XzdJsCghtJstzqd::getMainDocId, bo.getMainDocId());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), XzdJsCghtJstzqd::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getResourceCode()), XzdJsCghtJstzqd::getResourceCode, bo.getResourceCode());
lqw.like(StringUtils.isNotBlank(bo.getResourceName()), XzdJsCghtJstzqd::getResourceName, bo.getResourceName());
lqw.eq(StringUtils.isNotBlank(bo.getResourceAlias()), XzdJsCghtJstzqd::getResourceAlias, bo.getResourceAlias());
lqw.eq(StringUtils.isNotBlank(bo.getListNumber()), XzdJsCghtJstzqd::getListNumber, bo.getListNumber());
lqw.like(StringUtils.isNotBlank(bo.getEngineeringListName()), XzdJsCghtJstzqd::getEngineeringListName, bo.getEngineeringListName());
lqw.eq(StringUtils.isNotBlank(bo.getOriginalSpecification()), XzdJsCghtJstzqd::getOriginalSpecification, bo.getOriginalSpecification());
lqw.eq(StringUtils.isNotBlank(bo.getSpecification()), XzdJsCghtJstzqd::getSpecification, bo.getSpecification());
lqw.eq(StringUtils.isNotBlank(bo.getOriginalEngineeringType()), XzdJsCghtJstzqd::getOriginalEngineeringType, bo.getOriginalEngineeringType());
lqw.eq(StringUtils.isNotBlank(bo.getEngineeringType()), XzdJsCghtJstzqd::getEngineeringType, bo.getEngineeringType());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), XzdJsCghtJstzqd::getUnit, bo.getUnit());
lqw.eq(bo.getOriginalBudgetQuantity() != null, XzdJsCghtJstzqd::getOriginalBudgetQuantity, bo.getOriginalBudgetQuantity());
lqw.eq(bo.getOriginalBudgetUnitPrice() != null, XzdJsCghtJstzqd::getOriginalBudgetUnitPrice, bo.getOriginalBudgetUnitPrice());
lqw.eq(bo.getOriginalBudgetTaxUnitPrice() != null, XzdJsCghtJstzqd::getOriginalBudgetTaxUnitPrice, bo.getOriginalBudgetTaxUnitPrice());
lqw.eq(bo.getOriginalBudgetAmount() != null, XzdJsCghtJstzqd::getOriginalBudgetAmount, bo.getOriginalBudgetAmount());
lqw.eq(bo.getOriginalBudgetLocalCurrencyAmount() != null, XzdJsCghtJstzqd::getOriginalBudgetLocalCurrencyAmount, bo.getOriginalBudgetLocalCurrencyAmount());
lqw.eq(bo.getOriginalBudgetTaxAmount() != null, XzdJsCghtJstzqd::getOriginalBudgetTaxAmount, bo.getOriginalBudgetTaxAmount());
lqw.eq(bo.getOriginalBudgetLocalCurrencyTaxAmount() != null, XzdJsCghtJstzqd::getOriginalBudgetLocalCurrencyTaxAmount, bo.getOriginalBudgetLocalCurrencyTaxAmount());
lqw.eq(bo.getOriginalTaxRate() != null, XzdJsCghtJstzqd::getOriginalTaxRate, bo.getOriginalTaxRate());
lqw.eq(bo.getOriginalTaxAmount() != null, XzdJsCghtJstzqd::getOriginalTaxAmount, bo.getOriginalTaxAmount());
lqw.eq(bo.getAdjustedBudgetQuantity() != null, XzdJsCghtJstzqd::getAdjustedBudgetQuantity, bo.getAdjustedBudgetQuantity());
lqw.eq(bo.getAdjustedBudgetUnitPrice() != null, XzdJsCghtJstzqd::getAdjustedBudgetUnitPrice, bo.getAdjustedBudgetUnitPrice());
lqw.eq(bo.getAdjustedBudgetTaxUnitPrice() != null, XzdJsCghtJstzqd::getAdjustedBudgetTaxUnitPrice, bo.getAdjustedBudgetTaxUnitPrice());
lqw.eq(bo.getAdjustedBudgetAmount() != null, XzdJsCghtJstzqd::getAdjustedBudgetAmount, bo.getAdjustedBudgetAmount());
lqw.eq(bo.getAdjustedBudgetLocalCurrencyAmount() != null, XzdJsCghtJstzqd::getAdjustedBudgetLocalCurrencyAmount, bo.getAdjustedBudgetLocalCurrencyAmount());
lqw.eq(bo.getAdjustedBudgetTaxAmount() != null, XzdJsCghtJstzqd::getAdjustedBudgetTaxAmount, bo.getAdjustedBudgetTaxAmount());
lqw.eq(bo.getAdjustedBudgetLocalCurrencyTaxAmount() != null, XzdJsCghtJstzqd::getAdjustedBudgetLocalCurrencyTaxAmount, bo.getAdjustedBudgetLocalCurrencyTaxAmount());
lqw.eq(bo.getAdjustedTaxRate() != null, XzdJsCghtJstzqd::getAdjustedTaxRate, bo.getAdjustedTaxRate());
lqw.eq(bo.getAdjustedTaxAmount() != null, XzdJsCghtJstzqd::getAdjustedTaxAmount, bo.getAdjustedTaxAmount());
lqw.eq(StringUtils.isNotBlank(bo.getProjectFeature()), XzdJsCghtJstzqd::getProjectFeature, bo.getProjectFeature());
lqw.eq(StringUtils.isNotBlank(bo.getOriginalWbs()), XzdJsCghtJstzqd::getOriginalWbs, bo.getOriginalWbs());
lqw.eq(StringUtils.isNotBlank(bo.getWbs()), XzdJsCghtJstzqd::getWbs, bo.getWbs());
lqw.eq(StringUtils.isNotBlank(bo.getOriginalCbs()), XzdJsCghtJstzqd::getOriginalCbs, bo.getOriginalCbs());
lqw.eq(StringUtils.isNotBlank(bo.getCbs()), XzdJsCghtJstzqd::getCbs, bo.getCbs());
lqw.eq(bo.getCostBudgetTotal() != null, XzdJsCghtJstzqd::getCostBudgetTotal, bo.getCostBudgetTotal());
lqw.eq(bo.getContractCumulativeSignedCostBudgetAmount() != null, XzdJsCghtJstzqd::getContractCumulativeSignedCostBudgetAmount, bo.getContractCumulativeSignedCostBudgetAmount());
lqw.eq(bo.getCostBudgetBalance() != null, XzdJsCghtJstzqd::getCostBudgetBalance, bo.getCostBudgetBalance());
lqw.eq(StringUtils.isNotBlank(bo.getDataSource()), XzdJsCghtJstzqd::getDataSource, bo.getDataSource());
lqw.eq(StringUtils.isNotBlank(bo.getObjectCharacteristics()), XzdJsCghtJstzqd::getObjectCharacteristics, bo.getObjectCharacteristics());
lqw.eq(StringUtils.isNotBlank(bo.getAuxiliaryItem1()), XzdJsCghtJstzqd::getAuxiliaryItem1, bo.getAuxiliaryItem1());
lqw.eq(StringUtils.isNotBlank(bo.getAuxiliaryItem2()), XzdJsCghtJstzqd::getAuxiliaryItem2, bo.getAuxiliaryItem2());
lqw.eq(StringUtils.isNotBlank(bo.getAuxiliaryItem3()), XzdJsCghtJstzqd::getAuxiliaryItem3, bo.getAuxiliaryItem3());
return lqw;
}
/**
* 新增采购合同竣工结算-决算清单（调整）
*
* @param bo 采购合同竣工结算-决算清单（调整）
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(XzdJsCghtJstzqdBo bo) {
XzdJsCghtJstzqd add = MapstructUtils.convert(bo, XzdJsCghtJstzqd.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改采购合同竣工结算-决算清单（调整）
*
* @param bo 采购合同竣工结算-决算清单（调整）
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(XzdJsCghtJstzqdBo bo) {
XzdJsCghtJstzqd update = MapstructUtils.convert(bo, XzdJsCghtJstzqd.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(XzdJsCghtJstzqd entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除采购合同竣工结算-决算清单（调整）信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java
View File

@ -16,11 +16,16 @@ import org.dromara.system.service.impl.SysDeptServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.comprehensive.service.IXzdCsContractInformationService;
import org.dromara.xzd.enums.XzdClassEnum;
import org.dromara.xzd.enums.ZxdEnum;
import org.dromara.xzd.service.IXzdCorrespondentList;
import org.dromara.xzd.service.impl.XzdProjectServiceImpl;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonEditVo;
import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo;
import org.dromara.xzd.settlement.service.IXzdAlterationInventoryService;
import org.dromara.xzd.settlement.service.IXzdContractInventoryService;
import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -61,6 +66,13 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
@Autowired
private IXzdCorrespondentList iXzdCorrespondentList;
@Autowired
private IXzdContractInventoryService contractInventoryService;
@Autowired
private IXzdAlterationInventoryService alterationInventoryService;
/**
* 查询综合服务合同进度结算
*
@ -154,15 +166,32 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
}
String tableName = XzdClassEnum.JS_ZHFW_JINDU.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
}
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(add.getId());
//变更增加清单
if (bo.getBgzjqd() != null && !bo.getBgzjqd().isEmpty()) {
bo.getBgzjqd().forEach(item -> {item.setPrimaryMeterId(add.getId());});
alterationInventoryService.saveBatch(bo.getBgzjqd());
}
List<XzdContractInventory> list = new ArrayList<>();
//合同内清单和合同外清单
if (bo.getHtnqd() != null && !bo.getHtnqd().isEmpty()) {
list.addAll(bo.getHtnqd());
}
if (bo.getHtwqd() != null && !bo.getHtwqd().isEmpty()) {
list.addAll(bo.getHtwqd());
}
if (!list.isEmpty()) {
list.forEach(item -> {item.setPrimaryMeterId(add.getId());});
contractInventoryService.saveBatch(list);
}
deductionItemsService.saveBatch(bo.getKkyjlx());
return flag;
}
@ -179,18 +208,36 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
validEntityBeforeSave(update);
//删除奖励与扣款对应数据
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().eq(XzdJsDeductionItems::getMainDocId, update.getId()));
alterationInventoryService.remove(new LambdaQueryWrapper<XzdAlterationInventory>().eq(XzdAlterationInventory::getPrimaryMeterId, update.getId()));
contractInventoryService.remove(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, update.getId()));
//生成奖励与扣款数据
String tableName = XzdClassEnum.JS_ZHFW_JINDU.getClassName();
if (bo.getKkyjlx() == null || bo.getKkyjlx().isEmpty()) {
throw new ServiceException("扣款与奖励项不能为空");
if (bo.getKkyjlx() != null && !bo.getKkyjlx().isEmpty()) {
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
}
//合同条款-扣款与奖励项
for (XzdJsDeductionItems kkyjlx : bo.getKkyjlx()) {
kkyjlx.setTableName(tableName);
kkyjlx.setMainDocId(update.getId());
//变更增加清单
if (bo.getBgzjqd() != null && !bo.getBgzjqd().isEmpty()) {
bo.getBgzjqd().forEach(item -> {item.setPrimaryMeterId(bo.getId());});
alterationInventoryService.saveBatch(bo.getBgzjqd());
}
List<XzdContractInventory> list = new ArrayList<>();
//合同内清单和合同外清单
if (bo.getHtnqd() != null && !bo.getHtnqd().isEmpty()) {
list.addAll(bo.getHtnqd());
}
if (bo.getHtwqd() != null && !bo.getHtwqd().isEmpty()) {
list.addAll(bo.getHtwqd());
}
if (!list.isEmpty()) {
list.forEach(item -> {item.setPrimaryMeterId(bo.getId());});
contractInventoryService.saveBatch(list);
}
//新增奖励与扣款数据
deductionItemsService.saveBatch(bo.getKkyjlx());
return baseMapper.updateById(update) > 0;
}
@ -229,6 +276,8 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
sysOssService.deleteWithValidByIds(deleteIds, false);
}
deductionItemsService.remove(new LambdaQueryWrapper<XzdJsDeductionItems>().in(XzdJsDeductionItems::getMainDocId, ids));
alterationInventoryService.remove(new LambdaQueryWrapper<XzdAlterationInventory>().eq(XzdAlterationInventory::getContractType, ZxdEnum.ZONHEFUWUHET.getTypeValue()).in(XzdAlterationInventory::getPrimaryMeterId, ids));
contractInventoryService.remove(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getContractType, ZxdEnum.ZONHEFUWUHET.getTypeValue()).in(XzdContractInventory::getPrimaryMeterId, ids));
return baseMapper.deleteByIds(ids) > 0;
}
@ -271,5 +320,31 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
lambdaQueryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId());
List<XzdJsDeductionItems> list = deductionItemsService.list(lambdaQueryWrapper2);
vo.setKkyjlx(list);
//变更增加清单
List<XzdAlterationInventory> list1 = alterationInventoryService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdAlterationInventory>()
.eq(XzdAlterationInventory::getPrimaryMeterId, vo.getId())
.eq(XzdAlterationInventory::getContractType, ZxdEnum.ZONHEFUWUHET.getTypeValue()));
vo.setBgzjqd(list1);
//获取合同内外清单
List<XzdContractInventory> list2 = contractInventoryService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdContractInventory>()
.eq(XzdContractInventory::getPrimaryMeterId, vo.getId())
.eq(XzdContractInventory::getContractType, ZxdEnum.ZONHEFUWUHET.getTypeValue()));
if (list2 != null && !list2.isEmpty()){
List<XzdContractInventory> nList = new ArrayList<>();
List<XzdContractInventory> wList = new ArrayList<>();
for (XzdContractInventory item : list2) {
if (ZxdEnum.HETONGLEIXING.getTypeValue().equals(item.getType())) {
wList.add(item);
} else {
nList.add(item);
}
}
//合同内清单
vo.setHtnqd(nList);
//合同外清单
vo.setHtwqd(wList);
}
}
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/settlement/XzdJsCghtCgrkqdMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.xzd.settlement.mapper.XzdJsCghtCgrkqdMapper">
</mapper>

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/settlement/XzdJsCghtJstzqdMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.xzd.settlement.mapper.XzdJsCghtJstzqdMapper">
</mapper>