|
@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
|
+import com.fjhx.area.service.SetCustomizeAreaId;
|
|
|
|
+import com.fjhx.area.utils.CustomizeAreaUtil;
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
import com.fjhx.flow.core.FlowDelegate;
|
|
import com.fjhx.flow.core.FlowDelegate;
|
|
import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
|
|
import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
|
|
@@ -40,10 +42,20 @@ public class ServiceContractFlow extends FlowDelegate {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public Long start(Long flowId, JSONObject submitData) {
|
|
public Long start(Long flowId, JSONObject submitData) {
|
|
|
|
+
|
|
|
|
+
|
|
ServiceContractService serviceContractService = SpringUtil.getBean(ServiceContractService.class);
|
|
ServiceContractService serviceContractService = SpringUtil.getBean(ServiceContractService.class);
|
|
ServiceContractPayService serviceContractPayService = SpringUtil.getBean(ServiceContractPayService.class);
|
|
ServiceContractPayService serviceContractPayService = SpringUtil.getBean(ServiceContractPayService.class);
|
|
ServiceContractProductService serviceContractProductService = SpringUtil.getBean(ServiceContractProductService.class);
|
|
ServiceContractProductService serviceContractProductService = SpringUtil.getBean(ServiceContractProductService.class);
|
|
ServiceContractDto contract = submitData.toJavaObject(ServiceContractDto.class);
|
|
ServiceContractDto contract = submitData.toJavaObject(ServiceContractDto.class);
|
|
|
|
+
|
|
|
|
+ //赋值城市省份信息
|
|
|
|
+ CustomizeAreaUtil.setAreaId(contract);
|
|
|
|
+
|
|
|
|
+ contract.setBuyCityId(contract.getCityId());
|
|
|
|
+ contract.setBuyCountryId(contract.getCountryId());
|
|
|
|
+ contract.setBuyProvinceId(contract.getProvinceId());
|
|
|
|
+
|
|
//添加服务合同编码
|
|
//添加服务合同编码
|
|
contract.setCode(CodeEnum.SALE_QUOTATION.getCode());
|
|
contract.setCode(CodeEnum.SALE_QUOTATION.getCode());
|
|
//添加服务合同状态
|
|
//添加服务合同状态
|