地址修改

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.contract.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.sale.entity.contract.po.Contract;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-public class ContractDto extends Contract {
+public class ContractDto extends Contract implements SetCustomizeAreaId {
     /**
      * 开始时间
      */
@@ -58,4 +59,30 @@ public class ContractDto extends Contract {
      * 外销数量
      */
     private BigDecimal quantity;
+
+    /**
+     * 省 州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/purchase/dto/EhsdPurchaseDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.purchase.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,6 +13,32 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class EhsdPurchaseDto extends EhsdPurchase {
+public class EhsdPurchaseDto extends EhsdPurchase implements SetCustomizeAreaId {
 
+
+    /**
+     * 省 州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/purchase/po/EhsdPurchase.java

@@ -86,17 +86,17 @@ public class EhsdPurchase 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/entity/sale/dto/SaleQuotationDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.sale.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class SaleQuotationDto extends SaleQuotation {
+public class SaleQuotationDto extends SaleQuotation implements SetCustomizeAreaId {
 
     /**
      * 商品-报价单关联表信息
@@ -29,5 +30,30 @@ public class SaleQuotationDto extends SaleQuotation {
     private List<QuotationPay> quotationPayList;
 
 
+    /**
+     * 省 州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/sample/dto/SampleDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.sample.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.sale.entity.sample.po.Sample;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,6 +13,32 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SampleDto extends Sample {
+public class SampleDto extends Sample implements SetCustomizeAreaId {
 
+
+    /**
+     * 省 州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/sample/po/Sample.java

@@ -88,17 +88,17 @@ public class Sample 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/ContractFlow.java

@@ -7,14 +7,17 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.FlowStatusEnum;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
+import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
@@ -57,10 +60,16 @@ public class ContractFlow extends FlowDelegate {
         ContractProductService contractProductService = SpringUtil.getBean(ContractProductService.class);
         ContractProjectService contractProjectService = SpringUtil.getBean(ContractProjectService.class);
         ContractShipmentService contractShipmentService = SpringUtil.getBean(ContractShipmentService.class);
-        Contract contract = submitData.toJavaObject(Contract.class);
+        ContractDto contract = submitData.toJavaObject(ContractDto.class);
+        //赋值城市省份信息
+        CustomizeAreaUtil.setAreaId(contract);
         contract.setCode(CodeEnum.CONTRACT.getCode());
         contract.setUserName(SecurityUtils.getUsername());
         contract.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
+        contract.setBuyCityId(contract.getCityId());
+        contract.setBuyCountryId(contract.getCountryId());
+        contract.setBuyProvinceId(contract.getProvinceId());
+
         contractService.save(contract);
         List<ContractProduct> contractProductList = contract.getContractProductList();
         if(CollectionUtils.isNotEmpty(contractProductList)){//保存合同产品

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

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
 import com.fjhx.sale.entity.purchase.po.*;
 import com.fjhx.sale.service.purchase.*;
 import com.fjhx.sale.util.code.CodeEnum;
@@ -76,7 +78,13 @@ public class EhsdPurchaseFlow extends FlowDelegate {
     @Override
     @DSTransactional
     public Long start(Long flowId, JSONObject submitData) {
-        EhsdPurchase purchase = submitData.toJavaObject(EhsdPurchase.class);
+        EhsdPurchaseDto purchase = submitData.toJavaObject(EhsdPurchaseDto.class);
+        //赋值城市省份信息
+        CustomizeAreaUtil.setAreaId(purchase);
+        purchase.setBuyCityId(purchase.getCityId());
+        purchase.setBuyCountryId(purchase.getCountryId());
+        purchase.setBuyProvinceId(purchase.getProvinceId());
+
         purchase.setCode(CodeEnum.PURCHASE.getCode());
         purchase.setStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
         purchase.setUserName(SecurityUtils.getUsername());

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

@@ -5,6 +5,7 @@ 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.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
@@ -44,6 +45,11 @@ public class SaleQuotationFlow extends FlowDelegate {
         QuotationPayService quotationPayService = SpringUtil.getBean(QuotationPayService.class);
         QuotationProductService quotationProductService = SpringUtil.getBean(QuotationProductService.class);
         SaleQuotationDto saleQuotation = submitData.toJavaObject(SaleQuotationDto.class);
+        //赋值城市省份信息
+        CustomizeAreaUtil.setAreaId(saleQuotation);
+        saleQuotation.setBuyCityId(saleQuotation.getCityId());
+        saleQuotation.setBuyCountryId(saleQuotation.getCountryId());
+        saleQuotation.setBuyProvinceId(saleQuotation.getProvinceId());
         //添加报价编码
         saleQuotation.setCode(CodeEnum.SALE_QUOTATION.getCode());
         //添加报价状态

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

@@ -7,8 +7,11 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.sale.entity.contract.dto.ContractDto;
+import com.fjhx.sale.entity.sample.dto.SampleDto;
 import com.fjhx.sale.entity.sample.po.Sample;
 import com.fjhx.sale.entity.sample.po.SampleProduct;
 import com.fjhx.sale.entity.sample.po.SampleProject;
@@ -58,10 +61,18 @@ public class SampleFlow extends FlowDelegate {
         SampleProductService sampleProductService = SpringUtil.getBean(SampleProductService.class);
         SampleProjectService sampleProjectService = SpringUtil.getBean(SampleProjectService.class);
         SampleShipmentService sampleShipmentService = SpringUtil.getBean(SampleShipmentService.class);
-        Sample sample = submitData.toJavaObject(Sample.class);
+//        Sample sample = submitData.toJavaObject(Sample.class);
+
+        SampleDto sample = submitData.toJavaObject(SampleDto.class);
+        //赋值城市省份信息
+        CustomizeAreaUtil.setAreaId(sample);
+        sample.setBuyCityId(sample.getCityId());
+        sample.setBuyCountryId(sample.getCountryId());
+        sample.setBuyProvinceId(sample.getProvinceId());
         sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
         sample.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
         sample.setUserName(SecurityUtils.getUsername());
+
         sampleService.save(sample);
         List<SampleProduct> sampleProductList = sample.getSampleProductList();
         if(CollectionUtils.isNotEmpty(sampleProductList)){//保存样品单产品