楚江ERP：合同框架导入导出功能完善

@@ -67,7 +67,7 @@ create table if not exists `tbl_contract_framework` (
     `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 '期限',
+    `validity_time`  date 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',

@@ -4,9 +4,8 @@ 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 java.time.LocalDate;
 
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.xingyun.sc.entity.ContractFramework;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -72,8 +71,8 @@ public class QueryContractFrameworkBo extends BaseBo<ContractFramework> {
      * 期限
      */
     @ApiModelProperty("期限")
-    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
-    private LocalDateTime validityTime;
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate validityTime;
 
     /**
      * 是否签订框架合同

@@ -2,73 +2,78 @@ package com.lframework.xingyun.sc.components.code;
 
 public interface GenerateCodeTypePool {
 
-  /**
-   * 采购订单
-   */
-  Integer PURCHASE_ORDER = 200;
-
-  /**
-   * 采购收货单
-   */
-  Integer RECEIVE_SHEET = 201;
-
-  /**
-   * 采购退单
-   */
-  Integer PURCHASE_RETURN = 202;
-
-  /**
-   * 销售订单
-   */
-  Integer SALE_ORDER = 203;
-
-  /**
-   * 销售出库单
-   */
-  Integer SALE_OUT_SHEET = 204;
-
-  /**
-   * 销售退货单
-   */
-  Integer SALE_RETURN = 205;
-
-  /**
-   * 零售出库单
-   */
-  Integer RETAIL_OUT_SHEET = 206;
-
-  /**
-   * 零售退货单
-   */
-  Integer RETAIL_RETURN = 207;
-
-  /**
-   * 预先盘点单
-   */
-  Integer PRE_TAKE_STOCK_SHEET = 208;
-
-  /**
-   * 盘点任务
-   */
-  Integer TAKE_STOCK_PLAN = 209;
-
-  /**
-   * 盘点单
-   */
-  Integer TAKE_STOCK_SHEET = 210;
-
-  /**
-   * 库存调整单
-   */
-  Integer STOCK_ADJUST_SHEET = 212;
-
-  /**
-   * 仓库调拨单
-   */
-  Integer SC_TRANSFER_ORDER = 213;
-
-  /**
-   * 物流单
-   */
-  Integer LOGISTICS_SHEET = 214;
+    /**
+     * 采购订单
+     */
+    Integer PURCHASE_ORDER = 200;
+
+    /**
+     * 采购收货单
+     */
+    Integer RECEIVE_SHEET = 201;
+
+    /**
+     * 采购退单
+     */
+    Integer PURCHASE_RETURN = 202;
+
+    /**
+     * 销售订单
+     */
+    Integer SALE_ORDER = 203;
+
+    /**
+     * 销售出库单
+     */
+    Integer SALE_OUT_SHEET = 204;
+
+    /**
+     * 销售退货单
+     */
+    Integer SALE_RETURN = 205;
+
+    /**
+     * 零售出库单
+     */
+    Integer RETAIL_OUT_SHEET = 206;
+
+    /**
+     * 零售退货单
+     */
+    Integer RETAIL_RETURN = 207;
+
+    /**
+     * 预先盘点单
+     */
+    Integer PRE_TAKE_STOCK_SHEET = 208;
+
+    /**
+     * 盘点任务
+     */
+    Integer TAKE_STOCK_PLAN = 209;
+
+    /**
+     * 盘点单
+     */
+    Integer TAKE_STOCK_SHEET = 210;
+
+    /**
+     * 库存调整单
+     */
+    Integer STOCK_ADJUST_SHEET = 212;
+
+    /**
+     * 仓库调拨单
+     */
+    Integer SC_TRANSFER_ORDER = 213;
+
+    /**
+     * 物流单
+     */
+    Integer LOGISTICS_SHEET = 214;
+
+    /**
+     * 框架合同
+     */
+    Integer CONTRACT_FRAMEWORK = 401;
 }

 package com.lframework.xingyun.sc.controller.contract;
 
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.DateUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.ExcelUtil;
 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.starter.web.inner.bo.system.user.GetSysUserBo;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.GenerateCodeService;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 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.components.code.GenerateCodeTypePool;
 import com.lframework.xingyun.sc.entity.ContractFramework;
+import com.lframework.xingyun.sc.excel.contract.ContractFrameworkExportTaskWorker;
+import com.lframework.xingyun.sc.excel.contract.ContractFrameworkImportListener;
+import com.lframework.xingyun.sc.excel.contract.ContractFrameworkImportModel;
 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;
@@ -28,9 +43,13 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,8 +73,14 @@ public class ContractFrameworkController extends DefaultBaseController {
     private CustomerService customerService;
     @Autowired
     private SysDataDicItemService sysDataDicItemService;
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private SysDeptService sysDeptService;
+    @Autowired
+    private GenerateCodeService generateCodeService;
 
-    private static final String SUPPLIER_DIC_CODE = "SUPPLIER";
+    public static final String SUPPLIER_DIC_CODE = "SUPPLIER";
 
     /**
      * 查询列表
@@ -132,6 +157,31 @@ public class ContractFrameworkController extends DefaultBaseController {
         return InvokeResultBuilder.success(contractFrameworkService.create(vo));
     }
 
+    @ApiOperation("获取code")
+    @HasPermission({"contractFramework:contractFramework:add"})
+    @GetMapping("/code")
+    public InvokeResult<String> code(String company) {
+        StringBuilder stringBuilder = new StringBuilder();
+        LocalDate now = LocalDate.now();
+        stringBuilder.append(now.format(DateTimeFormatter.ofPattern("yy"))).append(company);
+        // 获取当前人员及所在部门
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        SysUser sysUser = sysUserService.findById(currentUserId);
+        if (sysUser != null) {
+            GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
+            //部门
+            List<String> depts = getSysUserBo.getDepts();
+            if (CollectionUtils.isNotEmpty(depts)) {
+                String deptId = depts.get(0);
+                SysDept sysDept = sysDeptService.findById(deptId);
+                stringBuilder.append(sysDept.getCode());
+            }
+        }
+
+        stringBuilder.append(generateCodeService.generate(GenerateCodeTypePool.CONTRACT_FRAMEWORK));
+        return InvokeResultBuilder.success(stringBuilder.toString());
+    }
+
     /**
      * 根据ID查询
      */
@@ -173,4 +223,40 @@ public class ContractFrameworkController extends DefaultBaseController {
 
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 导出
+     *
+     * @param vo
+     * @return
+     */
+    @ApiOperation("导出")
+    @HasPermission({"contractFramework:contractFramework:export"})
+    @PostMapping("/export")
+    public InvokeResult<Void> export(@Valid QueryContractFrameworkVo vo) {
+
+        ExportTaskUtil.exportTask("合同框架", ContractFrameworkExportTaskWorker.class, vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    @ApiOperation("下载导入模板")
+    @HasPermission({"contractFramework:contractFramework:import"})
+    @GetMapping("/import/template")
+    public void downloadImportTemplate() {
+        ExcelUtil.exportXls("合同框架导入模板", ContractFrameworkImportModel.class);
+    }
+
+    @ApiOperation("导入")
+    @HasPermission({"contractFramework:contractFramework:import"})
+    @PostMapping("/import")
+    public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
+                                          @NotNull(message = "请上传文件") MultipartFile file) {
+
+        ContractFrameworkImportListener listener = new ContractFrameworkImportListener();
+        listener.setTaskId(id);
+        ExcelUtil.read(file, ContractFrameworkImportModel.class, listener).sheet().doRead();
+
+        return InvokeResultBuilder.success();
+    }
 }

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -56,7 +57,7 @@ public class ContractFramework extends BaseEntity implements BaseDto {
     /**
      * 期限
      */
-    private LocalDateTime validityTime;
+    private LocalDate validityTime;
 
     /**
      * 创建人ID

+package com.lframework.xingyun.sc.excel.contract;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.lframework.starter.common.utils.DateUtil;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.dto.dic.city.DicCityDto;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.DicCityService;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.xingyun.basedata.entity.*;
+import com.lframework.xingyun.basedata.enums.AddressEntityType;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.member.MemberService;
+import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
+import com.lframework.xingyun.basedata.service.shop.ShopService;
+import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService;
+import com.lframework.xingyun.basedata.service.supplier.SupplierService;
+import com.lframework.xingyun.sc.controller.contract.ContractFrameworkController;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+@Data
+public class ContractFrameworkExportModel extends BaseBo<ContractFramework> implements ExcelModel {
+
+    /**
+     * 框架合同编号
+     */
+    @ExcelProperty("框架合同编号")
+    private String code;
+
+    /**
+     * 客户名称
+     */
+    @ExcelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 所属单位名称
+     */
+    @ExcelProperty("所属单位")
+    private String companyName;
+
+    /**
+     * 是否签订框架合同
+     */
+    @ExcelProperty("是否签订")
+    private String hasFrameworkAgreementStr;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty("品种")
+    private String materialTypeName;
+
+    /**
+     * 授信截止日期
+     */
+    @ExcelProperty("授信截止日期")
+    private Date validityTime;
+
+    public ContractFrameworkExportModel() {
+
+    }
+
+    public ContractFrameworkExportModel(ContractFramework dto) {
+        super(dto);
+    }
+
+    @Override
+    protected void afterInit(ContractFramework dto) {
+        this.code = dto.getCode();
+        if (StringUtils.isNotBlank(dto.getCustomerId())) {
+            CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
+            Customer customer = customerService.findById(dto.getCustomerId());
+            this.customerName = customer != null ? customer.getName() : "";
+        }
+
+        if (StringUtils.isNotBlank(dto.getCompany())) {
+            SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+            SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(ContractFrameworkController.SUPPLIER_DIC_CODE, dto.getCompany());
+            this.companyName = sysDataDicItem != null ? sysDataDicItem.getName() : "";
+        }
+
+        if (StringUtils.isNotBlank(dto.getMaterialTypeId())) {
+            ProductVarietyService productVarietyService = ApplicationUtil.getBean(ProductVarietyService.class);
+            ProductVariety productVariety = productVarietyService.findById(dto.getMaterialTypeId());
+            this.materialTypeName = productVariety != null ? productVariety.getName() : "";
+        }
+
+        this.hasFrameworkAgreementStr = BooleanUtils.isTrue(dto.getHasFrameworkAgreement()) ? "是" : "否";
+
+        this.validityTime = dto.getValidityTime() != null ? DateUtil.toDate(dto.getValidityTime()) : null;
+    }
+}

+package com.lframework.xingyun.sc.excel.contract;
+
+import com.lframework.starter.mq.core.components.export.ExportTaskWorker;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.xingyun.sc.entity.ContractFramework;
+import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractFrameworkVo;
+
+public class ContractFrameworkExportTaskWorker implements
+        ExportTaskWorker<QueryContractFrameworkVo, ContractFramework, ContractFrameworkExportModel> {
+
+    @Override
+    public QueryContractFrameworkVo parseParams(String json) {
+        return JsonUtil.parseObject(json, QueryContractFrameworkVo.class);
+    }
+
+    @Override
+    public PageResult<ContractFramework> getDataList(int pageIndex, int pageSize, QueryContractFrameworkVo queryContractFrameworkVo) {
+        ContractFrameworkService contractFrameworkService = ApplicationUtil.getBean(ContractFrameworkService.class);
+        return contractFrameworkService.query(pageIndex, pageSize, queryContractFrameworkVo);
+    }
+
+    @Override
+    public ContractFrameworkExportModel exportData(ContractFramework contractFramework) {
+        return new ContractFrameworkExportModel(contractFramework);
+    }
+
+    @Override
+    public Class<ContractFrameworkExportModel> getModelClass() {
+        return ContractFrameworkExportModel.class;
+    }
+}

+package com.lframework.xingyun.sc.excel.contract;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.DateUtil;
+import com.lframework.starter.web.core.components.excel.ExcelImportListener;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.bo.system.user.GetSysUserBo;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.GenerateCodeService;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserService;
+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.components.code.GenerateCodeTypePool;
+import com.lframework.xingyun.sc.controller.contract.ContractFrameworkController;
+import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractFrameworkVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+@Slf4j
+public class ContractFrameworkImportListener extends ExcelImportListener<ContractFrameworkImportModel> {
+
+    @Override
+    protected void doInvoke(ContractFrameworkImportModel data, AnalysisContext context) {
+        CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
+        Wrapper<Customer> customerWrapper = Wrappers.lambdaQuery(Customer.class)
+                .eq(Customer::getName, data.getCustomerName());
+        Customer customer = customerService.getOne(customerWrapper);
+        if (customer == null) {
+            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，客户[" + data.getCustomerName()
+                    + "]不存在，请检查后再次导入！");
+        }
+
+        data.setCustomerId(customer.getId());
+
+        SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+        List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode(ContractFrameworkController.SUPPLIER_DIC_CODE);
+        if (CollectionUtils.isEmpty(sysDataDicItemList)) {
+            throw new DefaultClientException("所属单位数据为空！");
+        }
+
+        SysDataDicItem sysDataDicItem = sysDataDicItemList.stream()
+                .filter(item -> item != null && StringUtils.isNotBlank(item.getName()))
+                .filter(item -> item.getName().equals(data.getCompanyName()))
+                .findFirst().orElse(null);
+        if (sysDataDicItem == null) {
+            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，所属单位[" + data.getCompanyName()
+                    + "]不存在，请检查后再次导入！");
+        }
+
+        data.setCompany(sysDataDicItem.getCode());
+
+        if (!"是".equals(data.getHasFrameworkAgreementStr()) && !"否".equals(data.getHasFrameworkAgreementStr())) {
+            throw new DefaultClientException(
+                    "第" + context.readRowHolder().getRowIndex() + "行“是否签订”只能填写“是、否”");
+        }
+
+        data.setHasFrameworkAgreement("是".equals(data.getHasFrameworkAgreementStr()));
+
+        if (null == data.getValidityTime()) {
+            throw new DefaultClientException(
+                    "第" + context.readRowHolder().getRowIndex() + "行授信截止日期不可为空");
+        }
+
+        ProductVarietyService productVarietyService = ApplicationUtil.getBean(ProductVarietyService.class);
+        Wrapper<ProductVariety> productVarietyWrapper = Wrappers.lambdaQuery(ProductVariety.class)
+                .eq(ProductVariety::getName, data.getMaterialTypeName());
+        ProductVariety productVariety = productVarietyService.getOne(productVarietyWrapper);
+        if (productVariety == null) {
+            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，品种[" + data.getMaterialTypeName()
+                    + "]不存在，请检查后再次导入！");
+        }
+
+        data.setMaterialTypId(productVariety.getId());
+    }
+
+    @Override
+    protected void afterAllAnalysed(AnalysisContext context) {
+        ContractFrameworkService contractFrameworkService = ApplicationUtil.getBean(ContractFrameworkService.class);
+        List<ContractFrameworkImportModel> datas = this.getDatas();
+        LocalDate now = LocalDate.now();
+        String yearTwoDigit = now.format(DateTimeFormatter.ofPattern("yy"));
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        SysUserService sysUserService = ApplicationUtil.getBean(SysUserService.class);
+        SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class);
+        SysUser sysUser = sysUserService.findById(currentUserId);
+        String deptCode = "";
+        if (sysUser != null) {
+            GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
+            //部门
+            List<String> depts = getSysUserBo.getDepts();
+            if (CollectionUtils.isNotEmpty(depts)) {
+                String deptId = depts.get(0);
+                SysDept sysDept = sysDeptService.findById(deptId);
+                deptCode = sysDept.getCode();
+            }
+        }
+
+        GenerateCodeService generateCodeService = ApplicationUtil.getBean(GenerateCodeService.class);
+        for (int i = 0; i < datas.size(); i++) {
+            String code = generateCodeService.generate(GenerateCodeTypePool.CONTRACT_FRAMEWORK);
+            ContractFrameworkImportModel data = datas.get(i);
+            CreateContractFrameworkVo createContractFrameworkVo = new CreateContractFrameworkVo();
+            createContractFrameworkVo.setCode(yearTwoDigit + data.getCompany() + deptCode + code);
+            createContractFrameworkVo.setValidityTime(DateUtil.toLocalDate(data.getValidityTime()));
+            createContractFrameworkVo.setHasFrameworkAgreement(data.getHasFrameworkAgreement());
+            createContractFrameworkVo.setCompany(data.getCompany());
+            createContractFrameworkVo.setCustomerId(data.getCustomerId());
+            createContractFrameworkVo.setMaterialTypeId(data.getMaterialTypId());
+
+            try {
+                contractFrameworkService.create(createContractFrameworkVo);
+            } catch (Exception e) {
+                throw new DefaultClientException(
+                        "第" + (i + 1) + "行新增失败，失败原因：" + e.getMessage());
+            }
+
+            this.setSuccessProcess(i);
+        }
+    }
+
+    @Override
+    protected void doComplete() {
+
+    }
+}

+package com.lframework.xingyun.sc.excel.contract;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.lframework.starter.web.core.annotations.excel.ExcelRequired;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class ContractFrameworkImportModel implements ExcelModel {
+
+    /**
+     * 框架合同编号
+     */
+    @ExcelIgnore
+    private String code;
+
+    /**
+     * 客户名称
+     */
+    @ExcelRequired
+    @ExcelProperty("客户名称")
+    private String customerName;
+
+    @ExcelIgnore
+    private String customerId;
+
+    /**
+     * 所属单位名称
+     */
+    @ExcelRequired
+    @ExcelProperty("所属单位")
+    private String companyName;
+
+    @ExcelIgnore
+    private String company;
+
+    /**
+     * 是否签订框架合同
+     */
+    @ExcelRequired
+    @ExcelProperty("是否签订")
+    private String hasFrameworkAgreementStr;
+
+    @ExcelIgnore
+    private Boolean hasFrameworkAgreement;
+
+    /**
+     * 品种名称
+     */
+    @ExcelRequired
+    @ExcelProperty("品种")
+    private String materialTypeName;
+
+    @ExcelIgnore
+    private String materialTypId;
+
+    /**
+     * 授信截止日期
+     */
+    @ExcelRequired
+    @ExcelProperty("授信截止日期")
+    private Date validityTime;
+
+}

@@ -2,7 +2,7 @@ package com.lframework.xingyun.sc.vo.contract.createVo;
 
 import javax.validation.constraints.NotBlank;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 import com.lframework.starter.web.core.vo.BaseVo;
 
@@ -59,7 +59,7 @@ public class CreateContractFrameworkVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "期限", required = true)
     @NotNull(message = "请输入期限！")
     @TypeMismatch(message = "期限格式有误！")
-    private LocalDateTime validityTime;
+    private LocalDate validityTime;
 
     /**
      * 品种id

@@ -5,7 +5,7 @@ import com.lframework.starter.common.constants.StringPool;
 import lombok.Data;
 import com.lframework.starter.web.core.vo.PageVo;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
@@ -60,16 +60,16 @@ public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializ
      */
     @ApiModelProperty("期限")
     @TypeMismatch(message = "期限格式有误！")
-    private LocalDateTime validityTime;
+    private LocalDate validityTime;
 
     /**
      * 期限（查询）
      */
     @ApiModelProperty("期限查询开始时间")
-    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
-    private LocalDateTime validityTimeStart;
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate validityTimeStart;
 
     @ApiModelProperty("期限查询结束时间")
-    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
-    private LocalDateTime validityTimeEnd;
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate validityTimeEnd;
 }

@@ -3,7 +3,7 @@ package com.lframework.xingyun.sc.vo.contract.updateVo;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 import com.lframework.starter.web.core.vo.BaseVo;
 
@@ -64,7 +64,7 @@ public class UpdateContractFrameworkVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "期限", required = true)
     @TypeMismatch(message = "期限格式有误！")
     @NotNull(message = "请输入期限！")
-    private LocalDateTime validityTime;
+    private LocalDate validityTime;
 
     /**
      * 品种id