添加了产品看板

hx-customer/src/main/java/com/fjhx/customer/entity/customer/po/Customer.java

@@ -40,11 +40,21 @@ public class Customer extends BasePo {
     private Long provinceId;
 
     /**
+     * 省份ID
+     */
+    private Long provinceName;
+
+    /**
      * 城市id
      */
     private Long cityId;
 
     /**
+     * 城市id
+     */
+    private Long cityName;
+
+    /**
      * 地址
      */
     private String address;

hx-sale/src/main/java/com/fjhx/sale/entity/serviceContract/dto/ServiceContractDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.serviceContract.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractPay;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractProduct;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ServiceContractDto extends ServiceContract {
+public class ServiceContractDto extends ServiceContract  implements SetCustomizeAreaId {
 
     /**
      * 服务合同-收费项目表
@@ -27,4 +28,32 @@ public class ServiceContractDto extends ServiceContract {
      * 服务合同-商品表
      */
     private List<ServiceContractProduct> serviceContractProductList;
+
+    /**
+     * 省 州ID
+     */
+    private Long provinceId;
+
+    /**
+     * 省州名称
+     */
+    private String provinceName;
+
+
+    /**
+     * 城市ID
+     */
+    private Long cityId;
+
+    /**
+     * 城市名称
+     */
+    private String cityName;
+
+    /**
+     * 国家ID
+     */
+    private Long countryId;
+
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/serviceContract/po/ServiceContract.java

@@ -57,11 +57,21 @@ public class ServiceContract extends BasePo {
     private String sellProvinceId;
 
     /**
+     * 卖方省份名称
+     */
+    private String sellProvinceName;
+
+    /**
      * 卖方城市id
      */
     private String sellCityId;
 
     /**
+     * 卖方城市名称
+     */
+    private String sellCityName;
+
+    /**
      * 卖方详细地址
      */
     private String sellAddress;
@@ -84,17 +94,18 @@ public class ServiceContract extends BasePo {
     /**
      * 买方国家表id
      */
-    private String buyCountryId;
+    private Long buyCountryId;
 
     /**
      * 买方省份id
      */
-    private String buyProvinceId;
+    private Long buyProvinceId;
 
     /**
      * 买方城市id
      */
-    private String buyCityId;
+    private Long buyCityId;
+
 
     /**
      * 买方详细地址

hx-sale/src/main/java/com/fjhx/sale/flow/ServiceContractFlow.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 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.flow.core.FlowDelegate;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
@@ -40,10 +42,20 @@ public class ServiceContractFlow extends FlowDelegate {
      */
     @Override
     public Long start(Long flowId, JSONObject submitData) {
+
+
         ServiceContractService serviceContractService = SpringUtil.getBean(ServiceContractService.class);
         ServiceContractPayService serviceContractPayService = SpringUtil.getBean(ServiceContractPayService.class);
         ServiceContractProductService serviceContractProductService = SpringUtil.getBean(ServiceContractProductService.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());
         //添加服务合同状态