diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OAStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OAStatusEnum.java index 41d8a2c2..d287dea5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OAStatusEnum.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OAStatusEnum.java @@ -39,7 +39,12 @@ public enum OAStatusEnum { /** * 作废 */ - INVALID("4", "作废"); + INVALID("4", "作废"), + + /** + * 作废 + */ + ACTIVATE("5", "已激活"); /** * 状态 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java index a727f2ed..3bfd23b9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java @@ -162,6 +162,8 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { ErpContractInfo contractInfo = new ErpContractInfo(); contractInfo.setContractId(contractInfoVo.getContractId()); contractInfo.setSignatureAppendix(Long.valueOf(bo.getOssId())); + contractInfo.setContractDeptId(bo.getDeptId()); + contractInfo.setContractStatus(OAStatusEnum.ACTIVATE.getStatus()); contractInfoMapper.updateById(contractInfo); }