bug:19303\19295\

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

@@ -25,6 +25,8 @@ import pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam;
 import pwc.taxtech.atms.vat.entity.*;
 
 import java.io.StringReader;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 
 import static pwc.taxtech.atms.constant.Constant.INPUT_RZJG_SUCCESS;
@@ -61,6 +63,12 @@ public class InputInvoiceDataImportServiceImpl {
 
         PageHelper.startPage(paras.getPageInfo().getPageIndex(), paras.getPageInfo().getPageSize());
         List<InputInvoice> invoices = inputInvoiceMapper.selectByExample(invoiceExample);
+        DecimalFormat df = new DecimalFormat("#,###.00");
+        invoices.stream().forEach(x -> {
+            x.setHJJE(df.format(new BigDecimal(x.getHJJE())));
+            x.setHJSE(df.format(new BigDecimal(x.getHJSE())));
+                }
+        );
         PageInfo<InputInvoice> pageInfo = new PageInfo<>(invoices);
         return pageInfo;
     }
@@ -91,8 +99,9 @@ public class InputInvoiceDataImportServiceImpl {
     }
 
     public List<InputInvoiceDetail> getInputInvoiceItemList(String fpid) {
+        InputInvoice inputInvoice = inputInvoiceMapper.selectByPrimaryKey(fpid);
         InputInvoiceDetailExample example = new InputInvoiceDetailExample();
-        example.createCriteria().andFPIDEqualTo(fpid);
+        example.createCriteria().andFPHMEqualTo(inputInvoice.getFPHM());
         return inputInvoiceDetailMapper.selectByExample(example);
     }
 

atms-web/src/main/webapp/app/common/controls/org-multi-selector/org-multi-selector.js

@@ -35,7 +35,7 @@
                             scope.selectedNames += provinceMap[id].name + ',';
                         }
                     });
-                    scope.selectedNames = scope.selectedNames.substring(0, scope.selectedNames.length - 2);
+                    scope.selectedNames = scope.selectedNames.substring(0, scope.selectedNames.length - 1);
                 }
 
                 (function () {

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

@@ -565,8 +565,8 @@
                  { 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('InvoiceJE'), headerCellClass:'toRight', width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.hjje}}</span></div>' },
+                 { name: $translate.instant('InvoiceSE'), headerCellClass:'toRight', width: '10.5%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{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>' }
                 ],
@@ -585,9 +585,9 @@
                                                columnDefs: [
                                                { name: $translate.instant('ImportErrorPopUpNoCol'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
                                                { name: $translate.instant('InvoiceHWMC'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.spmc}}">{{row.entity.spmc}}<span></div>' },
-                                               { name: $translate.instant('InvoiceJE'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.je}}<span></div>' },
+                                               { name: $translate.instant('InvoiceJE'), headerCellClass:'toRight', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.je}}<span></div>' },
                                                { name: $translate.instant('InvoiceSL'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.slv}}%<span></div>' },
-                                               { name: $translate.instant('InvoiceSE'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.se}}<span></div>' }
+                                               { name: $translate.instant('InvoiceSE'), headerCellClass:'toRight', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.se}}<span></div>' }
                                                ]
                                            };
 

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

@@ -43,4 +43,9 @@
             </div>
         </div>
     </div>
+    <style>
+        .toRight{
+            text-align: right;
+        }
+    </style>
 </div>