|
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.fjhx.area.utils.CustomizeAreaUtil;
|
|
|
import com.fjhx.common.enums.CodingRuleEnum;
|
|
|
-import com.fjhx.common.enums.FlowStatusEnum;
|
|
|
+import com.fjhx.common.enums.FlowStatusEnum1;
|
|
|
import com.fjhx.common.service.coding.CodingRuleService;
|
|
|
import com.fjhx.common.utils.Assert;
|
|
|
import com.fjhx.common.utils.ExchangeRateUtil;
|
|
@@ -106,11 +106,24 @@ public class ContractFlow extends FlowDelegate {
|
|
|
}
|
|
|
|
|
|
// 修改采购状态为审批通过
|
|
|
- contract.setStatus(FlowStatusEnum.PASS.getKey());
|
|
|
+ contract.setStatus(FlowStatusEnum1.PASS.getKey());
|
|
|
contract.setApprovedDate(new Date());
|
|
|
contractService.updateById(contract);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void defaultMethod(Long flowId, Long businessId, com.fjhx.flow.enums.FlowStatusEnum flowStatusEnum, JSONObject submitData) {
|
|
|
+ //重新发起
|
|
|
+ if (com.fjhx.flow.enums.FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
|
|
|
+ reStart();
|
|
|
+ }
|
|
|
+ //驳回
|
|
|
+ if (com.fjhx.flow.enums.FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
|
|
|
+ reject();
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
public Long start(ContractDto contract) {
|
|
|
|
|
|
long contractId = IdWorker.getId();
|
|
@@ -136,7 +149,7 @@ public class ContractFlow extends FlowDelegate {
|
|
|
contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
|
|
|
}
|
|
|
contract.setUserName(SecurityUtils.getUsername());
|
|
|
- contract.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
|
|
|
+ contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
|
|
|
contract.setBuyCityId(contract.getCityId());
|
|
|
contract.setBuyCountryId(contract.getCountryId());
|
|
|
contract.setBuyProvinceId(contract.getProvinceId());
|
|
@@ -210,7 +223,7 @@ public class ContractFlow extends FlowDelegate {
|
|
|
contract.setId(contractId);
|
|
|
// contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
|
|
|
contract.setUserName(SecurityUtils.getUsername());
|
|
|
- contract.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
|
|
|
+ contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
|
|
|
contract.setBuyCityId(contract.getCityId());
|
|
|
contract.setBuyCountryId(contract.getCountryId());
|
|
|
contract.setBuyProvinceId(contract.getProvinceId());
|