Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ReportServiceImpl.java

@@ -27,11 +27,8 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
-import java.util.Calendar;
-import java.util.HashMap;
+import java.util.*;
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -62,7 +59,7 @@ public class ReportServiceImpl implements ReportService {
             //求总和
             Long collect = listReportVOS.stream().collect(Collectors.summingLong(ListBrandCodeReportVO::getQrNumber));
             listReportVOS.forEach(listReportVO->{
-                Double val = new Double(listReportVO.getQrNumber() / collect * 100);
+                Double val =listReportVO.getQrNumber().doubleValue() / collect.doubleValue()* 100;
                 listReportVO.setPercent(new DecimalFormat("#0.00").format(val + 0.000001d)+"%");
             });
         }
@@ -102,14 +99,16 @@ public class ReportServiceImpl implements ReportService {
         List<ListFactoryCodeReportVO> listFactoryCodeTotalReportVOS = reportServiceMapper.queryFactoryCodeTotal(reportReq,0);
         //包材厂包下载量
         List<ListFactoryCodeReportVO> listFactoryCodeDownloadTotalReportVOS = reportServiceMapper.queryFactoryCodeTotal(reportReq,1);
-        Map<String, Long> FactoryCodeDownloadTotalMaps = listFactoryCodeTotalReportVOS.stream().collect(Collectors.toMap(ListFactoryCodeReportVO::getFactoryName, ListFactoryCodeReportVO::getQrNumber));
-        listFactoryCodeTotalReportVOS.forEach(listReportVO->{
-            Double val = 0d;
-            if (null != FactoryCodeDownloadTotalMaps.get(listReportVO.getFactoryName())){
-                val = new Double(FactoryCodeDownloadTotalMaps.get(listReportVO.getFactoryName()) / listReportVO.getQrNumber() * 100);
-            }
-            listReportVO.setDownloadNumber(new DecimalFormat("#0.00").format(val + 0.000001d)+"%");
-        });
+        Map<String, Long> factoryCodeDownloadTotalMaps = listFactoryCodeDownloadTotalReportVOS.stream().collect(Collectors.toMap(ListFactoryCodeReportVO::getFactoryName, ListFactoryCodeReportVO::getQrNumber));
+        if(!CollectionUtils.isEmpty(listFactoryCodeTotalReportVOS)) {
+            listFactoryCodeTotalReportVOS.forEach(listReportVO -> {
+                Double val = 0d;
+                if (null != factoryCodeDownloadTotalMaps.get(listReportVO.getFactoryName())) {
+                    val = factoryCodeDownloadTotalMaps.get(listReportVO.getFactoryName()).doubleValue() / listReportVO.getQrNumber().doubleValue() * 100;
+                }
+                listReportVO.setDownloadNumber(new DecimalFormat("#0.00").format(val + 0.000001d) + "%");
+            });
+        }
         // 封装出参
         ListFactoryCodeReportRes res = new ListFactoryCodeReportRes();
         List<ListFactoryCodeReportRes.FactoryCodeReportResBean> reportFactoryRes = PojoConverterUtils.copyList(listFactoryCodeTotalReportVOS, ListFactoryCodeReportRes.FactoryCodeReportResBean.class);

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSapOrganizationMapper.xml

@@ -4,17 +4,17 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapOrganization">
-        <id column="id" property="id" />
-        <result column="customer_code" property="customerCode" />
-        <result column="customer_name" property="customerName" />
-        <result column="parent_code" property="parentCode" />
-        <result column="organization_level" property="organizationLevel" />
-        <result column="province" property="province" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="is_delete" property="isDelete" />
+        <id column="id" property="id"/>
+        <result column="customer_code" property="customerCode"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="parent_code" property="parentCode"/>
+        <result column="organization_level" property="organizationLevel"/>
+        <result column="province" property="province"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSapSkuMapper.xml

@@ -4,17 +4,17 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapSku">
-        <id column="id" property="id" />
-        <result column="sku_code" property="skuCode" />
-        <result column="sku_name" property="skuName" />
-        <result column="brand_code" property="brandCode" />
-        <result column="sub_brand_code" property="subBrandCode" />
-        <result column="valid" property="valid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="is_delete" property="isDelete" />
+        <id column="id" property="id"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="brand_code" property="brandCode"/>
+        <result column="sub_brand_code" property="subBrandCode"/>
+        <result column="valid" property="valid"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -23,5 +23,4 @@
     </sql>
 
 
-
 </mapper>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrRepertoryMapper.xml

@@ -155,10 +155,11 @@
         qrc.id as repertoryColumnId,
         qrc.sort_number,
         qrc.alias,
-        qbs.split_num
+        qbs.split_num,
+        qbs.id as splitId
         from qr_repertory qr
         inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
-        left join qr_box_code_format_split qbs on qr.id=qbs.qr_repertory_id
+        inner join qr_box_code_format_split qbs on qrc.id = qbs.qr_repertory_column_id
         <where>
             <if test="id != null and id != ''">
                 qr.id = #{id}