Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_mysql

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java

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

@@ -19,6 +19,9 @@ public class DataImportErrorDto {
     @JSONField(name="开票金额")
     private String amount;
 
+    @JSONField(name="开票日期")
+    private String openDate;
+
 
     @JSONField(name="确认/认证日期")
     private String confirmTime;
@@ -27,6 +30,14 @@ public class DataImportErrorDto {
     @JSONField(name="Sheet")
     private Integer sheet;
 
+    public String getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(String openDate) {
+        this.openDate = openDate;
+    }
+
     public Integer getSheet() {
         return sheet;
     }

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

@@ -322,6 +322,8 @@ public class AnalysisServiceImpl extends BaseService {
         return null;
     }
 
+
+
     public Organization getOrgByCompanyName(String companyName) {
         OrganizationExample organizationExample = new OrganizationExample();
         organizationExample.createCriteria().andNameEqualTo(companyName);
@@ -649,6 +651,7 @@ public class AnalysisServiceImpl extends BaseService {
                         continue;
                     }
                     model.setGmv(getCellBigDecimalValue(cell1));
+                    model.setCompanyName(getOrgById(organizationId).getName());
                     model.setTrips(getCellBigDecimalValue(sheet.getRow(j).getCell(1)));
                     model.setSubsidyB(getCellBigDecimalValue(sheet.getRow(j).getCell(2)));
                     model.setSubsidyC(getCellBigDecimalValue(sheet.getRow(j).getCell(3)));
@@ -682,11 +685,11 @@ public class AnalysisServiceImpl extends BaseService {
         List<Object> objects = new ArrayList<>();
         Integer period = DateUtils.strToPeriod(param.getPeriod());
         String country = param.getCountry();
-        String companyName = param.getCompanyName();
+        String organizationId = param.getCompanyName();
         switch (param.getType()) {
             case 100:
                 AnalysisInternationalBusinessDataExample analysisInternationalBusinessDataExample = new AnalysisInternationalBusinessDataExample();
-                analysisInternationalBusinessDataExample.createCriteria().andPeriodEqualTo(period).andCompanyNameEqualTo(companyName).andCountryEqualTo(country);
+                analysisInternationalBusinessDataExample.createCriteria().andPeriodEqualTo(period).andOrganizationIdEqualTo(organizationId).andCountryEqualTo(country);
                 List<AnalysisInternationalBusinessData> list = analysisInternationalBusinessDataMapper.selectByExample(analysisInternationalBusinessDataExample);
 
                 /*List<AnalysisInternationalBUDataDto> dtos = Lists.newArrayList();
@@ -726,7 +729,7 @@ public class AnalysisServiceImpl extends BaseService {
                 return objects;
             case 101:
                 AnalysisInternationalTaxDataExample analysisInternationalTaxDataExample = new AnalysisInternationalTaxDataExample();
-                analysisInternationalTaxDataExample.createCriteria().andPeriodEqualTo(period).andCompanyNameEqualTo(companyName).andCountryEqualTo(country);
+                analysisInternationalTaxDataExample.createCriteria().andPeriodEqualTo(period).andOrganizationIdEqualTo(organizationId).andCountryEqualTo(country);
                 List<AnalysisInternationalTaxData> list2 = analysisInternationalTaxDataMapper.selectByExample(analysisInternationalTaxDataExample);
                 List<AnalysisInternationalTaxDataDto> dtos2 = Lists.newArrayList();
                 list2.forEach(l2 -> {

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -1215,7 +1215,7 @@
     "ImportNotMatch" : "导入文件与选择机构或期间不匹配",
     "ProjectDescription": "项目描述",
     "ProductDescription": "产品描述",
-    "Company":"公司间",
+    "Company":"公司",
     "CompanyDescription": "公司间描述",
     "Segment1":"备用段",
     "Segment1Description": "备用段描述",

atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js

@@ -243,6 +243,7 @@
             }).success(function(resp) {
                 var ret = resp.data;
                 $scope.fileName= '';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 uploadAfter();

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js

@@ -207,6 +207,7 @@
             }).then(function (resp) {
                 var ret = resp.data;
                 $scope.fileName = '';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {
@@ -540,9 +541,9 @@
 
 
         var setButtonWrapStyle = function () {
-            if ($scope.fileName) {
+           /* if ($scope.fileName) {
                 return {width: "100%"};
-            }
+            }*/
         };
 
         var setGridStyle = function () {

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html

@@ -49,7 +49,7 @@
                                 ng-click="downloadTemplate()"></button>
 
                         <button type="button"
-                                class="btn btn-vat-primary" style=""
+                                class="btn btn-vat-primary"
                                 translate="ImportBtn"
                                 ng-click="doUpload()"></button>
 
@@ -61,7 +61,7 @@
 
                     </div>
                     <div class="row" style="margin-top: 10px;">
-                        <span class="text-bold" translate="Country">:</span>
+                        <span class="text-bold" translate="Country"><span>:</span></span>
                        <!-- <div class="dropdown" style="margin-left:10px">
                             <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3"
                                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 150px;margin-left: 28px;">
@@ -90,7 +90,7 @@
                                 data-none-results-text ="没有匹配的国家">
                         </select>
 
-                        <span class="text-bold" translate="Company">:</span>
+                        <span class="text-bold" translate="Company"><span>:</span></span>
                         <!--<div dx-tag-box="selectOrgOptionsComany" style="width: 287px;display: inline-block"></div>-->
                         <select class="selectpicker  show-tick  dropup" multiple  data-live-search="true"
                                 data-width="auto"  data-max-options="1"