合同产品关联表

ruoyi-api/ruoyi-api-product/src/main/java/org/dromara/product/api/RemoteContractProdcutService.java

@@ -0,0 +1,30 @@
+package org.dromara.product.api;
+
+/**
+ * author
+ * 时间:2026/1/20，13:52
+ */
+
+import org.dromara.common.core.domain.R;
+import org.dromara.product.api.domain.ContractProductDto;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 产品与协议供货合同表示接口
+ */
+public interface RemoteContractProdcutService {
+
+    /**
+     * 批量添加商品合同信息
+     * @param bo
+     * @return
+     */
+    boolean add(List<ContractProductDto> bo) ;
+
+    List<ContractProductDto> queryList(Long contractSupplyId);
+
+    boolean delete(Long contractSupplyId);
+
+}

ruoyi-api/ruoyi-api-product/src/main/java/org/dromara/product/api/domain/ContractProductDto.java

@@ -0,0 +1,72 @@
+package org.dromara.product.api.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * author
+ * 时间:2026/1/20，13:50
+ */
+@Data
+public class ContractProductDto implements Serializable {
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 合同供货编号
+     */
+    private String contractSupplyNo;
+
+    /**
+     * 合同供货Id
+     */
+    private Long contractSupplyId;
+
+    /**
+     * 产品编号
+     */
+    private String productNo;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 供货周期（单位：天/月，根据业务定义）
+     */
+    private Long supplyCycle;
+
+    /**
+     * 库存属性
+     */
+    private String inventoryProperties;
+
+    /**
+     * 最小供货量
+     */
+    private Long minSupply;
+
+    /**
+     * 报价（支持大文本）
+     */
+    private String offerPrice;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ContractProductController.java

@@ -0,0 +1,106 @@
+package org.dromara.product.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.product.domain.vo.ContractProductVo;
+import org.dromara.product.domain.bo.ContractProductBo;
+import org.dromara.product.service.IContractProductService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 合同产品关联
+ * 前端访问路由地址为:/product/contracproduct
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/contracproduct")
+public class ContractProductController extends BaseController {
+
+    private final IContractProductService contractProductService;
+
+    /**
+     * 查询合同产品关联列表
+     */
+    @SaCheckPermission("product:contracproduct:list")
+    @GetMapping("/list")
+    public TableDataInfo<ContractProductVo> list(ContractProductBo bo, PageQuery pageQuery) {
+        return contractProductService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出合同产品关联列表
+     */
+    @SaCheckPermission("product:contracproduct:export")
+    @Log(title = "合同产品关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ContractProductBo bo, HttpServletResponse response) {
+        List<ContractProductVo> list = contractProductService.queryList(bo);
+        ExcelUtil.exportExcel(list, "合同产品关联", ContractProductVo.class, response);
+    }
+
+    /**
+     * 获取合同产品关联详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("product:contracproduct:query")
+    @GetMapping("/{id}")
+    public R<ContractProductVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(contractProductService.queryById(id));
+    }
+
+    /**
+     * 新增合同产品关联
+     */
+    @SaCheckPermission("product:contracproduct:add")
+    @Log(title = "合同产品关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@RequestBody ContractProductBo bo) {
+        return toAjax(contractProductService.insertByBo(bo));
+    }
+
+    /**
+     * 修改合同产品关联
+     */
+    @SaCheckPermission("product:contracproduct:edit")
+    @Log(title = "合同产品关联", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ContractProductBo bo) {
+        return toAjax(contractProductService.updateByBo(bo));
+    }
+
+    /**
+     * 删除合同产品关联
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("product:contracproduct:remove")
+    @Log(title = "合同产品关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(contractProductService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ContractProduct.java

@@ -0,0 +1,86 @@
+package org.dromara.product.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 合同产品关联对象 contract_product
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("contract_product")
+public class ContractProduct extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 合同供货编号
+     */
+    private String contractSupplyNo;
+
+    /**
+     * 合同供货Id
+     */
+    private Long contractSupplyId;
+    /**
+     * 产品编号
+     */
+    private String productNo;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 供货周期（单位：天/月，根据业务定义）
+     */
+    private Long supplyCycle;
+
+    /**
+     * 库存属性
+     */
+    private String inventoryProperties;
+
+    /**
+     * 最小供货量
+     */
+    private Long minSupply;
+
+    /**
+     * 报价（支持大文本）
+     */
+    private String offerPrice;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ContractProductBo.java

@@ -0,0 +1,74 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ContractProduct;
+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.*;
+
+/**
+ * 合同产品关联业务对象 contract_product
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ContractProduct.class, reverseConvertGenerate = false)
+public class ContractProductBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 合同供货编号
+     */
+    private String contractSupplyNo;
+
+    /**
+     * 合同供货Id
+     */
+    private String contractSupplyId;
+
+    /**
+     * 产品编号
+     */
+    private String productNo;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 供货周期（单位：天/月，根据业务定义）
+     */
+    private Long supplyCycle;
+
+    /**
+     * 库存属性
+     */
+    private String inventoryProperties;
+
+    /**
+     * 最小供货量
+     */
+    private Long minSupply;
+
+    /**
+     * 报价（支持大文本）
+     */
+    private String offerPrice;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ContractProductVo.java

@@ -0,0 +1,94 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ContractProduct;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.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;
+
+
+
+/**
+ * 合同产品关联视图对象 contract_product
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ContractProduct.class)
+public class ContractProductVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 合同供货编号
+     */
+    @ExcelProperty(value = "合同供货编号")
+    private String contractSupplyNo;
+
+    /**
+     * 合同供货Id
+     */
+    private Long contractSupplyId;
+
+    /**
+     * 产品编号
+     */
+    @ExcelProperty(value = "产品编号")
+    private String productNo;
+
+    /**
+     * 产品id
+     */
+    @ExcelProperty(value = "产品id")
+    private Long productId;
+
+    /**
+     * 供货周期（单位：天/月，根据业务定义）
+     */
+    @ExcelProperty(value = "供货周期", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "单=位：天/月，根据业务定义")
+    private Long supplyCycle;
+
+    /**
+     * 库存属性
+     */
+    @ExcelProperty(value = "库存属性")
+    private String inventoryProperties;
+
+    /**
+     * 最小供货量
+     */
+    @ExcelProperty(value = "最小供货量")
+    private Long minSupply;
+
+    /**
+     * 报价（支持大文本）
+     */
+    @ExcelProperty(value = "报价", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "支=持大文本")
+    private String offerPrice;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/dubbo/RemoteContractProductServiceImpl.java

@@ -0,0 +1,67 @@
+package org.dromara.product.dubbo;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.product.api.RemoteContractProdcutService;
+import org.dromara.product.api.domain.ContractProductDto;
+import org.dromara.product.domain.ContractProduct;
+import org.dromara.product.service.IContractProductService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * author
+ * 时间:2026/1/20，13:54
+ */
+@RequiredArgsConstructor
+@Service
+@DubboService
+public class RemoteContractProductServiceImpl implements RemoteContractProdcutService {
+
+    private final IContractProductService contractProductService;
+
+
+    @Override
+    public boolean add(List<ContractProductDto> dto) {
+        boolean flag = true;
+        if (dto ==null){
+            return true;
+        }
+        List<ContractProduct> contractProducts = new ArrayList<>();
+        for (ContractProductDto bo : dto) {
+            ContractProduct contractProduct = new ContractProduct();
+            // 这里需要根据实际字段进行属性复制
+            BeanUtils.copyProperties(bo, contractProduct);
+            contractProducts.add(contractProduct);
+        }
+
+        flag = contractProductService.saveBatch(contractProducts);
+        return flag;
+    }
+
+    @Override
+    public List<ContractProductDto> queryList(Long contractSupplyId) {
+        List<ContractProduct> list = contractProductService.lambdaQuery().eq(ContractProduct::getContractSupplyId, contractSupplyId).list();
+
+        // 将实体对象转换为DTO对象
+        List<ContractProductDto> dtoList = new ArrayList<>();
+        for (ContractProduct entity : list) {
+            ContractProductDto dto = new ContractProductDto();
+            BeanUtils.copyProperties(entity, dto);
+            dtoList.add(dto);
+        }
+
+        return dtoList;
+    }
+
+    @Override
+    public boolean delete(Long contractSupplyId) {
+        List<ContractProduct> list = contractProductService.lambdaQuery()
+            .eq(ContractProduct::getContractSupplyId, contractSupplyId)
+            .select(ContractProduct::getId).list();
+        return contractProductService.removeByIds(list);
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ContractProductMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ContractProduct;
+import org.dromara.product.domain.vo.ContractProductVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 合同产品关联Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+public interface ContractProductMapper extends BaseMapperPlus<ContractProduct, ContractProductVo> {
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IContractProductService.java

@@ -0,0 +1,70 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ContractProduct;
+import org.dromara.product.domain.vo.ContractProductVo;
+import org.dromara.product.domain.bo.ContractProductBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 合同产品关联Service接口
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+public interface IContractProductService extends IService<ContractProduct>{
+
+    /**
+     * 查询合同产品关联
+     *
+     * @param id 主键
+     * @return 合同产品关联
+     */
+    ContractProductVo queryById(Long id);
+
+    /**
+     * 分页查询合同产品关联列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同产品关联分页列表
+     */
+    TableDataInfo<ContractProductVo> queryPageList(ContractProductBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的合同产品关联列表
+     *
+     * @param bo 查询条件
+     * @return 合同产品关联列表
+     */
+    List<ContractProductVo> queryList(ContractProductBo bo);
+
+    /**
+     * 新增合同产品关联
+     *
+     * @param bo 合同产品关联
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ContractProductBo bo);
+
+    /**
+     * 修改合同产品关联
+     *
+     * @param bo 合同产品关联
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ContractProductBo bo);
+
+    /**
+     * 校验并批量删除合同产品关联信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ContractProductServiceImpl.java

@@ -0,0 +1,140 @@
+package org.dromara.product.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 lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ContractProductBo;
+import org.dromara.product.domain.vo.ContractProductVo;
+import org.dromara.product.domain.ContractProduct;
+import org.dromara.product.mapper.ContractProductMapper;
+import org.dromara.product.service.IContractProductService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 合同产品关联Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-01-20
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ContractProductServiceImpl  extends ServiceImpl<ContractProductMapper, ContractProduct> implements IContractProductService {
+
+    private final ContractProductMapper baseMapper;
+
+    /**
+     * 查询合同产品关联
+     *
+     * @param id 主键
+     * @return 合同产品关联
+     */
+    @Override
+    public ContractProductVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询合同产品关联列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同产品关联分页列表
+     */
+    @Override
+    public TableDataInfo<ContractProductVo> queryPageList(ContractProductBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ContractProduct> lqw = buildQueryWrapper(bo);
+        Page<ContractProductVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的合同产品关联列表
+     *
+     * @param bo 查询条件
+     * @return 合同产品关联列表
+     */
+    @Override
+    public List<ContractProductVo> queryList(ContractProductBo bo) {
+        LambdaQueryWrapper<ContractProduct> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ContractProduct> buildQueryWrapper(ContractProductBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ContractProduct> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ContractProduct::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getContractSupplyNo()), ContractProduct::getContractSupplyNo, bo.getContractSupplyNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductNo()), ContractProduct::getProductNo, bo.getProductNo());
+        lqw.eq(bo.getProductId() != null, ContractProduct::getProductId, bo.getProductId());
+        lqw.eq(bo.getSupplyCycle() != null, ContractProduct::getSupplyCycle, bo.getSupplyCycle());
+        lqw.eq(StringUtils.isNotBlank(bo.getInventoryProperties()), ContractProduct::getInventoryProperties, bo.getInventoryProperties());
+        lqw.eq(bo.getMinSupply() != null, ContractProduct::getMinSupply, bo.getMinSupply());
+        lqw.eq(StringUtils.isNotBlank(bo.getOfferPrice()), ContractProduct::getOfferPrice, bo.getOfferPrice());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ContractProduct::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增合同产品关联
+     *
+     * @param bo 合同产品关联
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ContractProductBo bo) {
+        ContractProduct add = MapstructUtils.convert(bo, ContractProduct.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改合同产品关联
+     *
+     * @param bo 合同产品关联
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ContractProductBo bo) {
+        ContractProduct update = MapstructUtils.convert(bo, ContractProduct.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ContractProduct entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除合同产品关联信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ContractProductMapper.xml

@@ -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.product.mapper.ContractProductMapper">
+
+</mapper>