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

@@ -128,6 +128,8 @@ create table if not exists `tbl_contract_distributor_standard`
     `price_spec_locked`          TINYINT(1) COMMENT '是否已完成锁价/锁规',
     `signed_contract_file_id`    VARCHAR(100) COMMENT '双方盖章合同ID',
     `signed_contract_file_name`  VARCHAR(255) COMMENT '双方盖章合同名称',
+    `formalized_at`              datetime comment '转为正式合同时间',
+    `standardized_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',

@@ -309,6 +309,17 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String signedContractFileName;
 
     /**
+     * 转为正式合同时间
+     */
+    private LocalDateTime formalizedAt;
+
+    /**
+     * 转为标准合同时间
+     */
+    private LocalDateTime standardizedAt;
+
+
+    /**
      * 是否展示正式合同审核按钮(非持久化字段)
      */
     @TableField(exist = false)

@@ -436,7 +436,8 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
                 .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name());
         if (data.getStatus().equals("DRAFT")) {
-            updateWrapper.set(ContractDistributorStandard::getStatus, "FORMAL");
+            updateWrapper.set(ContractDistributorStandard::getStatus, "FORMAL")
+                    .set(ContractDistributorStandard::getFormalizedAt, LocalDateTime.now());
         }
 
         updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
@@ -496,7 +497,8 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
         if (!data.getStatus().equals("STANDARD")
                 && ("DISTRIB_STD".equals(data.getType()) || "INTL_STD_CONTRACT".equals(data.getType()))) { // 只有经销(外贸)标准合同才修改状态
-            updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD");
+            updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD")
+                    .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now());
         }
 
         updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
@@ -695,6 +697,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setOrderDate(LocalDate.now());
         data.setStatus("STANDARD");
         data.setParentId(vo.getId());
+        data.setStandardizedAt(LocalDateTime.now());
         getBaseMapper().insert(data);
 
         Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
@@ -783,6 +786,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
         data.setStatus("STANDARD");
         data.setParentId(vo.getId());
+        data.setStandardizedAt(LocalDateTime.now());
         getBaseMapper().insert(data);
 
         Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)

@@ -58,6 +58,8 @@
         <result column="price_spec_locked" property="priceSpecLocked"/>
         <result column="signed_contract_file_id" property="signedContractFileId"/>
         <result column="signed_contract_file_name" property="signedContractFileName"/>
+        <result column="formalized_at" property="formalizedAt"/>
+        <result column="standardized_at" property="standardizedAt"/>
     </resultMap>
 
     <sql id="ContractDistributorStandard_sql">
@@ -116,7 +118,9 @@
             tb.standard_time,
             tb.price_spec_locked,
             tb.signed_contract_file_id,
-            tb.signed_contract_file_name
+            tb.signed_contract_file_name,
+            tb.formalized_at,
+            tb.standardized_at
         FROM tbl_contract_distributor_standard AS tb
     </sql>