楚江：合同框架

@@ -56,4 +56,23 @@ create table if not exists base_data_product_variety (
     update_by varchar(20) not null comment '更新人',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
-);
\ No newline at end of file
+);
+
+
+-- 合同框架
+create table if not exists `tbl_contract_framework` (
+    `id` varchar(32) primary key comment 'ID',
+    `code` varchar(20) not null comment '编号',
+    `customer_id` varchar(32) not null comment '客户id',
+    `company`  varchar(50) not null comment '所属单位',
+    `has_framework_agreement` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否签订框架合同',
+    `material_type_id` varchar(32) NOT NULL COMMENT '品种id',
+    `validity_time`  datetime comment '期限',
+    `create_by_id` varchar(32) not null comment '创建人ID',
+    `create_by` varchar(20) not null comment '创建人',
+    `update_by_id` varchar(32) not null comment '更新人ID',
+    `update_by` varchar(20) not null comment '更新人',
+    `create_time` datetime default now() comment '创建时间',
+    `update_time` datetime default now() comment '更新时间'
+    );
+

+package com.lframework.xingyun.sc.bo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+
+import java.time.LocalDateTime;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 合同框架 QueryBo
+ * </p>
+ */
+@Data
+public class QueryContractFrameworkBo extends BaseBo<ContractFramework> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 客户id
+     */
+    @ApiModelProperty("客户id")
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty("所属单位")
+    private String company;
+
+    /**
+     * 品种id
+     */
+    @ApiModelProperty("品种")
+    private String materialTypeId;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty("品种名称")
+    private String materialTypeName;
+
+    /**
+     * 期限
+     */
+    @ApiModelProperty("期限")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime validityTime;
+
+    /**
+     * 是否签订框架合同
+     */
+    @ApiModelProperty("是否签订框架合同")
+    private Boolean hasFrameworkAgreement;
+
+    public QueryContractFrameworkBo() {
+
+    }
+
+    public QueryContractFrameworkBo(ContractFramework dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ContractFramework> convert(ContractFramework dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ContractFramework dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.contract;
+
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
+import com.lframework.xingyun.sc.bo.contract.QueryContractFrameworkBo;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractFrameworkVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractFrameworkVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractFrameworkVo;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 合同框架 Controller
+ */
+@Api(tags = "合同框架")
+@Validated
+@RestController
+@RequestMapping("/contract/contractFramework")
+public class ContractFrameworkController extends DefaultBaseController {
+
+    @Autowired
+    private ContractFrameworkService contractFrameworkService;
+    @Autowired
+    private ProductVarietyService productVarietyService;
+    @Autowired
+    private CustomerService customerService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"contractFramework:contractFramework:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryContractFrameworkBo>> query(@Valid QueryContractFrameworkVo vo) {
+
+        PageResult<ContractFramework> pageResult = contractFrameworkService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<ContractFramework> datas = pageResult.getDatas();
+        List<QueryContractFrameworkBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryContractFrameworkBo::new).collect(Collectors.toList());
+        }
+
+        PageResult<QueryContractFrameworkBo> boPageResult = PageResultUtil.rebuild(pageResult, results);
+        if (CollectionUtils.isEmpty(boPageResult.getDatas())) {
+            return InvokeResultBuilder.success(boPageResult);
+        }
+
+        results = boPageResult.getDatas();
+        List<String> materialTypeIdList = results.stream().map(QueryContractFrameworkBo::getMaterialTypeId).collect(Collectors.toList());
+        Map<String, ProductVariety> productVarietyMap = new HashMap<>(materialTypeIdList.size());
+        if (CollectionUtils.isNotEmpty(materialTypeIdList)) {
+            List<ProductVariety> productVarietyList = productVarietyService.listByIds(materialTypeIdList);
+            productVarietyMap.putAll(CollectionUtils.emptyIfNull(productVarietyList)
+                    .stream()
+                    .collect(Collectors.toMap(ProductVariety::getId, Function.identity())));
+        }
+
+        List<String> customerIdList = results.stream().map(QueryContractFrameworkBo::getCustomerId).collect(Collectors.toList());
+        Map<String, Customer> customerMap = new HashMap<>(customerIdList.size());
+        if (CollectionUtils.isNotEmpty(customerIdList)) {
+            List<Customer> customerList = customerService.listByIds(customerIdList);
+            customerMap.putAll(CollectionUtils.emptyIfNull(customerList)
+                    .stream()
+                    .collect(Collectors.toMap(Customer::getId, Function.identity())));
+        }
+
+        results.forEach(bo -> {
+            if (bo == null) return;
+
+            if (StringUtils.isNotBlank(bo.getMaterialTypeId())) {
+                ProductVariety productVariety = productVarietyMap.get(bo.getMaterialTypeId());
+                bo.setMaterialTypeName(productVariety != null ? productVariety.getName() : "");
+            }
+
+            if (StringUtils.isNotBlank(bo.getCustomerId())) {
+                Customer customer = customerMap.get(bo.getCustomerId());
+                bo.setCustomerName(customer != null ? customer.getName() : "");
+            }
+        });
+
+        boPageResult.setDatas(results);
+        return InvokeResultBuilder.success(boPageResult);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"contractFramework:contractFramework:add"})
+    @PostMapping
+    public InvokeResult<String> create(@Valid CreateContractFrameworkVo vo) {
+        return InvokeResultBuilder.success(contractFrameworkService.create(vo));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"contractFramework:contractFramework:query"})
+    @GetMapping
+    public InvokeResult<QueryContractFrameworkBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        ContractFramework data = contractFrameworkService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("合同框架不存在！");
+        }
+
+        QueryContractFrameworkBo result = new QueryContractFrameworkBo(data);
+        String materialTypeId = result.getMaterialTypeId();
+        ProductVariety productVariety = productVarietyService.findById(materialTypeId);
+        String customerId = result.getCustomerId();
+        Customer customer = customerService.findById(customerId);
+        result.setMaterialTypeName(productVariety != null ? productVariety.getName() : "");
+        result.setCustomerName(customer != null ? customer.getName() : "");
+
+        return InvokeResultBuilder.success(result);
+    }
+
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"contractFramework:contractFramework:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateContractFrameworkVo vo) {
+
+        contractFrameworkService.update(vo);
+
+        contractFrameworkService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 合同框架
+ * </p>
+ */
+@Data
+@TableName("tbl_contract_framework")
+public class ContractFramework extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "TblContractFramework";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 所属单位
+     */
+    private String company;
+
+    /**
+     * 是否签订框架合同
+     */
+    private Boolean hasFrameworkAgreement;
+
+    /**
+     * 品种
+     */
+    private String materialTypeId;
+
+    /**
+     * 期限
+     */
+    private LocalDateTime validityTime;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

+package com.lframework.xingyun.sc.impl.contract;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import com.lframework.xingyun.sc.mappers.ContractFrameworkMapper;
+import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractFrameworkVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractFrameworkVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractFrameworkVo;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFrameworkMapper, ContractFramework> implements ContractFrameworkService {
+
+    @Override
+    public PageResult<ContractFramework> query(Integer pageIndex, Integer pageSize, QueryContractFrameworkVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ContractFramework> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<ContractFramework> query(QueryContractFrameworkVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = ContractFramework.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public ContractFramework findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "更新合同框架，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateContractFrameworkVo vo) {
+        ContractFramework data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同框架不存在！");
+        }
+
+        LambdaUpdateWrapper<ContractFramework> updateWrapper = Wrappers.lambdaUpdate(ContractFramework.class)
+                .set(ContractFramework::getCode, vo.getCode())
+                .set(ContractFramework::getCustomerId, vo.getCustomerId())
+                .set(ContractFramework::getCompany, vo.getCompany())
+                .set(ContractFramework::getHasFrameworkAgreement, vo.getHasFrameworkAgreement())
+                .set(ContractFramework::getValidityTime, vo.getValidityTime())
+                .set(ContractFramework::getMaterialTypeId, vo.getMaterialTypeId())
+                .eq(ContractFramework::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增合同框架，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateContractFrameworkVo vo) {
+
+        ContractFramework data = new ContractFramework();
+        data.setId(IdUtil.getId());
+        data.setCode(vo.getCode());
+        data.setCustomerId(vo.getCustomerId());
+        data.setCompany(vo.getCompany());
+        data.setHasFrameworkAgreement(vo.getHasFrameworkAgreement());
+        data.setValidityTime(vo.getValidityTime());
+        data.setMaterialTypeId(vo.getMaterialTypeId());
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @CacheEvict(value = ContractFramework.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import java.util.List;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractFrameworkVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 合同框架 Mapper 接口
+ * </p>
+ */
+public interface ContractFrameworkMapper extends BaseMapper<ContractFramework> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ContractFramework> query(@Param("vo") QueryContractFrameworkVo vo);
+}

+package com.lframework.xingyun.sc.service.contract;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractFrameworkVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractFrameworkVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractFrameworkVo;
+
+import java.util.List;
+
+/**
+ * 合同框架 Service
+ */
+public interface ContractFrameworkService extends BaseMpService<ContractFramework> {
+
+    /**
+     * 查询列表
+     *
+     * @return
+     */
+    PageResult<ContractFramework> query(Integer pageIndex, Integer pageSize, QueryContractFrameworkVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ContractFramework> query(QueryContractFrameworkVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    ContractFramework findById(String id);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateContractFrameworkVo vo);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateContractFrameworkVo vo);
+
+}

+package com.lframework.xingyun.sc.vo.contract.createVo;
+
+import javax.validation.constraints.NotBlank;
+
+import java.time.LocalDateTime;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+@Data
+public class CreateContractFrameworkVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许20个字符！")
+    private String code;
+
+    /**
+     * 客户id
+     */
+    @ApiModelProperty(value = "客户id", required = true)
+    @NotBlank(message = "请输入客户id！")
+    @Length(message = "客户id最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty(value = "所属单位", required = true)
+    @NotBlank(message = "请输入所属单位！")
+    @Length(message = "所属单位最多允许50个字符！")
+    private String company;
+
+    /**
+     * 是否签订框架合同
+     */
+    @ApiModelProperty(value = "是否签订框架合同", required = true)
+    @NotNull(message = "请输入是否签订框架合同！")
+    @TypeMismatch(message = "是否签订框架合同格式有误！")
+    private Boolean hasFrameworkAgreement;
+
+    /**
+     * 期限
+     */
+    @ApiModelProperty(value = "期限", required = true)
+    @NotNull(message = "请输入期限！")
+    @TypeMismatch(message = "期限格式有误！")
+    private LocalDateTime validityTime;
+
+    /**
+     * 品种id
+     */
+    @ApiModelProperty(value = "品种id", required = true)
+    @NotBlank(message = "请输入品种id！")
+    @Length(message = "品种id最多允许32个字符！")
+    private String materialTypeId;
+
+}
+

+package com.lframework.xingyun.sc.vo.contract.queryVo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+
+import java.time.LocalDateTime;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@Data
+public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 客户id
+     */
+    @ApiModelProperty("客户id")
+    private String customerId;
+
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty("所属单位")
+    private String company;
+
+    /**
+     * 是否签订框架合同
+     */
+    @ApiModelProperty("是否签订框架合同")
+    @TypeMismatch(message = "是否签订框架合同格式有误！")
+    private Boolean hasFrameworkAgreement;
+
+    /**
+     * 品种
+     */
+    @ApiModelProperty("品种")
+    private String materialTypeId;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty("品种名称")
+    private String materialTypeName;
+
+    /**
+     * 期限
+     */
+    @ApiModelProperty("期限")
+    @TypeMismatch(message = "期限格式有误！")
+    private LocalDateTime validityTime;
+
+    /**
+     * 期限（查询）
+     */
+    @ApiModelProperty("期限查询开始时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime validityTimeStart;
+
+    @ApiModelProperty("期限查询结束时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime validityTimeEnd;
+}

+package com.lframework.xingyun.sc.vo.contract.updateVo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+
+import javax.validation.constraints.NotNull;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+
+@Data
+public class UpdateContractFrameworkVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许20个字符！")
+    private String code;
+
+    /**
+     * 客户id
+     */
+    @ApiModelProperty(value = "客户id", required = true)
+    @NotBlank(message = "请输入客户id！")
+    @Length(message = "客户id最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty(value = "所属单位", required = true)
+    @NotBlank(message = "请输入所属单位！")
+    @Length(message = "所属单位最多允许50个字符！")
+    private String company;
+
+    /**
+     * 是否签订框架合同
+     */
+    @ApiModelProperty(value = "是否签订框架合同", required = true)
+    @NotNull(message = "请输入是否签订框架合同！")
+    private Boolean hasFrameworkAgreement;
+
+    /**
+     * 期限
+     */
+    @ApiModelProperty(value = "期限", required = true)
+    @TypeMismatch(message = "期限格式有误！")
+    @NotNull(message = "请输入期限！")
+    private LocalDateTime validityTime;
+
+    /**
+     * 品种id
+     */
+    @ApiModelProperty(value = "品种id", required = true)
+    @NotBlank(message = "请输入品种id！")
+    @Length(message = "品种id最多允许32个字符！")
+    private String materialTypeId;
+
+}

+<?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="com.lframework.xingyun.sc.mappers.ContractFrameworkMapper">
+
+    <resultMap id="ContractFramework" type="com.lframework.xingyun.sc.entity.ContractFramework">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="company" property="company"/>
+        <result column="has_framework_agreement" property="hasFrameworkAgreement"/>
+        <result column="material_type_id" property="materialTypeId"/>
+        <result column="validity_time" property="validityTime"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="ContractFramework_sql">
+        SELECT
+            tb.id,
+            tb.code,
+            tb.customer_id,
+            tb.company,
+            tb.has_framework_agreement,
+            tb.material_type_id,
+            tb.validity_time,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM tbl_contract_framework AS tb
+    </sql>
+
+    <select id="query" resultMap="ContractFramework">
+        <include refid="ContractFramework_sql"/>
+        <where>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code like CONCAT('%', #{vo.code}, '%')
+            </if>
+            <if test="vo.customerId != null and vo.customerId != ''">
+                AND tb.customer_id = #{vo.customerId}
+            </if>
+            <if test="vo.company != null and vo.company != ''">
+                AND tb.company = #{vo.company}
+            </if>
+            <if test="vo.hasFrameworkAgreement != null">
+                AND tb.has_framework_agreement = #{vo.hasFrameworkAgreement}
+            </if>
+            <if test="vo.materialTypeId != null and vo.materialTypeId != ''">
+                AND tb.material_type_id = #{materialTypeId}
+            </if>
+            <if test="vo.validityTime != null">
+                AND tb.validity_time = #{vo.validityTime}
+            </if>
+            <if test="vo.validityTimeStart != null">
+                AND tb.validity_time &gt;= #{vo.validityTimeStart}
+            </if>
+            <if test="vo.validityTimeEnd != null">
+                AND tb.validity_time &lt;= #{vo.validityTimeEnd}
+            </if>
+        </where>
+    </select>
+</mapper>