Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

export bug

See merge request root/atms!193

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/OutputInvoiceServiceImpl.java

@@ -268,9 +268,19 @@ public class OutputInvoiceServiceImpl {
         List<String> fpqqlshList = outputInvoiceMapper.selectByExample(e).stream().map(OutputInvoice::getFPQQLSH).collect(Collectors.toList());
         rList = rList.stream().filter(a -> fpqqlshList.contains(a.getFpqqlsh())).collect(Collectors.toList());
         rList.forEach(x -> {
-                    CAL.setTime(x.getInvoiceDate());
-                    x.setPeriodId(CAL.get(Calendar.MONTH) + 1);
-                });
+            if(x.getInvoiceDate() != null){
+                CAL.setTime(x.getInvoiceDate());
+                x.setPeriodId(CAL.get(Calendar.MONTH) + 1);
+            }
+            if(x.getTaxAmount() == null || x.getAmount() == null || x.getTaxRate() == null){
+                OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
+                outputInvoiceExample.createCriteria().andIDEqualTo(x.getInvoiceId());
+                OutputInvoice outputInvoice =  outputInvoiceMapper.selectByExample(outputInvoiceExample).get(0);
+                x.setAmount(outputInvoice.getHJJE() == null ? BigDecimal.ZERO : new BigDecimal(outputInvoice.getHJJE()));
+                x.setTaxRate(outputInvoice.getSLV() == null ? BigDecimal.ZERO : new BigDecimal(outputInvoice.getSLV()));
+                x.setTaxAmount(outputInvoice.getHJSE() == null ? BigDecimal.ZERO : new BigDecimal(outputInvoice.getHJSE()));
+            }
+        });
         Function<OutputVATInvoiceInfoDto, List<Object>> compositeKey = outputVATInvoiceInfoDto ->
                 Arrays.asList(outputVATInvoiceInfoDto.getInvoiceId()
                         , outputVATInvoiceInfoDto.getClassCode()

atms-dao/src/main/resources/pwc/taxtech/atms/invoice/extends/OutputInvoiceExtendsMapper.xml

@@ -18,11 +18,11 @@
         <result column="DOCUMENT_NUM" jdbcType="VARCHAR" property="documentNum"/>
         <result column="PRODUCT_STANDARD" jdbcType="VARCHAR" property="productStandard"/>
         <result column="UNIT" jdbcType="VARCHAR" property="unit"/>
-        <result column="QUANTITY" jdbcType="INTEGER" property="quantity"/>
-        <result column="UNIT_PRICE" jdbcType="DOUBLE" property="unitPrice"/>
-        <result column="AMOUNT" jdbcType="DECIMAL" property="amount"/>
-        <result column="TAX_RATE" jdbcType="DECIMAL" property="taxRate"/>
-        <result column="TAX_AMOUNT" jdbcType="DECIMAL" property="taxAmount"/>
+        <result column="QUANTITY" jdbcType="INTEGER" property="quantity" javaType="java.lang.Integer"/>
+        <result column="UNIT_PRICE" jdbcType="DOUBLE" property="unitPrice" javaType="java.lang.Double"/>
+        <result column="AMOUNT" jdbcType="DECIMAL" property="amount" javaType="java.math.BigDecimal"/>
+        <result column="TAX_RATE" jdbcType="DECIMAL" property="taxRate" javaType="java.math.BigDecimal"/>
+        <result column="TAX_AMOUNT" jdbcType="DECIMAL" property="taxAmount" javaType="java.math.BigDecimal"/>
         <result column="TAX_CLASS_CODE" jdbcType="VARCHAR" property="taxClassCode"/>
         <result column="PERIOD_ID" jdbcType="INTEGER" property="periodId"/>
         <result column="IS_DUPLICATE" jdbcType="INTEGER" property="isDuplicate"/>
@@ -40,7 +40,7 @@
         O.GFSH AS BUYER_TAX_NUMBER,
         O.GFYHZH AS BANK_ACCOUNT,
         O.GFDZDH AS PHONE_NUM,
-        O.KPRQ AS INVOICE_DATE,
+        to_date(O.KPRQ,'yyyy-mm-dd hh24:mi:ss') AS INVOICE_DATE,
         /*nvl (
         OI.CODE_VERSION,
         ''
@@ -71,20 +71,11 @@
         ''
         )
         AS QUANTITY,
-        nvl (
-        OI.DJ,
-        ''
-        )
+        to_number(OI.DJ)
         AS UNIT_PRICE,
-        nvl (
-        OI.JE,
-        ''
-        )
-        AS AMOUNT,
-        nvl (
-        OI.SE,
-        ''
-        )
+        to_number(OI.JE) AS AMOUNT,
+        to_number(OI.SLV) AS TAX_RATE,
+        to_number(OI.SE)
         AS TAX_AMOUNT,
         nvl (
         OI.SSFLDM,