添加了产品看板

hx-customer/src/main/java/com/fjhx/customer/entity/customer/dto/CustomerDto.java

@@ -30,14 +30,5 @@ public class CustomerDto extends Customer implements SetCustomizeAreaId {
      */
     private String endTime;
 
-    /**
-     * 省/州名称
-     */
-    private String provinceName;
-
-    /**
-     * 市名称
-     */
-    private String cityName;
 
 }

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

@@ -39,20 +39,20 @@ public class Customer extends BasePo {
      */
     private Long provinceId;
 
-//    /**
-//     * 省份ID
-//     */
-//    private Long provinceName;
+    /**
+     * 省份名称
+     */
+    private String provinceName;
 
     /**
      * 城市id
      */
     private Long cityId;
 
-//    /**
-//     * 城市id
-//     */
-//    private Long cityName;
+    /**
+     * 城市名称
+     */
+    private String cityName;
 
     /**
      * 地址

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -755,7 +755,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         List<Map<String, Object>> list = new ArrayList<>();
         QueryWrapper<ProductInfo> wrapper = Wrappers.query();
         wrapper.groupBy("type");
-        wrapper.select("count(*) count, ifNull(type,-1)");
+        wrapper.select("count(*) count, ifNull(type,-1) type");
         List<ProductInfo> productInfos = baseMapper.selectList(wrapper);
         Map<String, List<ProductInfo>> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getType));
 
@@ -764,8 +764,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 
         map.put("amount",amount);
         //获取产品类型统计数据
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         List<DictTenantDataVo> dictTenantDataVoList = getDict("product_type");
-
+        DynamicDataSourceContextHolder.poll();
         if (dictTenantDataVoList.size()==0){
             throw new ServiceException("数据异常：产品没有设置产品类型字典，请先添加");
         }

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

@@ -66,6 +66,21 @@ public class SaleQuotation extends BasePo {
     private String sellCityId;
 
     /**
+     * 卖方国家表名称
+     */
+    private String sellCountryName;
+
+    /**
+     * 卖方省份名称
+     */
+    private String sellProvinceName;
+
+    /**
+     * 卖方城市名称
+     */
+    private String sellCityName;
+
+    /**
      * 卖方详细地址
      */
     private String sellAddress;

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

@@ -56,10 +56,6 @@ public class ServiceContract extends BasePo {
      */
     private String sellProvinceId;
 
-    /**
-     * 卖方省份名称
-     */
-    private String sellProvinceName;
 
     /**
      * 卖方城市id
@@ -67,6 +63,16 @@ public class ServiceContract extends BasePo {
     private String sellCityId;
 
     /**
+     * 卖方国家表名称
+     */
+    private String sellCountryName;
+
+    /**
+     * 卖方省份名称
+     */
+    private String sellProvinceName;
+
+    /**
      * 卖方城市名称
      */
     private String sellCityName;

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -646,10 +646,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         List<Long> areaIdList = Arrays.asList(
                 contract.getBuyCountryId(),
                 contract.getBuyProvinceId(),
-                contract.getBuyCityId(),
-                contract.getSellCountryId(),
-                contract.getSellProvinceId(),
-                contract.getSellCityId()
+                contract.getBuyCityId()
         );
 
         Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
@@ -813,6 +810,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         CustomizeAreaUtil.setAreaId(Arrays.asList(setCustomizeAreaId1, setCustomizeAreaId2));
 
+
+        CustomizeAreaUtil.setAreaId(Arrays.asList(setCustomizeAreaId1));
+
     }
 
 }

hx-sale/src/main/resources/mapper/sale/SaleQuotationMapper.xml

@@ -3,39 +3,7 @@
 <mapper namespace="com.fjhx.sale.mapper.sale.SaleQuotationMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.sale.vo.SaleQuotationVo">
         select
-            sq.id,
-            sq.contract_template_id,
-            sq.code,
-            sq.status,
-            sq.sell_corporation_id,
-            sq.sell_contact_name,
-            sq.sell_contact_number,
-            sq.sell_country_id,
-            sq.sell_province_id,
-            sq.sell_city_id,
-            sq.sell_address,
-            sq.buy_corporation_id,
-            sq.buy_contact_name,
-            sq.buy_contact_number,
-            sq.buy_country_id,
-            sq.buy_province_id,
-            sq.buy_city_id,
-            sq.buy_address,
-            sq.buy_postal_code,
-            sq.currency,
-            sq.amount,
-            sq.payment_method,
-            sq.trade_methods,
-            sq.advance_ratio,
-            sq.transport_method,
-            sq.transport_remark,
-            sq.effective,
-            sq.warranty,
-            sq.remark,
-            sq.create_user,
-            sq.create_time,
-            sq.update_user,
-            sq.update_time
+         *
         from sale_quotation sq
             ${ew.customSqlSegment}
     </select>