朱园亮 / xingyun-erp · Commits

Commit e90e9a1e2a8307bf022207bf4386d877de3ca7dd

Authored by 房远帅
1 parent ba55cf9e

楚江ERP：签订合同时间修改

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
... ... @@ -309,12 +309,12 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
309 309 private String signedContractFileName;
310 310
311 311 /**
312   - * 转为正式合同时间
  312 + * 转为正式合同时间(经销(外贸、加工)标准合同则是转为标准合同时间)
313 313 */
314 314 private LocalDateTime formalizedAt;
315 315
316 316 /**
317   - * 转为标准合同时间
  317 + * 转为标准合同时间（废弃）
318 318 */
319 319 private LocalDateTime standardizedAt;
320 320
... ...
... ... @@ -642,7 +642,7 @@ public class ContractDistributorStandardServiceImpl extends
642 642 || "INTL_STD_CONTRACT".equals(data.getType())
643 643 || "PROCESS_STD_AGMT".equals(data.getType()))) { // 只有经销(外贸、加工)标准合同才修改状态
644 644 updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD")
645   - .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now());
  645 + .set(ContractDistributorStandard::getFormalizedAt, LocalDateTime.now());
646 646 }
647 647
648 648 updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
... ... @@ -844,7 +844,7 @@ public class ContractDistributorStandardServiceImpl extends
844 844 data.setOrderDate(LocalDate.now());
845 845 data.setStatus("STANDARD");
846 846 data.setParentId(vo.getId());
847   - data.setStandardizedAt(LocalDateTime.now());
  847 +// data.setStandardizedAt(LocalDateTime.now());
848 848 getBaseMapper().insert(data);
849 849
850 850 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
... ... @@ -933,7 +933,7 @@ public class ContractDistributorStandardServiceImpl extends
933 933 data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
934 934 data.setStatus("STANDARD");
935 935 data.setParentId(vo.getId());
936   - data.setStandardizedAt(LocalDateTime.now());
  936 +// data.setStandardizedAt(LocalDateTime.now());
937 937 getBaseMapper().insert(data);
938 938
939 939 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
... ...