Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -184,7 +184,7 @@ create table `tbl_contract_std_processing_line`
     `industry`                       VARCHAR(100) COMMENT '行业',
     `industry`                       VARCHAR(100) COMMENT '行业',
     `quality`                        VARCHAR(100) COMMENT '品质',
     `quality`                        VARCHAR(100) COMMENT '品质',
     `loss_rate`                      VARCHAR(50) COMMENT '损耗',
     `loss_rate`                      VARCHAR(50) COMMENT '损耗',
-    `supply_time`                    DATE COMMENT '提供时间',
+    `supply_time`                    VARCHAR(50) COMMENT '提供时间',
     `material_product_ratio`         VARCHAR(50) COMMENT '原材料与产品数量比',
     `material_product_ratio`         VARCHAR(50) COMMENT '原材料与产品数量比',
     `material_product_ratio_remarks` VARCHAR(100) COMMENT '原材料与产品数量比备注',
     `material_product_ratio_remarks` VARCHAR(100) COMMENT '原材料与产品数量比备注',
     `product_id`                     VARCHAR(50)    NOT NULL COMMENT '定作物名称',
     `product_id`                     VARCHAR(50)    NOT NULL COMMENT '定作物名称',
@@ -212,4 +212,24 @@ create table `tbl_contract_std_processing_line`
     `update_by`                      varchar(20)    not null comment '更新人',
     `update_by`                      varchar(20)    not null comment '更新人',
     `create_time`                    datetime default now() comment '创建时间',
     `create_time`                    datetime default now() comment '创建时间',
     `update_time`                    datetime default now() comment '更新时间'
     `update_time`                    datetime default now() comment '更新时间'
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加工标准合同物料行' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加工标准合同物料行' ROW_FORMAT = DYNAMIC;
+
+-- 锁价无规格操作申请单
+DROP TABLE IF EXISTS `tbl_spec_lock_delay_application`;
+create table `tbl_spec_lock_delay_application`
+(
+    `id`                varchar(32) primary key comment 'ID',
+    `contract_id`       varchar(32) NOT NULL COMMENT '合同主表ID',
+    `spec_lock_date`    DATE COMMENT '现申请锁规格日期',
+    `application_count` INT COMMENT '申请次数（第几次申请）',
+    `delay_reason`      VARCHAR(200) COMMENT '延迟原因',
+    `approval_status`   VARCHAR(50) COMMENT '审核状态',
+    `approver_id`       VARCHAR(32) COMMENT '审核人',
+    `approved_at`       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 '更新时间'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '锁价无规格操作申请单' ROW_FORMAT = DYNAMIC;

@@ -70,8 +70,7 @@ public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessing
      * 提供时间
      * 提供时间
      */
      */
     @ApiModelProperty("提供时间")
     @ApiModelProperty("提供时间")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
-    private LocalDate supplyTime;
+    private String supplyTime;
 
 
     /**
     /**
      * 原材料与产品数量比
      * 原材料与产品数量比

+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 com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 锁价无规格操作申请单 GetBo
+ * </p>
+ */
+@Data
+public class GetSpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplication> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+    /**
+     * 合同编号
+     */
+    @ApiModelProperty("合同编号")
+    private String contractCode;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 制单日期
+     */
+    @ApiModelProperty("制单日期")
+    private LocalDate contractDocumentDate;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 现申请锁规格日期
+     */
+    @ApiModelProperty("现申请锁规格日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate specLockDate;
+
+    /**
+     * 申请次数（第几次申请）
+     */
+    @ApiModelProperty("申请次数（第几次申请）")
+    private Integer applicationCount;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty("延迟原因")
+    private String delayReason;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String approvalStatus;
+
+    private String approvalStatusName;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String contractType;
+
+    /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
+     * 数量（t）
+     */
+    @ApiModelProperty(value = "数量（t）")
+    private BigDecimal totalQuantity;
+
+    public GetSpecLockDelayApplicationBo() {
+
+    }
+
+    public GetSpecLockDelayApplicationBo(SpecLockDelayApplication dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<SpecLockDelayApplication> convert(SpecLockDelayApplication dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(SpecLockDelayApplication dto) {
+
+    }
+}

+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 com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 锁价无规格操作申请单 QueryBo
+ * </p>
+ */
+@Data
+public class QuerySpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplication> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+    /**
+     * 合同编号
+     */
+    @ApiModelProperty("合同编号")
+    private String contractCode;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 制单日期
+     */
+    @ApiModelProperty("制单日期")
+    private LocalDate contractDocumentDate;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 现申请锁规格日期
+     */
+    @ApiModelProperty("现申请锁规格日期")
+    private LocalDate specLockDate;
+
+    /**
+     * 申请次数（第几次申请）
+     */
+    @ApiModelProperty("申请次数（第几次申请）")
+    private Integer applicationCount;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String approvalStatus;
+
+    private String approvalStatusName;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String contractType;
+
+    /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty(value = "延迟原因")
+    private String delayReason;
+
+    /**
+     * 数量（t）
+     */
+    @ApiModelProperty(value = "数量（t）")
+    private BigDecimal totalQuantity;
+
+    public QuerySpecLockDelayApplicationBo() {
+
+    }
+
+    public QuerySpecLockDelayApplicationBo(SpecLockDelayApplication dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<SpecLockDelayApplication> convert(SpecLockDelayApplication dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(SpecLockDelayApplication dto) {
+
+    }
+}

@@ -538,7 +538,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
         List<String> remarksList = contractDistributorStandardList.stream()
         List<String> remarksList = contractDistributorStandardList.stream()
                 .map(ContractDistributorStandard::getRemarks)
                 .map(ContractDistributorStandard::getRemarks)
                 .filter(StringUtils::isNotEmpty)
                 .filter(StringUtils::isNotEmpty)
-                .limit(3)  // 限制前3个
+                .distinct()  // 去重
+                .limit(3)    // 限制前3个不重复的
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
 
 
         return InvokeResultBuilder.success(remarksList);
         return InvokeResultBuilder.success(remarksList);

+package com.lframework.xingyun.sc.controller.contract;
+
+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.CollectionUtil;
+import com.lframework.starter.common.utils.DateUtil;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.sc.bo.contract.GetSpecLockDelayApplicationBo;
+import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
+import com.lframework.xingyun.sc.bo.contract.QuerySpecLockDelayApplicationBo;
+import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
+import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QuerySpecLockDelayApplicationVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateSpecLockDelayApplicationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+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.constraints.NotBlank;
+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/specLockDelayApplication")
+public class SpecLockDelayApplicationController extends DefaultBaseController {
+
+    @Autowired
+    private SpecLockDelayApplicationService specLockDelayApplicationService;
+    @Autowired
+    private ContractDistributorStandardService contractDistributorStandardService;
+    @Autowired
+    private SysDeptService sysDeptService;
+    @Autowired
+    private SysDataDicItemService sysDataDicItemService;
+    @Autowired
+    private CustomerService customerService;
+    @Autowired
+    private WorkshopService workshopService;
+
+    public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
+
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"entity:speclockdelayapplication:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QuerySpecLockDelayApplicationBo>> query(QuerySpecLockDelayApplicationVo vo) {
+        if (vo != null && StringUtils.isNotBlank(vo.getContractCode())) {
+            Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                    .like(ContractDistributorStandard::getCode, vo.getContractCode());
+            List<ContractDistributorStandard> contractDistributorStandardList = contractDistributorStandardService.list(wrapper);
+            if (CollectionUtils.isEmpty(contractDistributorStandardList)) {
+                return InvokeResultBuilder.success(new PageResult<>());
+            }
+
+            vo.setContractIdList(contractDistributorStandardList.stream().map(ContractDistributorStandard::getId).collect(Collectors.toList()));
+        }
+
+
+        PageResult<SpecLockDelayApplication> pageResult = specLockDelayApplicationService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<SpecLockDelayApplication> datas = pageResult.getDatas();
+        List<QuerySpecLockDelayApplicationBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QuerySpecLockDelayApplicationBo::new).collect(Collectors.toList());
+        }
+
+        if (CollectionUtils.isEmpty(results)) {
+            return InvokeResultBuilder.success(new PageResult<>());
+        }
+
+        List<String> contractIdList = results.stream().map(QuerySpecLockDelayApplicationBo::getContractId).collect(Collectors.toList());
+        List<ContractDistributorStandard> contractDistributorStandardList = contractDistributorStandardService.listByIds(contractIdList);
+        Map<String, ContractDistributorStandard> contractDistributorStandardMap = contractDistributorStandardList
+                .stream().collect(Collectors.toMap(ContractDistributorStandard::getId, Function.identity()));
+        List<String> deptIdList = contractDistributorStandardList.stream().map(ContractDistributorStandard::getDeptId).collect(Collectors.toList());
+        Map<String, SysDept> sysDeptMap = CollectionUtils.emptyIfNull(sysDeptService.listByIds(deptIdList))
+                .stream()
+                .collect(Collectors.toMap(SysDept::getId, Function.identity()));
+        List<String> buyerIdList = contractDistributorStandardList.stream().map(ContractDistributorStandard::getBuyer).collect(Collectors.toList());
+        Map<String, Customer> customerMap = CollectionUtils.emptyIfNull(customerService.listByIds(buyerIdList))
+                .stream()
+                .collect(Collectors.toMap(Customer::getId, Function.identity()));
+        List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode(AUDIT_STATUS_DIC_CODE);
+        Map<String, String> auditCodeAndNameMap = CollectionUtils.emptyIfNull(sysDataDicItemList)
+                .stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+        List<String> workshopIdList = contractDistributorStandardList.stream().map(ContractDistributorStandard::getWorkshopId).collect(Collectors.toList());
+        Map<String, Workshop> workshopMap = CollectionUtils.emptyIfNull(workshopService.listByIds(workshopIdList))
+                .stream()
+                .collect(Collectors.toMap(Workshop::getId, Function.identity()));
+
+        results.forEach(result -> {
+            if (result == null || StringUtils.isBlank(result.getContractId())) {
+                return;
+            }
+
+            ContractDistributorStandard contractDistributorStandard = contractDistributorStandardMap.get(result.getContractId());
+            if (contractDistributorStandard == null) {
+                return;
+            }
+
+            Customer customer = customerMap.get(contractDistributorStandard.getBuyer());
+            String auditName = auditCodeAndNameMap.get(result.getApprovalStatus());
+            SysDept sysDept = sysDeptMap.get(contractDistributorStandard.getDeptId());
+            Workshop workshop = workshopMap.get(contractDistributorStandard.getWorkshopId());
+            result.setContractCode(contractDistributorStandard.getCode());
+            result.setDeptName(sysDept.getName());
+            result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate());
+            result.setOrderDate(contractDistributorStandard.getOrderDate());
+            result.setCustomerName(customer.getName());
+            result.setApprovalStatusName(auditName);
+            result.setContractType(contractDistributorStandard.getType());
+            result.setWorkshopName(workshop.getName());
+            result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
+        });
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"entity:speclockdelayapplication:query"})
+    @GetMapping
+    public InvokeResult<GetSpecLockDelayApplicationBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        SpecLockDelayApplication data = specLockDelayApplicationService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("锁价无规格操作申请单不存在！");
+        }
+
+        GetSpecLockDelayApplicationBo result = new GetSpecLockDelayApplicationBo(data);
+        ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.findById(result.getContractId());
+        if (contractDistributorStandard == null) {
+            throw new DefaultClientException("对应锁价无规格合同不存在！");
+        }
+
+        SysDept sysDept = sysDeptService.findById(contractDistributorStandard.getDeptId());
+        Customer customer = customerService.findById(contractDistributorStandard.getBuyer());
+        SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(AUDIT_STATUS_DIC_CODE, result.getApprovalStatus());
+        Workshop workshop = workshopService.findById(contractDistributorStandard.getWorkshopId());
+        result.setContractCode(contractDistributorStandard.getCode());
+        result.setDeptName(sysDept.getName());
+        result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate());
+        result.setOrderDate(contractDistributorStandard.getOrderDate());
+        result.setCustomerName(customer.getName());
+        result.setApprovalStatusName(sysDataDicItem.getName());
+        result.setContractType(contractDistributorStandard.getType());
+        result.setWorkshopName(workshop.getName());
+        result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"entity:speclockdelayapplication:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@RequestBody CreateSpecLockDelayApplicationVo vo) {
+
+        specLockDelayApplicationService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"entity:speclockdelayapplication:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@RequestBody UpdateSpecLockDelayApplicationVo vo) {
+
+        specLockDelayApplicationService.update(vo);
+
+        specLockDelayApplicationService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 获取订单申请延期数据
+     */
+    @ApiOperation("获取订单申请延期数据")
+    @GetMapping("/showContract")
+    public InvokeResult<GetSpecLockDelayApplicationBo> showContract(@NotBlank(message = "id不能为空！") String id) {
+
+        ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.findById(id);
+        if (contractDistributorStandard == null) {
+            throw new DefaultClientException("对应锁价无规格合同不存在！");
+        }
+
+        QuerySpecLockDelayApplicationVo vo = new QuerySpecLockDelayApplicationVo();
+        vo.setContractId(id);
+        List<SpecLockDelayApplication> specLockDelayApplicationList = specLockDelayApplicationService.query(vo);
+
+        GetSpecLockDelayApplicationBo result = new GetSpecLockDelayApplicationBo();
+
+        SysDept sysDept = sysDeptService.findById(contractDistributorStandard.getDeptId());
+        Customer customer = customerService.findById(contractDistributorStandard.getBuyer());
+        Workshop workshop = workshopService.findById(contractDistributorStandard.getWorkshopId());
+        result.setContractCode(contractDistributorStandard.getCode());
+        result.setContractId(id);
+        result.setDeptName(sysDept.getName());
+        result.setContractDocumentDate(contractDistributorStandard.getCreateTime().toLocalDate());
+        result.setOrderDate(contractDistributorStandard.getOrderDate());
+        result.setCustomerName(customer.getName());
+        result.setContractType(contractDistributorStandard.getType());
+        result.setWorkshopName(workshop.getName());
+        result.setApplicationCount(CollectionUtils.isEmpty(specLockDelayApplicationList) ? 1 : specLockDelayApplicationList.size() + 1);
+        result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
+
+        return InvokeResultBuilder.success(result);
+    }
+
+}

@@ -65,7 +65,7 @@ public class ContractStdProcessingLine extends BaseEntity implements BaseDto {
     /**
     /**
      * 提供时间
      * 提供时间
      */
      */
-    private LocalDate supplyTime;
+    private String supplyTime;
 
 
     /**
     /**
      * 原材料与产品数量比
      * 原材料与产品数量比

+package com.lframework.xingyun.sc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 锁价无规格操作申请单
+ * </p>
+ */
+@Data
+@TableName("tbl_spec_lock_delay_application")
+public class SpecLockDelayApplication extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "SpecLockDelayApplication";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    private String contractId;
+
+    /**
+     * 现申请锁规格日期
+     */
+    private LocalDate specLockDate;
+
+    /**
+     * 申请次数（第几次申请）
+     */
+    private Integer applicationCount;
+
+    /**
+     * 延迟原因
+     */
+    private String delayReason;
+
+    /**
+     * 审核状态
+     */
+    private String approvalStatus;
+
+    /**
+     * 审核人
+     */
+    private String approverId;
+
+    /**
+     * 审核时间
+     */
+    private LocalDateTime approvedAt;
+
+    /**
+     * 创建人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;
+
+}

@@ -174,7 +174,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
                 .set(ContractStdProcessingLine::getIndustry, StringUtil.isBlank(vo.getIndustry()) ? null : vo.getIndustry())
                 .set(ContractStdProcessingLine::getIndustry, StringUtil.isBlank(vo.getIndustry()) ? null : vo.getIndustry())
                 .set(ContractStdProcessingLine::getQuality, StringUtil.isBlank(vo.getQuality()) ? null : vo.getQuality())
                 .set(ContractStdProcessingLine::getQuality, StringUtil.isBlank(vo.getQuality()) ? null : vo.getQuality())
                 .set(ContractStdProcessingLine::getLossRate, StringUtil.isBlank(vo.getLossRate()) ? null : vo.getLossRate())
                 .set(ContractStdProcessingLine::getLossRate, StringUtil.isBlank(vo.getLossRate()) ? null : vo.getLossRate())
-                .set(ContractStdProcessingLine::getSupplyTime, vo.getSupplyTime() == null ? null : vo.getSupplyTime())
+                .set(ContractStdProcessingLine::getSupplyTime, StringUtil.isBlank(vo.getSupplyTime()) ? null : vo.getSupplyTime())
                 .set(ContractStdProcessingLine::getMaterialProductRatio, StringUtil.isBlank(vo.getMaterialProductRatio()) ? null : vo.getMaterialProductRatio())
                 .set(ContractStdProcessingLine::getMaterialProductRatio, StringUtil.isBlank(vo.getMaterialProductRatio()) ? null : vo.getMaterialProductRatio())
                 .set(ContractStdProcessingLine::getMaterialProductRatioRemarks, StringUtil.isBlank(vo.getMaterialProductRatioRemarks()) ? null : vo.getMaterialProductRatioRemarks())
                 .set(ContractStdProcessingLine::getMaterialProductRatioRemarks, StringUtil.isBlank(vo.getMaterialProductRatioRemarks()) ? null : vo.getMaterialProductRatioRemarks())
                 .set(ContractStdProcessingLine::getProductId, StringUtil.isBlank(vo.getProductId()) ? null : vo.getProductId())
                 .set(ContractStdProcessingLine::getProductId, StringUtil.isBlank(vo.getProductId()) ? null : vo.getProductId())

+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.SpecLockDelayApplication;
+import com.lframework.xingyun.sc.mappers.SpecLockDelayApplicationMapper;
+import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QuerySpecLockDelayApplicationVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateSpecLockDelayApplicationVo;
+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 SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecLockDelayApplicationMapper, SpecLockDelayApplication> implements SpecLockDelayApplicationService {
+
+    @Override
+    public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<SpecLockDelayApplication> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<SpecLockDelayApplication> query(QuerySpecLockDelayApplicationVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = SpecLockDelayApplication.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public SpecLockDelayApplication findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增锁价无规格操作申请单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateSpecLockDelayApplicationVo vo) {
+
+        SpecLockDelayApplication data = new SpecLockDelayApplication();
+        data.setId(IdUtil.getUUID());
+        data.setContractId(vo.getContractId());
+        data.setSpecLockDate(vo.getSpecLockDate());
+        data.setApplicationCount(vo.getApplicationCount());
+        data.setDelayReason(vo.getDelayReason());
+        data.setApprovalStatus(vo.getApprovalStatus());
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改锁价无规格操作申请单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateSpecLockDelayApplicationVo vo) {
+
+        SpecLockDelayApplication data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("锁价无规格操作申请单不存在！");
+        }
+
+        LambdaUpdateWrapper<SpecLockDelayApplication> updateWrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
+                .set(SpecLockDelayApplication::getContractId, vo.getContractId())
+                .set(SpecLockDelayApplication::getSpecLockDate, vo.getSpecLockDate())
+                .set(SpecLockDelayApplication::getApplicationCount, vo.getApplicationCount())
+                .set(SpecLockDelayApplication::getDelayReason, vo.getDelayReason())
+                .set(SpecLockDelayApplication::getApprovalStatus, vo.getApprovalStatus())
+                .eq(SpecLockDelayApplication::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @CacheEvict(value = SpecLockDelayApplication.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QuerySpecLockDelayApplicationVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 锁价无规格操作申请单 Mapper 接口
+ * </p>
+ */
+public interface SpecLockDelayApplicationMapper extends BaseMapper<SpecLockDelayApplication> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<SpecLockDelayApplication> query(@Param("vo") QuerySpecLockDelayApplicationVo 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.SpecLockDelayApplication;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QuerySpecLockDelayApplicationVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateSpecLockDelayApplicationVo;
+
+import java.util.List;
+
+/**
+ * 锁价无规格操作申请单 Service
+ */
+public interface SpecLockDelayApplicationService extends BaseMpService<SpecLockDelayApplication> {
+
+    /**
+     * 查询列表
+     *
+     * @return
+     */
+    PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<SpecLockDelayApplication> query(QuerySpecLockDelayApplicationVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    SpecLockDelayApplication findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo
+     * @return
+     */
+    String create(CreateSpecLockDelayApplicationVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo
+     */
+    void update(UpdateSpecLockDelayApplicationVo vo);
+
+}
+

@@ -62,8 +62,7 @@ public class CreateContractStdProcessingLineVo implements BaseVo, Serializable {
      * 提供时间
      * 提供时间
      */
      */
     @ApiModelProperty("提供时间")
     @ApiModelProperty("提供时间")
-    @TypeMismatch(message = "提供时间格式有误！")
-    private LocalDate supplyTime;
+    private String supplyTime;
 
 
     /**
     /**
      * 原材料与产品数量比
      * 原材料与产品数量比

+package com.lframework.xingyun.sc.vo.contract.createVo;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+public class CreateSpecLockDelayApplicationVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty(value = "合同主表ID")
+    @Length(message = "合同主表ID最多允许32个字符！")
+    private String contractId;
+
+    /**
+     * 现申请锁规格日期
+     */
+    @ApiModelProperty(value = "现申请锁规格日期")
+    @TypeMismatch(message = "现申请锁规格日期格式有误！")
+    private LocalDate specLockDate;
+
+    /**
+     * 申请次数（第几次申请）
+     */
+    @ApiModelProperty(value = "申请次数（第几次申请）")
+    @TypeMismatch(message = "申请次数（第几次申请）格式有误！")
+    private Integer applicationCount;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty(value = "延迟原因")
+    @Length(message = "延迟原因最多允许200个字符！")
+    private String delayReason;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态")
+    @Length(message = "审核状态最多允许50个字符！")
+    private String approvalStatus;
+
+}

+package com.lframework.xingyun.sc.vo.contract.queryVo;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class QuerySpecLockDelayApplicationVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+    /**
+     * 合同编号
+     */
+    @ApiModelProperty("合同编号")
+    private String contractCode;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String approvalStatus;
+
+    /**
+     * 合同主表ID集合
+     */
+    @ApiModelProperty("合同主表ID集合")
+    private List<String> contractIdList;
+}

@@ -70,8 +70,7 @@ public class UpdateContractStdProcessingLineVo implements BaseVo, Serializable {
      * 提供时间
      * 提供时间
      */
      */
     @ApiModelProperty("提供时间")
     @ApiModelProperty("提供时间")
-    @TypeMismatch(message = "提供时间格式有误！")
-    private LocalDate supplyTime;
+    private String supplyTime;
 
 
     /**
     /**
      * 原材料与产品数量比
      * 原材料与产品数量比

+package com.lframework.xingyun.sc.vo.contract.updateVo;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+public class UpdateSpecLockDelayApplicationVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty(value = "合同主表ID")
+    @Length(message = "合同主表ID最多允许32个字符！")
+    private String contractId;
+
+    /**
+     * 现申请锁规格日期
+     */
+    @ApiModelProperty(value = "现申请锁规格日期")
+    @TypeMismatch(message = "现申请锁规格日期格式有误！")
+    private LocalDate specLockDate;
+
+    /**
+     * 申请次数（第几次申请）
+     */
+    @ApiModelProperty(value = "申请次数（第几次申请）")
+    @TypeMismatch(message = "申请次数（第几次申请）格式有误！")
+    private Integer applicationCount;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty(value = "延迟原因")
+    @Length(message = "延迟原因最多允许200个字符！")
+    private String delayReason;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态")
+    @Length(message = "审核状态最多允许50个字符！")
+    private String approvalStatus;
+
+}

+<?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.SpecLockDelayApplicationMapper">
+
+    <resultMap id="SpecLockDelayApplication" type="com.lframework.xingyun.sc.entity.SpecLockDelayApplication">
+        <id column="id" property="id"/>
+        <result column="contract_id" property="contractId"/>
+        <result column="spec_lock_date" property="specLockDate"/>
+        <result column="application_count" property="applicationCount"/>
+        <result column="delay_reason" property="delayReason"/>
+        <result column="approval_status" property="approvalStatus"/>
+        <result column="approver_id" property="approverId"/>
+        <result column="approved_at" property="approvedAt"/>
+        <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="SpecLockDelayApplication_sql">
+        SELECT tb.id,
+               tb.contract_id,
+               tb.spec_lock_date,
+               tb.application_count,
+               tb.delay_reason,
+               tb.approval_status,
+               tb.approver_id,
+               tb.approved_at,
+               tb.create_by_id,
+               tb.create_by,
+               tb.update_by_id,
+               tb.update_by,
+               tb.create_time,
+               tb.update_time
+        FROM tbl_spec_lock_delay_application AS tb
+    </sql>
+
+    <select id="query" resultMap="SpecLockDelayApplication">
+        <include refid="SpecLockDelayApplication_sql"/>
+        <where>
+            <if test="vo.contractId != null and vo.contractId != ''">
+                AND tb.contract_id = #{vo.contractId}
+            </if>
+            <if test="vo.approvalStatus != null and vo.approvalStatus != ''">
+                AND tb.approval_status = #{vo.approvalStatus}
+            </if>
+            <if test="vo.contractIdList != null and vo.contractIdList.size() > 0">
+                AND tb.contract_id IN
+                <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>