add new api inputInvoicePreviewList

add new api queryOutputInvoiceList

fixed issues

atms-api/src/main/java/pwc/taxtech/atms/controller/InputInvoiceImportController.java

@@ -2,6 +2,7 @@ package pwc.taxtech.atms.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,7 +18,7 @@ public class InputInvoiceImportController {
     InputInvoiceDataImportService inputInvoiceDataImportService;
 
     @RequestMapping(value = "inputInvoicePreviewList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public PagingResultDto<InputVATInvoiceDto> getInputInvoiceTreeViewData(InputInvoicePreviewQueryParam paras) {
+    public PagingResultDto<InputVATInvoiceDto> getInputInvoiceTreeViewData(@RequestBody InputInvoicePreviewQueryParam paras) {
         return inputInvoiceDataImportService.getInputInvoiceTreeViewData(paras);
     }
 }

atms-api/src/main/java/pwc/taxtech/atms/controller/OutputInvoiceController.java

@@ -2,6 +2,7 @@ package pwc.taxtech.atms.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,7 +19,7 @@ public class OutputInvoiceController {
     OutputInvoiceService outputInvoiceService;
 
     @RequestMapping(value = "queryOutputInvoiceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public PagingResultDto<OutputVATInvoiceInfoDto> queryOutputInvoiceList(QueryOutputDto queryDto) {
+    public PagingResultDto<OutputVATInvoiceInfoDto> queryOutputInvoiceList(@RequestBody QueryOutputDto queryDto) {
         return outputInvoiceService.queryOutputInvoiceList(queryDto);
     }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InputInvoicePreviewQueryParam.java

@@ -127,4 +127,12 @@ public class InputInvoicePreviewQueryParam {
     public void setTaxAmountEnd(BigDecimal taxAmountEnd) {
         this.taxAmountEnd = taxAmountEnd;
     }
+
+    public int getCertificationStatus() {
+        return certificationStatus;
+    }
+
+    public void setCertificationStatus(int certificationStatus) {
+        this.certificationStatus = certificationStatus;
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/vat/dao/InputVATInvoiceMapper.java

@@ -107,7 +107,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
      */
     int updateByPrimaryKey(InputVATInvoice record);
 
-    int getInputVATInvoiceCountByCondition(@Param("paras") InputInvoicePreviewQueryParam param);
+    long getInputVATInvoiceCountByCondition(@Param("paras") InputInvoicePreviewQueryParam param);
 
     List<InputVATInvoice> getInputVATInvoiceCountByConditionWithPaging(@Param("paras") InputInvoicePreviewQueryParam param,@Param("limitFrom") int limitFrom);
 }
\ No newline at end of file

atms-api/src/main/resources/pwc/taxtech/atms/vat/dao/OutputVATInvoiceMapper.xml

@@ -520,14 +520,14 @@
         LEFT JOIN OutputVATInvoiceItem oi
         ON o.InvoiceID = oi.InvoiceID
         WHERE 1=1
-        <if test="queryDto.PeriodStart">
-            AND o.Period&gt;=#{queryDto.PeriodStart,jdbcType=VARCHAR}
+        <if test="queryDto.periodStart">
+            AND o.PeriodID&gt;=#{queryDto.periodStart,jdbcType=VARCHAR}
         </if>
-        <if test="queryDto.PeriodEnd">
-            AND o.Period&lt;=#{queryDto.PeriodEnd,jdbcType=VARCHAR}
+        <if test="queryDto.periodEnd">
+            AND o.PeriodID&lt;=#{queryDto.periodEnd,jdbcType=VARCHAR}
         </if>
-        <if test="queryDto.ProductName!=null and queryDto.ProductName!=''">
-            AND ProductName LIKE concat('%',#{query.ProductName,jdbcType=VARCHAR,'%'})
+        <if test="queryDto.productName!=null and queryDto.productName!=''">
+            AND ProductName LIKE concat('%',#{query.productName,jdbcType=VARCHAR,'%'})
         </if>
     </select>
 </mapper>
\ No newline at end of file