fixed:价值曲线

src/main/java/cn/cslg/pas/service/business/es/EsValueCurveService.java

@@ -119,32 +119,34 @@ public class EsValueCurveService {
                 }
                 //获取营销数据
                 List<Integer> productIds = map.get(patentNo);
-                List<SelectValueCurveDTO> saleList = this.selectSale(productIds, timeType);
-                if (!CollectionUtils.isEmpty(saleList)) {
-                    Map<String, List<SelectValueCurveDTO>> saleMap = saleList.stream().collect(Collectors.groupingBy(SelectValueCurveDTO::getSaleTime));
-                    for (String key : saleMap.keySet()) {
-                        List<SelectValueCurveDTO> saleLDTOS = saleMap.get(key);
-                        //销售额
-                        BigDecimal count = new BigDecimal(0);
-                        //自定义许可费
-                        BigDecimal sum = new BigDecimal(0);
-                        for (SelectValueCurveDTO saleLDTO : saleLDTOS) {
-                            BigDecimal customLicensee = new BigDecimal(String.valueOf(saleLDTO.getCustomLicense()));
-                            sum = sum.add(customLicensee);
-                            BigDecimal saleMoney = new BigDecimal(String.valueOf(saleLDTO.getSaleMoney()));
-                            count = count.add(saleMoney);
-                        }
-                        SelectValueCurveDTO curveDTO = new SelectValueCurveDTO();
-                        if (sum.compareTo(new BigDecimal(0)) > 0) {
-                            curveDTO.setLicenseFee(sum.doubleValue());
-                        }
-                        if (count.compareTo(new BigDecimal(0)) > 0) {
-                            curveDTO.setCustomLicense(count.doubleValue());
+                if (!CollectionUtils.isEmpty(productIds)) {
+                    List<SelectValueCurveDTO> saleList = this.selectSale(productIds, timeType);
+                    if (!CollectionUtils.isEmpty(saleList)) {
+                        Map<String, List<SelectValueCurveDTO>> saleMap = saleList.stream().collect(Collectors.groupingBy(SelectValueCurveDTO::getSaleTime));
+                        for (String key : saleMap.keySet()) {
+                            List<SelectValueCurveDTO> saleLDTOS = saleMap.get(key);
+                            //销售额
+                            BigDecimal count = new BigDecimal(0);
+                            //自定义许可费
+                            BigDecimal sum = new BigDecimal(0);
+                            for (SelectValueCurveDTO saleLDTO : saleLDTOS) {
+                                BigDecimal customLicensee = new BigDecimal(String.valueOf(saleLDTO.getCustomLicense()));
+                                sum = sum.add(customLicensee);
+                                BigDecimal saleMoney = new BigDecimal(String.valueOf(saleLDTO.getSaleMoney()));
+                                count = count.add(saleMoney);
+                            }
+                            SelectValueCurveDTO curveDTO = new SelectValueCurveDTO();
+                            if (sum.compareTo(new BigDecimal(0)) > 0) {
+                                curveDTO.setLicenseFee(sum.doubleValue());
+                            }
+                            if (count.compareTo(new BigDecimal(0)) > 0) {
+                                curveDTO.setCustomLicense(count.doubleValue());
+                            }
+                            curveDTO.setSaleTime(key);
+                            curveDTO.setSaleArea(saleLDTOS.get(0).getSaleArea());
+                            curveDTO.setTimeType(saleLDTOS.get(0).getTimeType());
+                            listSale.add(curveDTO);
                         }
-                        curveDTO.setSaleTime(key);
-                        curveDTO.setSaleArea(saleLDTOS.get(0).getSaleArea());
-                        curveDTO.setTimeType(saleLDTOS.get(0).getTimeType());
-                        listSale.add(curveDTO);
                     }
                 }
                 List<EsValueCurveDTO> data = this.mergeData(listLicensee, listSale);

src/main/resources/mapper/PermissionRecordMapper.xml

@@ -12,7 +12,7 @@
 
     <select id="selectLicenseeYearList" resultType="cn.cslg.pas.common.dto.es.SelectValueCurveDTO">
         select sum(license_fee) as licenseFee,
-               DATE_FORMAT(license_time, '%Y') as licenseTime
+               CONCAT(DATE_FORMAT(license_time, '%Y'),'年') as licenseTime
         from permission_record
         where patent_no = #{patentNo}
         group by DATE_FORMAT(license_time, '%Y');
@@ -20,7 +20,7 @@
 
     <select id="selectLicenseeQuarterList" resultType="cn.cslg.pas.common.dto.es.SelectValueCurveDTO">
         select sum(license_fee) as licenseFee,
-               CONCAT(YEAR(license_time),'_',quarter(license_time)) as licenseTime
+               CONCAT(YEAR(license_time),'年第',quarter(license_time),'季度') as licenseTime
         from permission_record
         where patent_no = #{patentNo}
         group by licenseTime;

src/main/resources/mapper/ProductMarketDataMapper.xml

@@ -66,7 +66,7 @@
     <select id="selectSaleYearList" resultType="cn.cslg.pas.common.dto.es.SelectValueCurveDTO">
         select sale_area as saleArea,
                sum(sale_money) as saleMoney,
-               DATE_FORMAT(sale_time, '%Y') as saleTime,
+               CONCAT(DATE_FORMAT(sale_time, '%Y'),'年') as saleTime,
                sum(sale_money*custom_license_rate) as customLicense
                from pas_prod2.product_market_data
         <where>
@@ -82,7 +82,7 @@
     <select id="selectSaleQuarterList" resultType="cn.cslg.pas.common.dto.es.SelectValueCurveDTO">
         select sale_area as saleArea,
                sum(sale_money) as saleMoney,
-               CONCAT(YEAR(sale_time),'_',quarter(sale_time)) as saleTime
+               CONCAT(YEAR(sale_time),'年第',quarter(sale_time),'季度') as saleTime,
                sum(sale_money*custom_license_rate) as customLicense
                from pas_prod2.product_market_data
         <where>