From 253ef81066589bcc8b266c333876c8eb5859dab7 Mon Sep 17 00:00:00 2001 From: lg Date: Tue, 14 Oct 2025 15:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=90=88=E5=90=8C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PurchaseContractAlterationServiceImpl.java | 2 +- .../controller/XzdSubcontractController.java | 105 +++++ .../domain/XzdSubcontract.java | 259 ++++++++++ .../domain/bo/XzdSubcontractBo.java | 292 ++++++++++++ .../domain/vo/XzdSubcontractVo.java | 419 +++++++++++++++++ .../mapper/XzdSubcontractMapper.java | 15 + .../service/IXzdSubcontractService.java | 70 +++ .../impl/XzdSubcontractServiceImpl.java | 441 ++++++++++++++++++ .../bo/XzdPurchaseContractInformationBo.java | 2 - ...urchaseContractInformationServiceImpl.java | 48 +- .../domain/bo/XzdGuaranteeChangeInfoBo.java | 13 + .../domain/vo/XzdGuaranteeChangeInfoVo.java | 13 + .../XzdGuaranteeChangeInfoServiceImpl.java | 9 + .../org/dromara/xzd/enums/XzdClassEnum.java | 5 + .../java/org/dromara/xzd/enums/ZxdEnum.java | 3 +- 15 files changed, 1665 insertions(+), 31 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/mapper/XzdSubcontractMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java index 52199277..1888ab8c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java @@ -156,7 +156,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl list(XzdSubcontractBo bo, PageQuery pageQuery) { + return xzdSubcontractService.queryPageList(bo, pageQuery); + } + + /** + * 导出分包合同信息列表 + */ + @SaCheckPermission("fenbaohetongxinxi:subcontract:export") + @Log(title = "分包合同信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(XzdSubcontractBo bo, HttpServletResponse response) { + List list = xzdSubcontractService.queryList(bo); + ExcelUtil.exportExcel(list, "分包合同信息", XzdSubcontractVo.class, response); + } + + /** + * 获取分包合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("fenbaohetongxinxi:subcontract:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdSubcontractService.queryById(id)); + } + + /** + * 新增分包合同信息 + */ + @SaCheckPermission("fenbaohetongxinxi:subcontract:add") + @Log(title = "分包合同信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody XzdSubcontractBo bo) { + return toAjax(xzdSubcontractService.insertByBo(bo)); + } + + /** + * 修改分包合同信息 + */ + @SaCheckPermission("fenbaohetongxinxi:subcontract:edit") + @Log(title = "分包合同信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody XzdSubcontractBo bo) { + return toAjax(xzdSubcontractService.updateByBo(bo)); + } + + /** + * 删除分包合同信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("fenbaohetongxinxi:subcontract:remove") + @Log(title = "分包合同信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(xzdSubcontractService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java new file mode 100644 index 00000000..fc875d67 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java @@ -0,0 +1,259 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.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; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 分包合同信息对象 xzd_subcontract + * + * @author Lion Li + * @date 2025-10-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xzd_subcontract") +public class XzdSubcontract extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 合同编码 + */ + private String contractCode; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 单据日期 + */ + private LocalDate documentDate; + + /** + * 合同类型 + */ + private String contractType; + + /** + * 项目 + */ + private Long project; + + /** + * 经营模式 + */ + private String businessModel; + + /** + * 原合同造价 + */ + private BigDecimal originalContractCost; + + /** + * 含税合同金额 + */ + private BigDecimal taxInclusiveContractAmount; + + /** + * 累计变更金额 + */ + private BigDecimal cumulativeChangeAmount; + + /** + * 签订日期 + */ + private LocalDate signingDate; + + /** + * 甲方单位 + */ + private Long partyAUnit; + + /** + * 乙方单位 + */ + private Long partyBUnit; + + /** + * 合同状态（字典） + */ + private String contractStatus; + + /** + * 管理组织 + */ + private Long managementOrganization; + + /** + * 执行项目经理 + */ + private Long executiveProjectManager; + + /** + * 开票单位 + */ + private Long invoicingUnit; + + /** + * 收票单位 + */ + private Long ticketReceivingUnit; + + /** + * 归档日期 + */ + private LocalDate filingDate; + + /** + * 目标成本 + */ + private BigDecimal targetCost; + + /** + * 可用目标成本 + */ + private BigDecimal availableTargetCost; + + /** + * 是否用印（0：否，1：是） + */ + private Long isStamped; + + /** + * 警示 + */ + private String warning; + + /** + * 支付条款 + */ + private String paymentTerms; + + /** + * 备注 + */ + private String remarks; + + /** + * 大写合同价税合计 + */ + private String capitalizedTaxInclusiveTotal; + + /** + * 签约组织 + */ + private Long signingOrganization; + + /** + * 项目类型（字典） + */ + private String projectType; + + /** + * 项目大类（字典） + */ + private String projectCategory; + + /** + * 关联主合同 + */ + private String associatedMainContract; + + /** + * 是否子合同（0：否，1：是） + */ + private Long isSubContract; + + /** + * 项目责任人 + */ + private Long projectResponsiblePerson; + + /** + * 分包单位负责人 + */ + private Long subcontractorLeader; + + /** + * 是否需备案（0：否，1：是） + */ + private Long isNeedFiling; + + /** + * 备案状态 + */ + private String filingStatus; + + /** + * 备案时间 + */ + private LocalDateTime filingTime; + + /** + * WBS + */ + private String wbs; + + /** + * 预算分类（字典） + */ + private String budgetClassification; + + /** + * 是否固定单价合同（0：否，1：是） + */ + private Long isFixedUnitPriceContract; + + /** + * 是否总价包干合同（0：否，1：是） + */ + private Long isLumpSumContract; + + /** + * 付款额不能超合同额（0：否，1：是） + */ + private Long isPaymentNotExceedContract; + + /** + * 付款额不能超合同额支付比例(%) + */ + private BigDecimal paymentNotExceedRatio; + + /** + * 预结算/结算额不能超合同额（0：否，1：是） + */ + private Long isPreSettlementNotExceedContract; + + /** + * 预结算/结算额不能超合同额比例(%) + */ + private BigDecimal preSettlementNotExceedRatio; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + /** + * 单据引用ID + */ + private Long danjuId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java new file mode 100644 index 00000000..4d60638d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java @@ -0,0 +1,292 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo; + +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; +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 org.dromara.xzd.domain.*; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 分包合同信息业务对象 xzd_subcontract + * + * @author Lion Li + * @date 2025-10-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = XzdSubcontract.class, reverseConvertGenerate = false) +public class XzdSubcontractBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 合同编码 + */ + @NotBlank(message = "合同编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contractCode; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 单据日期 + */ + private LocalDate documentDate; + + /** + * 合同类型 + */ + private String contractType; + + /** + * 项目 + */ + private Long project; + + /** + * 经营模式 + */ + private String businessModel; + + /** + * 原合同造价 + */ + private BigDecimal originalContractCost; + + /** + * 含税合同金额 + */ + private BigDecimal taxInclusiveContractAmount; + + /** + * 累计变更金额 + */ + private BigDecimal cumulativeChangeAmount; + + /** + * 签订日期 + */ + private LocalDate signingDate; + + /** + * 甲方单位 + */ + private Long partyAUnit; + + /** + * 乙方单位 + */ + private Long partyBUnit; + + /** + * 合同状态（字典） + */ + private String contractStatus; + + /** + * 管理组织 + */ + private Long managementOrganization; + + /** + * 执行项目经理 + */ + private Long executiveProjectManager; + + /** + * 开票单位 + */ + private Long invoicingUnit; + + /** + * 收票单位 + */ + private Long ticketReceivingUnit; + + /** + * 归档日期 + */ + private LocalDate filingDate; + + /** + * 目标成本 + */ + private BigDecimal targetCost; + + /** + * 可用目标成本 + */ + private BigDecimal availableTargetCost; + + /** + * 是否用印（0：否，1：是） + */ + private Long isStamped; + + /** + * 警示 + */ + private String warning; + + /** + * 支付条款 + */ + private String paymentTerms; + + /** + * 备注 + */ + private String remarks; + + /** + * 大写合同价税合计 + */ + private String capitalizedTaxInclusiveTotal; + + /** + * 签约组织 + */ + private Long signingOrganization; + + /** + * 项目类型（字典） + */ + private String projectType; + + /** + * 项目大类（字典） + */ + private String projectCategory; + + /** + * 关联主合同 + */ + private String associatedMainContract; + + /** + * 是否子合同（0：否，1：是） + */ + private Long isSubContract; + + /** + * 项目责任人 + */ + private Long projectResponsiblePerson; + + /** + * 分包单位负责人 + */ + private Long subcontractorLeader; + + /** + * 是否需备案（0：否，1：是） + */ + private Long isNeedFiling; + + /** + * 备案状态 + */ + private String filingStatus; + + /** + * 备案时间 + */ + private LocalDateTime filingTime; + + /** + * WBS + */ + private String wbs; + + /** + * 预算分类（字典） + */ + private String budgetClassification; + + /** + * 是否固定单价合同（0：否，1：是） + */ + private Long isFixedUnitPriceContract; + + /** + * 是否总价包干合同（0：否，1：是） + */ + private Long isLumpSumContract; + + /** + * 付款额不能超合同额（0：否，1：是） + */ + private Long isPaymentNotExceedContract; + + /** + * 付款额不能超合同额支付比例(%) + */ + private BigDecimal paymentNotExceedRatio; + + /** + * 预结算/结算额不能超合同额（0：否，1：是） + */ + private Long isPreSettlementNotExceedContract; + + /** + * 预结算/结算额不能超合同额比例(%) + */ + private BigDecimal preSettlementNotExceedRatio; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + /** + * 单据引用ID + */ + private Long danjuId; + + + private LocalDate startDate; + private LocalDate endDate; + + + /** + * 预收款项 + */ + private List yskx; + + /** + * 扣款与奖励项 + */ + private List kkyjlx; + + /** + * 合同条款 + */ + private List httk; + + /** + * 支付条款 + */ + private List zftk; + + /** + * 合同主要条款约定 + */ + private XzdContractDepositInfo htzytkyd; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java new file mode 100644 index 00000000..89a79b67 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java @@ -0,0 +1,419 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo; + +import java.math.BigDecimal; + +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; +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.domain.*; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + + +/** + * 分包合同信息视图对象 xzd_subcontract + * + * @author Lion Li + * @date 2025-10-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XzdSubcontract.class) +public class XzdSubcontractVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 合同编码 + */ + @ExcelProperty(value = "合同编码") + private String contractCode; + + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; + + /** + * 单据日期 + */ + @ExcelProperty(value = "单据日期") + private LocalDate documentDate; + + /** + * 合同类型 + */ + @ExcelProperty(value = "合同类型") + private String contractType; + + /** + * 项目 + */ + @ExcelProperty(value = "项目") + private Long project; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 经营模式 + */ + @ExcelProperty(value = "经营模式") + private String businessModel; + + /** + * 原合同造价 + */ + @ExcelProperty(value = "原合同造价") + private BigDecimal originalContractCost; + + /** + * 含税合同金额 + */ + @ExcelProperty(value = "含税合同金额") + private BigDecimal taxInclusiveContractAmount; + + /** + * 累计变更金额 + */ + @ExcelProperty(value = "累计变更金额") + private BigDecimal cumulativeChangeAmount; + + /** + * 签订日期 + */ + @ExcelProperty(value = "签订日期") + private LocalDate signingDate; + + /** + * 甲方单位 + */ + @ExcelProperty(value = "甲方单位") + private Long partyAUnit; + + + /** + * 甲方单位名称 + */ + @ExcelProperty(value = "甲方单位名称") + private String partyAUnitName; + + + /** + * 乙方单位 + */ + @ExcelProperty(value = "乙方单位") + private Long partyBUnit; + + /** + * 乙方单位名称 + */ + @ExcelProperty(value = "乙方单位名称") + private String partyBUnitName; + + /** + * 合同状态（字典） + */ + @ExcelProperty(value = "合同状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典") + private String contractStatus; + + /** + * 管理组织 + */ + @ExcelProperty(value = "管理组织") + private Long managementOrganization; + + /** + * 管理组织名称 + */ + @ExcelProperty(value = "管理组织名称") + private String managementOrganizationName; + + /** + * 执行项目经理 + */ + @ExcelProperty(value = "执行项目经理") + private Long executiveProjectManager; + + /** + * 执行项目经理名称 + */ + @ExcelProperty(value = "执行项目经理名称") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "executiveProjectManager") + private String executiveProjectManagerName; + + /** + * 开票单位 + */ + @ExcelProperty(value = "开票单位") + private Long invoicingUnit; + + /** + * 开票单位名称 + */ + @ExcelProperty(value = "开票单位名称", converter = ExcelDictConvert.class) + private String invoicingUnitName; + + /** + * 收票单位 + */ + @ExcelProperty(value = "收票单位") + private Long ticketReceivingUnit; + + /** + * 收票单位名称 + */ + @ExcelProperty(value = "收票单位名称", converter = ExcelDictConvert.class) + private String ticketReceivingUnitName; + + /** + * 归档日期 + */ + @ExcelProperty(value = "归档日期") + private LocalDate filingDate; + + /** + * 目标成本 + */ + @ExcelProperty(value = "目标成本") + private BigDecimal targetCost; + + /** + * 可用目标成本 + */ + @ExcelProperty(value = "可用目标成本") + private BigDecimal availableTargetCost; + + /** + * 是否用印（0：否，1：是） + */ + @ExcelProperty(value = "是否用印", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isStamped; + + /** + * 警示 + */ + @ExcelProperty(value = "警示") + private String warning; + + /** + * 支付条款 + */ + @ExcelProperty(value = "支付条款") + private String paymentTerms; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remarks; + + /** + * 大写合同价税合计 + */ + @ExcelProperty(value = "大写合同价税合计") + private String capitalizedTaxInclusiveTotal; + + /** + * 签约组织 + */ + @ExcelProperty(value = "签约组织") + private Long signingOrganization; + + /** + * 签约组织名称 + */ + @ExcelProperty(value = "签约组织名称") + private String signingOrganizationName; + + /** + * 项目类型（字典） + */ + @ExcelProperty(value = "项目类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典") + private String projectType; + + /** + * 项目大类（字典） + */ + @ExcelProperty(value = "项目大类", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典") + private String projectCategory; + + /** + * 关联主合同 + */ + @ExcelProperty(value = "关联主合同") + private String associatedMainContract; + + /** + * 是否子合同（0：否，1：是） + */ + @ExcelProperty(value = "是否子合同", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isSubContract; + + /** + * 项目责任人 + */ + @ExcelProperty(value = "项目责任人") + private Long projectResponsiblePerson; + + /** + * 项目责任人名称 + */ + @ExcelProperty(value = "项目责任人名称") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "projectResponsiblePerson") + private String projectResponsiblePersonName; + + /** + * 分包单位负责人 + */ + @ExcelProperty(value = "分包单位负责人") + private Long subcontractorLeader; + + /** + * 分包单位负责人名称 + */ + @ExcelProperty(value = "分包单位负责人名称") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "projectResponsiblePerson") + private String subcontractorLeaderName; + + + /** + * 是否需备案（0：否，1：是） + */ + @ExcelProperty(value = "是否需备案", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isNeedFiling; + + /** + * 备案状态 + */ + @ExcelProperty(value = "备案状态") + private String filingStatus; + + /** + * 备案时间 + */ + @ExcelProperty(value = "备案时间") + private LocalDateTime filingTime; + + /** + * WBS + */ + @ExcelProperty(value = "WBS") + private String wbs; + + /** + * 预算分类（字典） + */ + @ExcelProperty(value = "预算分类", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典") + private String budgetClassification; + + /** + * 是否固定单价合同（0：否，1：是） + */ + @ExcelProperty(value = "是否固定单价合同", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isFixedUnitPriceContract; + + /** + * 是否总价包干合同（0：否，1：是） + */ + @ExcelProperty(value = "是否总价包干合同", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isLumpSumContract; + + /** + * 付款额不能超合同额（0：否，1：是） + */ + @ExcelProperty(value = "付款额不能超合同额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isPaymentNotExceedContract; + + /** + * 付款额不能超合同额支付比例(%) + */ + @ExcelProperty(value = "付款额不能超合同额支付比例(%)") + private BigDecimal paymentNotExceedRatio; + + /** + * 预结算/结算额不能超合同额（0：否，1：是） + */ + @ExcelProperty(value = "预结算/结算额不能超合同额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：否，1：是") + private Long isPreSettlementNotExceedContract; + + /** + * 预结算/结算额不能超合同额比例(%) + */ + @ExcelProperty(value = "预结算/结算额不能超合同额比例(%)") + private BigDecimal preSettlementNotExceedRatio; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + /** + * 单据引用ID + */ + @ExcelProperty(value = "单据引用ID") + private Long danjuId; + + /** + * 预收款项 + */ + private List yskx; + + /** + * 扣款与奖励项 + */ + private List kkyjlx; + + /** + * 合同条款 + */ + private List httk; + + /** + * 支付条款 + */ + private List zftk; + + /** + * 合同主要条款约定 + */ + private XzdContractDepositInfo htzytkyd; + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/mapper/XzdSubcontractMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/mapper/XzdSubcontractMapper.java new file mode 100644 index 00000000..3886e0c2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/mapper/XzdSubcontractMapper.java @@ -0,0 +1,15 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.mapper; + +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 分包合同信息Mapper接口 + * + * @author Lion Li + * @date 2025-10-14 + */ +public interface XzdSubcontractMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java new file mode 100644 index 00000000..75cf06c4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java @@ -0,0 +1,70 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.service; + +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; +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-14 + */ +public interface IXzdSubcontractService extends IService{ + + /** + * 查询分包合同信息 + * + * @param id 主键 + * @return 分包合同信息 + */ + XzdSubcontractVo queryById(Long id); + + /** + * 分页查询分包合同信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分包合同信息分页列表 + */ + TableDataInfo queryPageList(XzdSubcontractBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的分包合同信息列表 + * + * @param bo 查询条件 + * @return 分包合同信息列表 + */ + List queryList(XzdSubcontractBo bo); + + /** + * 新增分包合同信息 + * + * @param bo 分包合同信息 + * @return 是否新增成功 + */ + Boolean insertByBo(XzdSubcontractBo bo); + + /** + * 修改分包合同信息 + * + * @param bo 分包合同信息 + * @return 是否修改成功 + */ + Boolean updateByBo(XzdSubcontractBo bo); + + /** + * 校验并批量删除分包合同信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java new file mode 100644 index 00000000..bc806254 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java @@ -0,0 +1,441 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.domain.R; +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.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; +import org.dromara.xzd.domain.*; +import org.dromara.xzd.domain.dto.QuerCorrespondentDto; +import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.enums.ZxdEnum; +import org.dromara.xzd.service.IXzdContractAdvanceInfoService; +import org.dromara.xzd.service.IXzdContractClauseService; +import org.dromara.xzd.service.IXzdCorrespondentList; +import org.dromara.xzd.service.IXzdDeductionItemsService; +import org.dromara.xzd.service.impl.*; +import org.dromara.xzd.utilS.AreaUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.mapper.XzdSubcontractMapper; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.util.*; + + +/** + * 分包合同信息Service业务层处理 + * + * @author Lion Li + * @date 2025-10-14 + */ +@RequiredArgsConstructor +@Service +public class XzdSubcontractServiceImpl extends ServiceImpl implements IXzdSubcontractService { + + private final XzdSubcontractMapper baseMapper; + + @Autowired + private XzdContractAdvanceInfoServiceImpl xzdContractAdvanceInfoService; + @Autowired + private XzdDeductionItemsServiceImpl xzdDeductionItemsService; + @Autowired + private XzdContractClauseServiceImpl xzdContractClauseService; + @Autowired + private XzdSettlementRulesServiceImpl xzdSettlementRulesService; + @Autowired + private XzdContractDepositInfoServiceImpl xzdContractDepositInfoService; + + @Autowired + private XzdProjectServiceImpl xzdProjectService; + @Autowired + private IXzdCorrespondentList iXzdCorrespondentList; + @Autowired + private XzdSupplierInfoServiceImpl xzdSupplierInfoService; + + private final IXzdContractAdvanceInfoService iXzdContractAdvanceInfoService; + + private final IXzdDeductionItemsService iXzdDeductionItemsService; + + private final IXzdContractClauseService iXzdContractClauseService; + + @Autowired + private SysOssServiceImpl sysOssService; + private final AreaUtil areaUtil; + + /** + * 查询分包合同信息 + * + * @param id 主键 + * @return 分包合同信息 + */ + @Override + public XzdSubcontractVo queryById(Long id){ + XzdSubcontractVo xzdSubcontractVo = baseMapper.selectVoById(id); + List informationVo = List.of(xzdSubcontractVo); + // 装填数据 + setValue(informationVo); + + return baseMapper.selectVoById(id); + } + + /** + * 分页查询分包合同信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分包合同信息分页列表 + */ + @Override + public TableDataInfo queryPageList(XzdSubcontractBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + setValue(result.getRecords()); + return TableDataInfo.build(result); + } + + private void setValue(List infos) { + for (XzdSubcontractVo item : infos) { + + + //项目名称 + if (item.getProject() != null){ + String projectName = xzdProjectService.queryNameById(item.getProject()); + if (projectName != null){ + item.setProjectName(projectName); + } + } + //甲方单位(客户信息列表) + R byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit()); + if (byid!=null){ + if (byid.getData().getXzdCustomerinformation() != null){ + item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); + } + } + //乙方单位(供应商信息列表) + if (item.getPartyBUnit() != null){ + String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit()); + if (unitName != null){ + item.setPartyBUnitName(unitName); + } + } + //管理组织(供应商) + String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit()); + + if (unitName != null){ + item.setManagementOrganizationName(unitName); + } + //开票单位名称(供应商名称) + String unitName1 = xzdSupplierInfoService.queryNameById(item.getInvoicingUnit()); + if (unitName1 != null){ + item.setInvoicingUnitName(unitName1); + } + //收票单位名称(客户名称) + R byid2 = iXzdCorrespondentList.getCustomerByid(item.getTicketReceivingUnit()); + if (byid2!=null){ + if (byid2.getData().getXzdCustomerinformation() != null){ + item.setTicketReceivingUnitName(byid2.getData().getXzdCustomerinformation().getUnitName()); + } + } + //签约组织(供应商) + String unitName2 = xzdSupplierInfoService.queryNameById(item.getSigningOrganization()); + if (unitName2!= null){ + item.setSigningOrganizationName(unitName2); + } + //合同文本-预收款项 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId()); + List advanceInfos = xzdContractAdvanceInfoService.list(lambdaQueryWrapper); + item.setYskx(advanceInfos); + + //合同条款-扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.eq(XzdDeductionItems::getContractDetailsId, item.getId()); + List list = xzdDeductionItemsService.list(lambdaQueryWrapper1); + item.setKkyjlx(list); + + //合同条款-合同条款 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(XzdContractClause::getContractDetailsId, item.getId()); + List list1 = xzdContractClauseService.list(lambdaQueryWrapper2); + item.setHttk(list1); + + //支付条款 + LambdaQueryWrapper lambdaQueryWrapper3 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper3.eq(XzdSettlementRules::getContractDetailsId, item.getId()); + List list2 = xzdSettlementRulesService.list(lambdaQueryWrapper3); + item.setZftk(list2); + + //合同文本-合同主要条款约定 + LambdaQueryWrapper lambdaQueryWrapper4 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper4.eq(XzdContractDepositInfo::getContractDetailsId, item.getId()); + XzdContractDepositInfo list3 = xzdContractDepositInfoService.getOne(lambdaQueryWrapper4); + item.setHtzytkyd(list3); + + + } + + } + + /** + * 查询符合条件的分包合同信息列表 + * + * @param bo 查询条件 + * @return 分包合同信息列表 + */ + @Override + public List queryList(XzdSubcontractBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(XzdSubcontractBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(XzdSubcontract::getId); + lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdSubcontract::getContractCode, bo.getContractCode()); + lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdSubcontract::getContractName, bo.getContractName()); + lqw.eq(bo.getDocumentDate() != null, XzdSubcontract::getDocumentDate, bo.getDocumentDate()); + lqw.ge(bo.getStartDate() != null, XzdSubcontract::getDocumentDate, bo.getStartDate()); + lqw.le(bo.getEndDate() != null, XzdSubcontract::getDocumentDate, bo.getEndDate()); + + + lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdSubcontract::getContractType, bo.getContractType()); + lqw.eq(bo.getProject() != null, XzdSubcontract::getProject, bo.getProject()); + lqw.eq(StringUtils.isNotBlank(bo.getBusinessModel()), XzdSubcontract::getBusinessModel, bo.getBusinessModel()); + lqw.eq(bo.getOriginalContractCost() != null, XzdSubcontract::getOriginalContractCost, bo.getOriginalContractCost()); + lqw.eq(bo.getTaxInclusiveContractAmount() != null, XzdSubcontract::getTaxInclusiveContractAmount, bo.getTaxInclusiveContractAmount()); + lqw.eq(bo.getCumulativeChangeAmount() != null, XzdSubcontract::getCumulativeChangeAmount, bo.getCumulativeChangeAmount()); + lqw.eq(bo.getSigningDate() != null, XzdSubcontract::getSigningDate, bo.getSigningDate()); + lqw.eq(bo.getPartyAUnit() != null, XzdSubcontract::getPartyAUnit, bo.getPartyAUnit()); + lqw.eq(bo.getPartyBUnit() != null, XzdSubcontract::getPartyBUnit, bo.getPartyBUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getContractStatus()), XzdSubcontract::getContractStatus, bo.getContractStatus()); + lqw.eq(bo.getManagementOrganization() != null, XzdSubcontract::getManagementOrganization, bo.getManagementOrganization()); + lqw.eq(bo.getExecutiveProjectManager() != null, XzdSubcontract::getExecutiveProjectManager, bo.getExecutiveProjectManager()); + lqw.eq(bo.getInvoicingUnit() != null, XzdSubcontract::getInvoicingUnit, bo.getInvoicingUnit()); + lqw.eq(bo.getTicketReceivingUnit() != null, XzdSubcontract::getTicketReceivingUnit, bo.getTicketReceivingUnit()); + lqw.eq(bo.getFilingDate() != null, XzdSubcontract::getFilingDate, bo.getFilingDate()); + lqw.eq(bo.getTargetCost() != null, XzdSubcontract::getTargetCost, bo.getTargetCost()); + lqw.eq(bo.getAvailableTargetCost() != null, XzdSubcontract::getAvailableTargetCost, bo.getAvailableTargetCost()); + lqw.eq(bo.getIsStamped() != null, XzdSubcontract::getIsStamped, bo.getIsStamped()); + lqw.eq(StringUtils.isNotBlank(bo.getWarning()), XzdSubcontract::getWarning, bo.getWarning()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentTerms()), XzdSubcontract::getPaymentTerms, bo.getPaymentTerms()); + lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), XzdSubcontract::getRemarks, bo.getRemarks()); + lqw.eq(StringUtils.isNotBlank(bo.getCapitalizedTaxInclusiveTotal()), XzdSubcontract::getCapitalizedTaxInclusiveTotal, bo.getCapitalizedTaxInclusiveTotal()); + lqw.eq(bo.getSigningOrganization() != null, XzdSubcontract::getSigningOrganization, bo.getSigningOrganization()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectType()), XzdSubcontract::getProjectType, bo.getProjectType()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectCategory()), XzdSubcontract::getProjectCategory, bo.getProjectCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getAssociatedMainContract()), XzdSubcontract::getAssociatedMainContract, bo.getAssociatedMainContract()); + lqw.eq(bo.getIsSubContract() != null, XzdSubcontract::getIsSubContract, bo.getIsSubContract()); + lqw.eq(bo.getProjectResponsiblePerson() != null, XzdSubcontract::getProjectResponsiblePerson, bo.getProjectResponsiblePerson()); + lqw.eq(bo.getSubcontractorLeader() != null, XzdSubcontract::getSubcontractorLeader, bo.getSubcontractorLeader()); + lqw.eq(bo.getIsNeedFiling() != null, XzdSubcontract::getIsNeedFiling, bo.getIsNeedFiling()); + lqw.eq(StringUtils.isNotBlank(bo.getFilingStatus()), XzdSubcontract::getFilingStatus, bo.getFilingStatus()); + lqw.eq(bo.getFilingTime() != null, XzdSubcontract::getFilingTime, bo.getFilingTime()); + lqw.eq(StringUtils.isNotBlank(bo.getWbs()), XzdSubcontract::getWbs, bo.getWbs()); + lqw.eq(StringUtils.isNotBlank(bo.getBudgetClassification()), XzdSubcontract::getBudgetClassification, bo.getBudgetClassification()); + lqw.eq(bo.getIsFixedUnitPriceContract() != null, XzdSubcontract::getIsFixedUnitPriceContract, bo.getIsFixedUnitPriceContract()); + lqw.eq(bo.getIsLumpSumContract() != null, XzdSubcontract::getIsLumpSumContract, bo.getIsLumpSumContract()); + lqw.eq(bo.getIsPaymentNotExceedContract() != null, XzdSubcontract::getIsPaymentNotExceedContract, bo.getIsPaymentNotExceedContract()); + lqw.eq(bo.getPaymentNotExceedRatio() != null, XzdSubcontract::getPaymentNotExceedRatio, bo.getPaymentNotExceedRatio()); + lqw.eq(bo.getIsPreSettlementNotExceedContract() != null, XzdSubcontract::getIsPreSettlementNotExceedContract, bo.getIsPreSettlementNotExceedContract()); + lqw.eq(bo.getPreSettlementNotExceedRatio() != null, XzdSubcontract::getPreSettlementNotExceedRatio, bo.getPreSettlementNotExceedRatio()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), XzdSubcontract::getFileId, bo.getFileId()); + lqw.eq(bo.getDanjuId() != null, XzdSubcontract::getDanjuId, bo.getDanjuId()); + return lqw; + } + + /** + * 新增分包合同信息 + * + * @param bo 分包合同信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(XzdSubcontractBo bo) { + XzdSubcontract add = MapstructUtils.convert(bo, XzdSubcontract.class); + validEntityBeforeSave(add); + Long l = baseMapper.selectCount(new LambdaQueryWrapper().gt(XzdSubcontract::getCreateTime, LocalDate.now())); + String s = areaUtil.generateDateBasedNumberByY(); + boolean flag = baseMapper.insert(add) > 0; + add.setContractCode(ZxdEnum.FENBAOHETONG_PREFIX.getTypeValue()+"-"+s+"-"+(l+1)); +// 表名 + String tableName = XzdClassEnum.FENBAOHETONG_INFORMATION.getClassName(); + + //预收款项 + for (XzdContractAdvanceInfo yskx : bo.getYskx()) { + yskx.setTableName(tableName); + yskx.setContractDetailsId(add.getId()); + } + xzdContractAdvanceInfoService.saveBatch(bo.getYskx()); + + //合同条款-扣款与奖励项 + for (XzdDeductionItems kkyjlx : bo.getKkyjlx()) { + kkyjlx.setTableName(tableName); + kkyjlx.setContractDetailsId(add.getId()); + } + xzdDeductionItemsService.saveBatch(bo.getKkyjlx()); + + //合同条款-合同条款 + for (XzdContractClause clause : bo.getHttk()) { + clause.setTableName(tableName); + clause.setContractDetailsId(add.getId()); + } + xzdContractClauseService.saveBatch(bo.getHttk()); + + //支付条款 + for (XzdSettlementRules clause : bo.getZftk()) { + clause.setContractDetailsId(add.getId()); + } + xzdSettlementRulesService.saveBatch(bo.getZftk()); + + //合同主要条款约定 + bo.getHtzytkyd().setTableName(tableName); + bo.getHtzytkyd().setContractDetailsId(add.getId()); + + xzdContractDepositInfoService.save(bo.getHtzytkyd()); + + + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改分包合同信息 + * + * @param bo 分包合同信息 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(XzdSubcontractBo bo) { + XzdSubcontract update = MapstructUtils.convert(bo, XzdSubcontract.class); + validEntityBeforeSave(update); + + /** + * 预收款项 优先删除数据在添加 + */ + String tableName = XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName(); + HashMap hashMap = new HashMap<>(); + hashMap.put("contract_details_id", bo.getId()); + List yskx = bo.getYskx(); + iXzdContractAdvanceInfoService.getBaseMapper().deleteByMap(hashMap); + if (yskx != null){ + yskx.forEach(item -> { + item.setTableName(tableName); + item.setContractDetailsId(bo.getId()); + }); + iXzdContractAdvanceInfoService.saveBatch(yskx); + } + /** + * 扣款与奖励项 + */ + List kkyjlx = bo.getKkyjlx(); + iXzdDeductionItemsService.getBaseMapper().deleteByMap(hashMap); + if(kkyjlx != null){ + kkyjlx.forEach(item -> { + item.setTableName(tableName); + item.setContractDetailsId(bo.getId()); + }); + iXzdDeductionItemsService.saveBatch(kkyjlx); + } + /** + * 合同条款 + */ + List httk = bo.getHttk(); + iXzdContractClauseService.getBaseMapper().deleteByMap(hashMap); + if (httk != null){ + httk.forEach(item -> { + item.setTableName(tableName); + item.setContractDetailsId(bo.getId()); + }); + iXzdContractClauseService.saveBatch(httk); + } +// 支付条款 + List zftk = bo.getZftk(); + xzdSettlementRulesService.getBaseMapper().deleteByMap(hashMap); + if(zftk != null){ + zftk.forEach(item -> + item.setContractDetailsId(bo.getId())); + } + xzdSettlementRulesService.saveOrUpdateBatch(bo.getZftk()); + + + + bo.getHtzytkyd().setTableName(XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName()); + xzdContractDepositInfoService.saveOrUpdate(bo.getHtzytkyd()); + + + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(XzdSubcontract entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除分包合同信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + + for (Long id : ids) { + XzdSubcontractVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List deleteIds = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } + } + } + } + //合同文本-预收款项 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); + xzdContractAdvanceInfoService.remove(lambdaQueryWrapper); + + //合同条款-扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.in(XzdDeductionItems::getContractDetailsId, ids); + xzdDeductionItemsService.remove(lambdaQueryWrapper1); + + //合同条款-合同条款 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.in(XzdContractClause::getContractDetailsId, ids); + xzdContractClauseService.remove(lambdaQueryWrapper2); + + //支付条款 + LambdaQueryWrapper lambdaQueryWrapper3 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper3.in(XzdSettlementRules::getContractDetailsId, ids); + xzdSettlementRulesService.remove(lambdaQueryWrapper3); + + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java index 41de9b52..f48d3aab 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java @@ -280,9 +280,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { */ private String auditStatus; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate startDate; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate endDate; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index 260c1433..4660efc9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -74,6 +74,7 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl informationVo = List.of(xzdPurchaseContractInformationVo); - // 装填数据 setValue(informationVo); @@ -339,31 +337,27 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); - xzdContractAdvanceInfoService.remove(lambdaQueryWrapper); - - //合同条款-扣款与奖励项 - LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper1.in(XzdDeductionItems::getContractDetailsId, ids); - xzdDeductionItemsService.remove(lambdaQueryWrapper1); - - //合同条款-合同条款 - LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper2.in(XzdContractClause::getContractDetailsId, ids); - xzdContractClauseService.remove(lambdaQueryWrapper2); - - //支付条款 - LambdaQueryWrapper lambdaQueryWrapper3 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper3.in(XzdSettlementRules::getContractDetailsId, ids); - xzdSettlementRulesService.remove(lambdaQueryWrapper3); } + //合同文本-预收款项 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids); + xzdContractAdvanceInfoService.remove(lambdaQueryWrapper); + + //合同条款-扣款与奖励项 + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.in(XzdDeductionItems::getContractDetailsId, ids); + xzdDeductionItemsService.remove(lambdaQueryWrapper1); + + //合同条款-合同条款 + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.in(XzdContractClause::getContractDetailsId, ids); + xzdContractClauseService.remove(lambdaQueryWrapper2); + + //支付条款 + LambdaQueryWrapper lambdaQueryWrapper3 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper3.in(XzdSettlementRules::getContractDetailsId, ids); + xzdSettlementRulesService.remove(lambdaQueryWrapper3); return baseMapper.deleteByIds(ids) > 0; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/bo/XzdGuaranteeChangeInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/bo/XzdGuaranteeChangeInfoBo.java index 35500ffb..b081c67a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/bo/XzdGuaranteeChangeInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/bo/XzdGuaranteeChangeInfoBo.java @@ -1,5 +1,7 @@ package org.dromara.xzd.deposit.backletter.domain.bo; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.deposit.backletter.domain.XzdGuaranteeChangeInfo; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -55,6 +57,11 @@ public class XzdGuaranteeChangeInfoBo extends BaseEntity { */ private Long contractGuaranteeId; + /** + * 合同保函名称 + */ + private Long contractGuaranteeName; + /** * 工程项目 */ @@ -65,6 +72,12 @@ public class XzdGuaranteeChangeInfoBo extends BaseEntity { */ private Long handlerId; + /** + * 经办人名称 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "handlerId") + private Long handlerName; + /** * 变更类型（字典） */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/vo/XzdGuaranteeChangeInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/vo/XzdGuaranteeChangeInfoVo.java index edfc2c54..aada246a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/vo/XzdGuaranteeChangeInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/vo/XzdGuaranteeChangeInfoVo.java @@ -72,6 +72,12 @@ public class XzdGuaranteeChangeInfoVo implements Serializable { @ExcelProperty(value = "合同保函") private Long contractGuaranteeId; + + /** + * 合同保函名称 + */ + private String contractGuaranteeName; + /** * 工程项目 */ @@ -84,6 +90,13 @@ public class XzdGuaranteeChangeInfoVo implements Serializable { @ExcelProperty(value = "经办人") private Long handlerId; + + /** + * 经办人名称 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "handlerId") + private String handlerName; + /** * 变更类型（字典） */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/service/impl/XzdGuaranteeChangeInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/service/impl/XzdGuaranteeChangeInfoServiceImpl.java index 8f65f3f2..ea5b13d2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/service/impl/XzdGuaranteeChangeInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/service/impl/XzdGuaranteeChangeInfoServiceImpl.java @@ -12,6 +12,8 @@ import lombok.RequiredArgsConstructor; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject; import org.dromara.xzd.biddingManagement.earnestMoneyWithdraw.domain.vo.XzdBidDepositRecoveryVo; +import org.dromara.xzd.deposit.contractBackletter.domain.vo.XzdGuaranteeInfoVo; +import org.dromara.xzd.deposit.contractBackletter.service.IXzdGuaranteeInfoService; import org.dromara.xzd.utilS.AreaUtil; import org.springframework.stereotype.Service; import org.dromara.xzd.deposit.backletter.domain.bo.XzdGuaranteeChangeInfoBo; @@ -42,6 +44,7 @@ public class XzdGuaranteeChangeInfoServiceImpl extends ServiceImpl