Merge branch 'dev_oracle_neo' into 'dev_oracle'

Dev oracle neo

See merge request root/atms!122

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

@@ -13,6 +13,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import pwc.taxtech.atms.constant.enums.EnumModule;
 import pwc.taxtech.atms.dpo.PagingResultDto;
 import pwc.taxtech.atms.dto.vatdto.ImportOutputInvoiceDto;
+import pwc.taxtech.atms.dto.vatdto.OutputInvoice;
 import pwc.taxtech.atms.dto.vatdto.QueryEvidenceDto;
 import pwc.taxtech.atms.service.IdentityService;
 import pwc.taxtech.atms.thirdparty.ExcelUtil;
@@ -48,7 +49,7 @@ public class OutputInvoiceController {
     private FileUploadAdapter fileUploadAdapter;
 
     @RequestMapping(value = "queryOutputInvoiceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public PagingResultDto<OutputVATInvoiceInfoDto> queryOutputInvoiceList(@RequestBody QueryOutputDto queryDto) {
+    public PagingResultDto<OutputInvoice> queryOutputInvoiceList(@RequestBody QueryOutputDto queryDto) {
         return outputInvoiceService.queryOutputInvoiceList(queryDto);
     }
 

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

@@ -15,12 +15,10 @@ import org.reflections.util.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.CommonUtils;
-import pwc.taxtech.atms.common.PagingList;
 import pwc.taxtech.atms.constant.enums.EnumTbImportType;
 import pwc.taxtech.atms.dpo.PagingResultDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.vatdto.ImportOutputInvoiceDto;
-import pwc.taxtech.atms.dto.vatdto.InputInvoice;
 import pwc.taxtech.atms.dto.vatdto.OutputInvoice;
 import pwc.taxtech.atms.dto.vatdto.QueryEvidenceDto;
 import pwc.taxtech.atms.vat.dao.ImportFileMapper;
@@ -53,18 +51,8 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
     @Autowired
     private SqlSessionTemplate dynamicSqlSessionTemplate;
 
-    public PagingResultDto<OutputVATInvoiceInfoDto> queryOutputInvoiceList(QueryOutputDto queryDto) {
-        PagingResultDto<OutputVATInvoiceInfoDto> qResult = new PagingResultDto<>();
-        qResult.setPageInfo(queryDto.getPageInfo());
-        qResult.setList(new ArrayList<>());
-        List<OutputVATInvoiceInfoDto> finalList = getQueryList(queryDto);
-        qResult.getPageInfo().setTotalCount(finalList.size());
-
-        if (finalList.size() > 0) {
-            PagingList pagingList = new PagingList(finalList, qResult.getPageInfo());
-            qResult.setList(pagingList.getPagingList());
-        }
-        return qResult;
+    public PagingResultDto<OutputInvoice> queryOutputInvoiceList(QueryOutputDto queryDto) {
+        return get("", queryDto.getPeriodStart(), queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
     }
 
     private PagingResultDto<OutputInvoice> get(String code, int period, int page, int size) {
@@ -121,7 +109,7 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
             OutputVatInvoiceExample example = new OutputVatInvoiceExample();
             example.createCriteria().andPeriodIdEqualTo(period.intValue());
             dtoResult.setReturnCode(Long.valueOf(outputVATInvoiceMapper.countByExample(example)).intValue());
-        }else {
+        } else {
             dtoResult.setReturnCode(0);
         }
 
@@ -294,7 +282,7 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
     public List<OutputVatInvoiceItem> QueryOutputInvoiceItemList(String invoiceId) {
         OutputVatInvoiceItemExample example = new OutputVatInvoiceItemExample();
         example.createCriteria().andInvoiceIdEqualTo(invoiceId);
-        List<OutputVatInvoiceItem> result=outputVATInvoiceItemMapper.selectByExample(example);
+        List<OutputVatInvoiceItem> result = outputVATInvoiceItemMapper.selectByExample(example);
         result.stream().sorted(Comparator.comparing(OutputVatInvoiceItem::getSeqNo));
         return result;
     }

atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.ctrl.js

@@ -560,14 +560,14 @@
                 columnDefs: [
                  { name: $translate.instant('ImportErrorPopUpNoCol'), width: '7%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
                  { name: $translate.instant('InvoiceQJ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('InvoiceKPRQ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceDate | date:"yyyy-MM-dd"}}<span></div>' },
-                 { name: $translate.instant('InvoiceFPDM'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.invoiceCode}}">{{row.entity.invoiceCode}}</span></div>' },
-                 { name: $translate.instant('InvoiceFPHM'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.invoiceNumber}}">{{row.entity.invoiceNumber}}</span></div>' },
-                 { name: $translate.instant('InvoiceGHFSH'), width: '12%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.sellerTaxNumber}}">{{row.entity.sellerTaxNumber}}</span></div>' },
-                 { name: $translate.instant('InvoiceFPLX'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.sellerTaxName}}">{{grid.appScope.typeToString(row.entity.invoiceType)}}</span></div>' },
-                 { name: $translate.instant('InvoiceJE'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount}}</span></div>' },
-                 { name: $translate.instant('InvoiceSE'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxAmount}}</span></div>' },
-                 { name: $translate.instant('InvoiceRZRQ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certificationDate  | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('InvoiceKPRQ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.kprq | date:"yyyy-MM-dd"}}<span></div>' },
+                 { name: $translate.instant('InvoiceFPDM'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.fpdm}}</span></div>' },
+                 { name: $translate.instant('InvoiceFPHM'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fphm}}</span></div>' },
+                 { name: $translate.instant('InvoiceGHFSH'), width: '12%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.xfsh}}</span></div>' },
+                 { name: $translate.instant('InvoiceFPLX'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{grid.appScope.typeToString(row.entity.fplx)}}</span></div>' },
+                 { name: $translate.instant('InvoiceJE'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.hjje}}</span></div>' },
+                 { name: $translate.instant('InvoiceSE'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.hjse}}</span></div>' },
+                 { name: $translate.instant('InvoiceRZRQ'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzsj  | date:"yyyy-MM-dd"}}</span></div>' },
                  { name: $translate.instant('InvoiceRZJG'), width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certificationResult}}</span></div>' }
                 ],
                 onRegisterApi: function (gridApi) {

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -468,27 +468,27 @@
               },
                {
                    name: $translate.instant('InvoiceDate'), width: '10%',
-                   cellTemplate: '<div class="ui-grid-cell-contents" ><span>{{row.entity.invoiceDate | date:"yyyy-MM-dd"}}</span></div>'
+                   cellTemplate: '<div class="ui-grid-cell-contents" ><span>{{row.entity.kprq | date:"yyyy-MM-dd"}}</span></div>'
                },
                  {
                      name: $translate.instant('InvoiceType'), width: '10%',
-                     cellTemplate: '<div class="ui-grid-cell-contents" title="{{grid.appScope.typeToString(row.entity.invoiceType)}}"><span>{{grid.appScope.typeToString(row.entity.invoiceType)}}<span></div>'
+                     cellTemplate: '<div class="ui-grid-cell-contents" title="{{grid.appScope.typeToString(row.entity.fplxdm)}}"><span>{{grid.appScope.typeToString(row.entity.fplxdm)}}<span></div>'
                  },
               {
                   name: $translate.instant('ClassCode'), width: '10%',
-                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.classCode}}"><span>{{row.entity.classCode}}<span></div>'
+                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.fpdm}}"><span>{{row.entity.fpdm}}<span></div>'
               },
               {
                   name: $translate.instant('InvoiceNumber'), width: '10%',
-                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.invoiceNumber}}"><span>{{row.entity.invoiceNumber}}</span></div>'
+                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.fphm}}"><span>{{row.entity.fphm}}</span></div>'
               },
               {
                   name: $translate.instant('BuyerName'), width: '15%',
-                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.buyerName}}"><span>{{row.entity.buyerName}}</span></div>'
+                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.gfmc}}"><span>{{row.entity.gfmc}}</span></div>'
               },
               {
                   name: $translate.instant('BuyerTaxNumber'), width: '15%',
-                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.buyerTaxNumber}}"><span>{{row.entity.buyerTaxNumber}}</span></div>'
+                  cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.gfsh}}"><span>{{row.entity.gfsh}}</span></div>'
               },
               //{
               //    name: $translate.instant('BankAccount'), width: '10%',
@@ -500,11 +500,11 @@
               //},
            {
                name: $translate.instant('Amount'), width: '8%', headerCellClass: 'right',
-               cellTemplate: '<div class="ui-grid-cell-contents right" title="{{row.entity.amount}}"><span>{{row.entity.amount}}</span></div>'
+               cellTemplate: '<div class="ui-grid-cell-contents right" title="{{row.entity.hjje}}"><span>{{row.entity.hjje}}</span></div>'
            },
             {
                 name: $translate.instant('TaxAmount'), width: '8%', headerCellClass: 'right',
-                cellTemplate: '<div class="ui-grid-cell-contents right"  title="{{row.entity.taxAmount}}"><span>{{row.entity.taxAmount}}</span></div>'
+                cellTemplate: '<div class="ui-grid-cell-contents right"  title="{{row.entity.hjse}}"><span>{{row.entity.hjse}}</span></div>'
             }
         ];