楚江ERP：提供时间改为string

@@ -184,7 +184,7 @@ create table `tbl_contract_std_processing_line`
     `industry`                       VARCHAR(100) COMMENT '行业',
     `quality`                        VARCHAR(100) COMMENT '品质',
     `loss_rate`                      VARCHAR(50) COMMENT '损耗',
-    `supply_time`                    DATE COMMENT '提供时间',
+    `supply_time`                    VARCHAR(50) COMMENT '提供时间',
     `material_product_ratio`         VARCHAR(50) COMMENT '原材料与产品数量比',
     `material_product_ratio_remarks` VARCHAR(100) 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 '更新人',
     `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;
\ No newline at end of file
+) 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;
\ No newline at end of file

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

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

@@ -174,7 +174,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
                 .set(ContractStdProcessingLine::getIndustry, StringUtil.isBlank(vo.getIndustry()) ? null : vo.getIndustry())
                 .set(ContractStdProcessingLine::getQuality, StringUtil.isBlank(vo.getQuality()) ? null : vo.getQuality())
                 .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::getMaterialProductRatioRemarks, StringUtil.isBlank(vo.getMaterialProductRatioRemarks()) ? null : vo.getMaterialProductRatioRemarks())
                 .set(ContractStdProcessingLine::getProductId, StringUtil.isBlank(vo.getProductId()) ? null : vo.getProductId())

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

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