朱园亮 / xingyun-erp · Commits

Commit 7e073cc51eaa308b55cf84157a8af4be89180113

Authored by 杨鸣坤
1 parent fd4559e2

楚江ERP：增加转为正式合同和标准合同时间

Inline Side-by-side
Showing 4 changed files with 24 additions and 3 deletions
@@ -128,6 +128,8 @@ create table if not exists `tbl_contract_distributor_standard` @@ -128,6 +128,8 @@ create table if not exists `tbl_contract_distributor_standard`
128 `price_spec_locked` TINYINT(1) COMMENT '是否已完成锁价/锁规', 128 `price_spec_locked` TINYINT(1) COMMENT '是否已完成锁价/锁规',
129 `signed_contract_file_id` VARCHAR(100) COMMENT '双方盖章合同ID', 129 `signed_contract_file_id` VARCHAR(100) COMMENT '双方盖章合同ID',
130 `signed_contract_file_name` VARCHAR(255) COMMENT '双方盖章合同名称', 130 `signed_contract_file_name` VARCHAR(255) COMMENT '双方盖章合同名称',
  131 + `formalized_at` datetime comment '转为正式合同时间',
  132 + `standardized_at` datetime comment '转为标准合同时间',
131 `create_by_id` varchar(32) not null comment '创建人ID', 133 `create_by_id` varchar(32) not null comment '创建人ID',
132 `create_by` varchar(20) not null comment '创建人', 134 `create_by` varchar(20) not null comment '创建人',
133 `update_by_id` varchar(32) not null comment '更新人ID', 135 `update_by_id` varchar(32) not null comment '更新人ID',
@@ -309,6 +309,17 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto { @@ -309,6 +309,17 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
309 private String signedContractFileName; 309 private String signedContractFileName;
310 310
311 /** 311 /**
  312 + * 转为正式合同时间
  313 + */
  314 + private LocalDateTime formalizedAt;
  315 +
  316 + /**
  317 + * 转为标准合同时间
  318 + */
  319 + private LocalDateTime standardizedAt;
  320 +
  321 +
  322 + /**
312 * 是否展示正式合同审核按钮(非持久化字段) 323 * 是否展示正式合同审核按钮(非持久化字段)
313 */ 324 */
314 @TableField(exist = false) 325 @TableField(exist = false)
@@ -436,7 +436,8 @@ public class ContractDistributorStandardServiceImpl extends @@ -436,7 +436,8 @@ public class ContractDistributorStandardServiceImpl extends
436 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized()) 436 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
437 .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name()); 437 .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name());
438 if (data.getStatus().equals("DRAFT")) { 438 if (data.getStatus().equals("DRAFT")) {
439 - updateWrapper.set(ContractDistributorStandard::getStatus, "FORMAL"); 439 + updateWrapper.set(ContractDistributorStandard::getStatus, "FORMAL")
  440 + .set(ContractDistributorStandard::getFormalizedAt, LocalDateTime.now());
440 } 441 }
441 442
442 updateWrapper.eq(ContractDistributorStandard::getId, vo.getId()); 443 updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
@@ -496,7 +497,8 @@ public class ContractDistributorStandardServiceImpl extends @@ -496,7 +497,8 @@ public class ContractDistributorStandardServiceImpl extends
496 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name()); 497 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
497 if (!data.getStatus().equals("STANDARD") 498 if (!data.getStatus().equals("STANDARD")
498 && ("DISTRIB_STD".equals(data.getType()) || "INTL_STD_CONTRACT".equals(data.getType()))) { // 只有经销(外贸)标准合同才修改状态 499 && ("DISTRIB_STD".equals(data.getType()) || "INTL_STD_CONTRACT".equals(data.getType()))) { // 只有经销(外贸)标准合同才修改状态
499 - updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD"); 500 + updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD")
  501 + .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now());
500 } 502 }
501 503
502 updateWrapper.eq(ContractDistributorStandard::getId, vo.getId()); 504 updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
@@ -695,6 +697,7 @@ public class ContractDistributorStandardServiceImpl extends @@ -695,6 +697,7 @@ public class ContractDistributorStandardServiceImpl extends
695 data.setOrderDate(LocalDate.now()); 697 data.setOrderDate(LocalDate.now());
696 data.setStatus("STANDARD"); 698 data.setStatus("STANDARD");
697 data.setParentId(vo.getId()); 699 data.setParentId(vo.getId());
  700 + data.setStandardizedAt(LocalDateTime.now());
698 getBaseMapper().insert(data); 701 getBaseMapper().insert(data);
699 702
700 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class) 703 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
@@ -783,6 +786,7 @@ public class ContractDistributorStandardServiceImpl extends @@ -783,6 +786,7 @@ public class ContractDistributorStandardServiceImpl extends
783 data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax()); 786 data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
784 data.setStatus("STANDARD"); 787 data.setStatus("STANDARD");
785 data.setParentId(vo.getId()); 788 data.setParentId(vo.getId());
  789 + data.setStandardizedAt(LocalDateTime.now());
786 getBaseMapper().insert(data); 790 getBaseMapper().insert(data);
787 791
788 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class) 792 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
@@ -58,6 +58,8 @@ @@ -58,6 +58,8 @@
58 <result column="price_spec_locked" property="priceSpecLocked"/> 58 <result column="price_spec_locked" property="priceSpecLocked"/>
59 <result column="signed_contract_file_id" property="signedContractFileId"/> 59 <result column="signed_contract_file_id" property="signedContractFileId"/>
60 <result column="signed_contract_file_name" property="signedContractFileName"/> 60 <result column="signed_contract_file_name" property="signedContractFileName"/>
  61 + <result column="formalized_at" property="formalizedAt"/>
  62 + <result column="standardized_at" property="standardizedAt"/>
61 </resultMap> 63 </resultMap>
62 64
63 <sql id="ContractDistributorStandard_sql"> 65 <sql id="ContractDistributorStandard_sql">
@@ -116,7 +118,9 @@ @@ -116,7 +118,9 @@
116 tb.standard_time, 118 tb.standard_time,
117 tb.price_spec_locked, 119 tb.price_spec_locked,
118 tb.signed_contract_file_id, 120 tb.signed_contract_file_id,
119 - tb.signed_contract_file_name 121 + tb.signed_contract_file_name,
  122 + tb.formalized_at,
  123 + tb.standardized_at
120 FROM tbl_contract_distributor_standard AS tb 124 FROM tbl_contract_distributor_standard AS tb
121 </sql> 125 </sql>
122 126