Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/common/ThousandConvert.java

+package pwc.taxtech.atms.common;
+
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * author kevin
+ * target ： Solve ThousandConvert
+ * version 1.0
+ */
+public class ThousandConvert extends JsonSerializer<BigDecimal> {
+
+    @Override
+    public void serialize(BigDecimal value, JsonGenerator jgen, SerializerProvider arg2)
+            throws IOException {
+        jgen.writeString(NumberFormat.getIntegerInstance(Locale.getDefault()).format(value));
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisTaxDto.java

 package pwc.taxtech.atms.dto.analysis;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.ThousandConvert;
+
 import java.math.BigDecimal;
 
 /**
@@ -11,16 +14,17 @@ public class AnalysisTaxDto {
 
     private String companyName;
 
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment1;
-
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment2;
-
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment3;
-
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment4;
-
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment5;
-
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment6;
 
     public String getCompanyName() {

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

@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -197,18 +198,19 @@ public class AnalysisServiceImpl extends BaseService {
     }
 
     public OperationResultDto importDomesitcExcelFile(MultipartFile file, String periodDate, Integer type) {
+        StringBuilder notOrgMatch = new StringBuilder();
         switch (type) {
             case 0:
-                importAnalysisTaxExcelFile(file, periodDate);
+                notOrgMatch = importAnalysisTaxExcelFile(file, periodDate);
                 break;
             case 1:
-                importAnalysisReturnTaxExcelFile(file, periodDate);
+                notOrgMatch = importAnalysisReturnTaxExcelFile(file, periodDate);
                 break;
             case 2:
                 importAnalysisGMVSubsidyExcelFile(file, periodDate);
                 break;
             case 3:
-                importAnalysisEmployeeNumExcelFile(file, periodDate);
+                notOrgMatch = importAnalysisEmployeeNumExcelFile(file, periodDate);
                 break;
             case 4:
                 importAnalysisDriverNumExcelFile(file, periodDate);
@@ -216,7 +218,7 @@ public class AnalysisServiceImpl extends BaseService {
             default:
                 break;
         }
-        return OperationResultDto.success();
+        return OperationResultDto.success(notOrgMatch);
     }
 
     public OperationResultDto importInterNationalExcelFile(MultipartFile file, String periodDate, Integer type,
@@ -237,7 +239,9 @@ public class AnalysisServiceImpl extends BaseService {
     private String[] headerArr = null;
 
 
-    private void importAnalysisTaxExcelFile(MultipartFile file, String periodDate) {
+    private StringBuilder importAnalysisTaxExcelFile(MultipartFile file, String periodDate) {
+        StringBuilder notMatchOrg = new StringBuilder();
+        List orgNotList = Lists.newArrayList();
         try {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
@@ -263,7 +267,8 @@ public class AnalysisServiceImpl extends BaseService {
                     example.createCriteria().andNameEqualTo(companyName);
                     List<Organization> orgs = organizationMapper.selectByExample(example);
                     if (orgs.isEmpty()) {
-                        break;
+                        orgNotList.add(j + 1);
+                        continue;
                     }
                     for (int k = 1; k < sheet.getRow(0).getLastCellNum(); k++) {
                         AnalysisTax model = getAnalysisTax(selectedPer, sheet, k, j, orgs.get(0));
@@ -284,6 +289,7 @@ public class AnalysisServiceImpl extends BaseService {
         } catch (Exception e) {
             throw new ServiceException(e);
         }
+        return notMatchOrg.append(orgNotList + "机构匹配失败");
     }
 
     private AnalysisTax getAnalysisTax(Integer period, Sheet sheet, int k, int j, Organization org) {
@@ -326,7 +332,9 @@ public class AnalysisServiceImpl extends BaseService {
     }
 
 
-    private void importAnalysisReturnTaxExcelFile(MultipartFile file, String periodDate) {
+    private StringBuilder importAnalysisReturnTaxExcelFile(MultipartFile file, String periodDate) {
+        StringBuilder notMatchOrg = new StringBuilder();
+        List orgNotList = Lists.newArrayList();
         try {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
@@ -351,7 +359,8 @@ public class AnalysisServiceImpl extends BaseService {
                     example.createCriteria().andNameEqualTo(companyName);
                     List<Organization> orgs = organizationMapper.selectByExample(example);
                     if (orgs.isEmpty()) {
-                        break;
+                        orgNotList.add(j + 1);
+                        continue;
                     }
                     for (int k = 1; k < sheet.getRow(0).getLastCellNum(); k++) {
                         AnalysisActualTaxReturn model = getAnalysisActualTaxReturn(selectedPer, sheet, k, j, orgs.get(0));
@@ -373,6 +382,7 @@ public class AnalysisServiceImpl extends BaseService {
         } catch (Exception e) {
             throw new ServiceException(e);
         }
+        return notMatchOrg.append(orgNotList + "行匹配失败");
     }
 
     private AnalysisActualTaxReturn getAnalysisActualTaxReturn(Integer period, Sheet sheet, int k, int j, Organization org) {
@@ -387,7 +397,9 @@ public class AnalysisServiceImpl extends BaseService {
         return model;
     }
 
-    private void importAnalysisEmployeeNumExcelFile(MultipartFile file, String periodDate) {
+    private StringBuilder importAnalysisEmployeeNumExcelFile(MultipartFile file, String periodDate) {
+        StringBuilder notMatchOrg = new StringBuilder();
+        List orgNotList = Lists.newArrayList();
         try {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
@@ -409,7 +421,17 @@ public class AnalysisServiceImpl extends BaseService {
                     if (null == cell1 || StringUtils.isEmpty(getCellStringValue(cell1))) {
                         continue;
                     }
-                    model.setCompanyName(getCellStringValue(sheet.getRow(j).getCell(0)));
+
+                    //进行机构验证
+                    String companyName = getCellStringValue(sheet.getRow(j).getCell(0));
+                    OrganizationExample example1 = new OrganizationExample();
+                    example1.createCriteria().andNameEqualTo(companyName);
+                    List<Organization> orgs = organizationMapper.selectByExample(example1);
+                    if (orgs.isEmpty()) {
+                        orgNotList.add(j + 1);
+                        continue;
+                    }
+                    model.setCompanyName(companyName);
                     try {
                         model.setSeqNo(getSeqNoByPeriod(getOrgByCompanyName(getCellStringValue(sheet.getRow(j).getCell(0))).getId(), selectedPer));
                     } catch (Exception e) {
@@ -447,9 +469,11 @@ public class AnalysisServiceImpl extends BaseService {
             e.printStackTrace();
             throw new ServiceException(e);
         }
+        return notMatchOrg.append(orgNotList + "行匹配失败");
     }
 
     private void importAnalysisGMVSubsidyExcelFile(MultipartFile file, String periodDate) {
+
         try {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
@@ -719,7 +743,6 @@ public class AnalysisServiceImpl extends BaseService {
     public HttpServletResponse downloadDomesticFile(HttpServletResponse response, AnalysisDomesticlParam param, String fileName) {
         String excelTemplatePathInClassPath = EnumAnalysisExpTempPath.getPath(param.getType());
         List<Object> datas = displayAnalysisImportData(param);
-
         try {
             if (datas.size() < 1) {
                 throw new Exception("无可导出的数据");

atms-orangeheap/src/components/Mine.vue

@@ -9,7 +9,7 @@
                                 class="mx-auto d-block"
                                 size="130"
                         >
-                            <img src="https://demos.creative-tim.com/vue-material-dashboard/img/marc.aba54d65.jpg">
+                            <img src="../assets/dts-mine.png">
                         </v-avatar>
                         <v-card-text class="text-xs-center">
                             <h6 class="category text-gray font-weight-thin mb-9"></h6>

atms-orangeheap/src/components/Panel.vue

@@ -50,6 +50,7 @@
                 clipped-right
                 height="90"
                 color="#ffffff"
+                style="border-bottom: 1px solid #dddddd"
         >
             <!--<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
             <v-toolbar-title></v-toolbar-title>
@@ -60,7 +61,7 @@
             >
                 <svg class="icon" aria-hidden="true" ><use
                         :xlink:href="selectedItem.iconName"></use></svg>
-                <span style="vertical-align: middle; margin-left: 10px; font-size:27px" v-text="selectedItem.title"></span>
+                <span style="vertical-align: middle; margin-left: 10px;font-weight:normal; font-size:26px" v-text="selectedItem.title"></span>
                 <v-icon style="vertical-align: middle;margin-top:5px;float:right;height:28px;width:28px;color:#333333;">menu</v-icon>
             </span>
 

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

@@ -780,6 +780,7 @@
     "ImportShipmentList": "导入发车清单",
     "ImportShipmentListGd": "导入发车清单-GD",
     "ImportSuccess": "导入成功",
+    "ImportSuccessCount": "导入成功,验证失败:",
     "ImportTrialBalance": "导入试算平衡表",
     "ImportTypeTip": "需要清除本月导入的财务数据，是否确认？",
     "Import_AccountMapping": "科目对应",

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

@@ -71,7 +71,9 @@
                 </div>
             </div>
         </form>
-      
+        <div id="progress">
+            <div id="progressBarStatus" dx-progress-bar="progressBarOptions"></div>
+        </div>
         <div class="dt-init-wrapper">
             <div class="dx-viewport grid-container">
                 <div id="taxGridContainer" dx-data-grid="taxGridOptions"

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

@@ -206,6 +206,7 @@
                 withCredentials: true
             }).then(function (resp) {
                 var ret = resp.data;
+                $scope.fileName = '';
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {
@@ -640,6 +641,7 @@
             $scope.selectType = i.type;
             $scope.showInternationalBUDataGrid = false;
             $scope.showInternationalTaxDataGrid = false;
+            $scope.fileName='';
             switch (i.code) {
                 case 100:
                     $scope.showInternationalBUDataGrid = true;

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -171,7 +171,7 @@
                 __RequestVerificationToken: token,
                 withCredentials: true
             }).then(function(data) {
-                    $scope.fileName='';
+                    $scope.fileNameShow=false;
                     $('#busy-indicator-container').hide();
                     var resp = data.data;
                     deferred.resolve();

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -42,7 +42,7 @@
                             <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                         </div>
                     </div>
-                    <div ng-show="fileName" style="display:inline-block">
+                    <div ng-show="fileNameShow" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <div class="form-group">

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

@@ -192,6 +192,7 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js

@@ -210,7 +210,6 @@
                     vatOperationLogService.addOperationLog(logDto);
                 }
                 getImportRLITStatus();
-
             }, function(resp) {
                 deferred.resolve();
                 if (resp.statusText === 'HttpRequestValidationException') {

atms-web/src/main/webapp/app/common/controls/vat-report-sheet/vat-report-sheet.js

@@ -133,7 +133,6 @@
 
                     //todo:注册之后这里去掉注释
                     //var sheet = spread.getActiveSheet();
-
                     var sheet;
                     if (constant.regesterInformation.active) {
                         sheet = spread.getActiveSheet();

atms-web/src/main/webapp/app/common/utils/pwc-util.js

@@ -1234,6 +1234,5 @@
             _.extend(scope.selectOrgOptions, exp);
     };
 
-
     /*-----------------------------------------------------------------------------------------*/
 })(window)
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/css/app.8f5ac7e7.css

-.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-0817fb63]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}.color_active{color:red!important}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/css/app.e87f05ce.css

+.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-579027fe]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/index.html

@@ -49,4 +49,4 @@
         //send 发送
         xmlhttp.send();
 
-      }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.8f5ac7e7.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.cf3691a6.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.8f5ac7e7.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.cf3691a6.js></script></body></html>
+      }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.e87f05ce.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.6ae9ce65.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.e87f05ce.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.6ae9ce65.js></script></body></html>
\ No newline at end of file