销售分析添加国家图标

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -139,7 +139,7 @@ public class ContractController {
      * 国家销售统计(数据看板-销售分析页面开发)
      */
     @PostMapping("/countrySalesStatistics")
-    public List<ContractDto> countrySalesStatistics(@RequestBody ContractDto dto) {
+    public List<ContractVo> countrySalesStatistics(@RequestBody ContractDto dto) {
         return contractService.countrySalesStatistics(dto);
     }
 

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -174,6 +174,15 @@ public class ContractVo extends Contract {
      * 总数
      */
     private BigDecimal sumQuantity;
+    /**
+     * 国家名称
+     */
+    private String countryName;
+    /**
+     * 国家图标
+     */
+    private String countryIcon;
+
 
 }
 

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java

@@ -82,7 +82,7 @@ public interface ContractMapper extends BaseMapper<Contract> {
     /**
      * 国家销售统计(数据看板-销售分析页面开发)
      */
-    List<ContractDto> countrySalesStatistics(@Param("ew") QueryWrapper<Object> query);
+    List<ContractVo> countrySalesStatistics(@Param("ew") QueryWrapper<Object> query);
 
     /**
      * 客户销售统计(数据看板-销售分析页面开发)

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

@@ -135,7 +135,7 @@ public interface ContractService extends BaseService<Contract> {
     /**
      * 国家销售统计(数据看板-销售分析页面开发)
      */
-    List<ContractDto> countrySalesStatistics(ContractDto dto);
+    List<ContractVo> countrySalesStatistics(ContractDto dto);
 
     /**
      * 客户销售统计(数据看板-销售分析页面开发)

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

@@ -887,14 +887,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      * 国家销售统计(数据看板-销售分析页面开发)
      */
     @Override
-    public List<ContractDto> countrySalesStatistics(ContractDto dto) {
+    public List<ContractVo> countrySalesStatistics(ContractDto dto) {
         QueryWrapper<Object> query = Wrappers.query();
         query.ge("DATE_FORMAT(cc.create_time,'%Y-%m')", dto.getBeginTime());
         query.le("DATE_FORMAT(cc.create_time,'%Y-%m')", dto.getEndTime());
         query.groupBy("cc.buy_country_id");
         query.orderByDesc("amount");
         //查询销售国家统计信息
-        List<ContractDto> contractDtoList = baseMapper.countrySalesStatistics(query);
+        List<ContractVo> contractDtoList = baseMapper.countrySalesStatistics(query);
         return contractDtoList;
     }
 

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -157,15 +157,15 @@
               left  JOIN  contract sq ON sq.buy_corporation_id = c.id
             ${ew.customSqlSegment}
     </select>
-    <select id="countrySalesStatistics" resultType="com.fjhx.sale.entity.contract.dto.ContractDto">
-        SELECT
-            sum(cc.amount) amount,
-            COUNT(cc.buy_country_id) count,
-            ai.name countryName
-
+    <select id="countrySalesStatistics" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
+        SELECT sum(cc.amount) amount,
+               COUNT(cc.buy_country_id) count,
+            ai.name countryName,
+            ai.icon countryIcon
         FROM
             contract cc
-                LEFT JOIN bytesailing_base.customize_area ai ON cc.buy_country_id = ai.id
+            LEFT JOIN bytesailing_base.customize_area ai
+        ON cc.buy_country_id = ai.id
             ${ew.customSqlSegment}
     </select>