Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+public class DataImportErrorDto {
+    @JSONField(name="行号")
+    private Integer cellLine;
+    @JSONField(name="发票类型" )
+    private String invoiceType;
+    @JSONField(name="开票内容")
+    private String invoiceDetail;
+    @JSONField(name="开票主体")
+    private String org;
+    @JSONField(name="税率")
+    private String taxRate;
+    @JSONField(name="税额")
+    private String amountRate;
+    @JSONField(name="开票金额")
+    private String amount;
+
+
+    @JSONField(name="确认/认证日期")
+    private String confirmTime;
+    @JSONField(name="金额")
+    private String cilAmount;
+    @JSONField(name="Sheet")
+    private Integer sheet;
+
+    public Integer getSheet() {
+        return sheet;
+    }
+
+    public void setSheet(Integer sheet) {
+        this.sheet = sheet;
+    }
+
+    public String getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(String confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
+    public String getCilAmount() {
+        return cilAmount;
+    }
+
+    public void setCilAmount(String cilAmount) {
+        this.cilAmount = cilAmount;
+    }
+
+    public Integer getCellLine() {
+        return cellLine;
+    }
+
+    public void setCellLine(Integer cellLine) {
+        this.cellLine = cellLine;
+    }
+
+    public String getInvoiceType() {
+        return invoiceType;
+    }
+
+    public void setInvoiceType(String invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+
+    public String getInvoiceDetail() {
+        return invoiceDetail;
+    }
+
+    public void setInvoiceDetail(String invoiceDetail) {
+        this.invoiceDetail = invoiceDetail;
+    }
+
+    public String getOrg() {
+        return org;
+    }
+
+    public void setOrg(String org) {
+        this.org = org;
+    }
+
+    public String getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(String taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public String getAmountRate() {
+        return amountRate;
+    }
+
+    public void setAmountRate(String amountRate) {
+        this.amountRate = amountRate;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+}

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import java.util.List;
+
+public class DataImportResponseDto<T> {
+    private List<DataImportErrorDto> dataImportErrorDtos;
+    private List<T> objectList;
+
+    public List<DataImportErrorDto> getDataImportErrorDtos() {
+        return dataImportErrorDtos;
+    }
+
+    public void setDataImportErrorDtos(List<DataImportErrorDto> dataImportErrorDtos) {
+        this.dataImportErrorDtos = dataImportErrorDtos;
+    }
+
+    public List<T> getObjectList() {
+        return objectList;
+    }
+
+    public void setObjectList(List<T> objectList) {
+        this.objectList = objectList;
+    }
+}

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -2150,7 +2150,6 @@
             // TODO 将这个方法添加到切换功能里
             $scope.updateOrgExtraCancel = function () {
                 $scope.selectCompanyExtra = $scope.comExtraOldData;
-                $scope.selectCompanyExtra.unifiedSocialCreditCode = $scope.selectCompany.taxPayerNumber;
                 $scope.editOrgExtraModel = $scope.editOldData;
                 generalSelectCompanyExtraText();
                 cancelWebChange();

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js

@@ -190,7 +190,12 @@
                 if (ret.result) {
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
-                    SweetAlert.success($translate.instant('ImportSuccess'));
+                    if(ret.resultMsg){
+                        swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
+                        //SweetAlert.warning(ret.resultMsg);
+                    }else{
+                        SweetAlert.success($translate.instant('ImportSuccess'));
+                    }
                 } else {
                     if (ret.resultMsg && ret.resultMsg.length > 0) {
                         SweetAlert.warning($translate.instant(ret.resultMsg));

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js

@@ -197,7 +197,12 @@
                 if (ret.result) {
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
-                    SweetAlert.success($translate.instant('ImportSuccess'));
+                    if(ret.resultMsg){
+                        swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
+                        //SweetAlert.warning(ret.resultMsg);
+                    }else{
+                        SweetAlert.success($translate.instant('ImportSuccess'));
+                    }
                     $scope.fileNameShow = false;
                 } else {
                     if (ret.resultMsg && ret.resultMsg.length > 0) {