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

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

@@ -75,12 +75,12 @@ public class OperationLogTaxDocController {
         try {
             Map<String, String> headers = new LinkedHashMap<>();
             headers.put("id", "序号");
+            headers.put("create_time", "操作时间");
             headers.put("operation_action", "操作");
             headers.put("update_state", "操作内容");
             headers.put("operation_user", "操作人员");
-            headers.put("ip", "操作ip");
+//            headers.put("ip", "操作ip");
             headers.put("comment", "备注");
-            headers.put("create_time", "操作时间");
             List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds();
             List<OperationLogTaxDocument> taxDocuments = operationLogTaxDocService.selectListForLog(ids);
             response.setContentType("multipart/form-data");

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

@@ -1070,7 +1070,7 @@ public class DataImportService extends BaseService {
             addDataImportLog(dataImportLogs);
             int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
             if (isSuccess < 1) {
-                return OperationResultDto.error(ErrorMessage.NoData);
+                return OperationResultDto.error(ErrorMessage.ImportNotMatch);
             }
             return OperationResultDto.success();
         } catch (ServiceException e) {
@@ -1740,7 +1740,6 @@ public class DataImportService extends BaseService {
             cpr.setCurrency(getCellStringValue(row.getCell(12)));
             String billNum = getCellStringValue(row.getCell(13));
             cpr.setBillNum(billNum);
-            cpr.setCompanyCode(StringUtils.isNotEmpty(billNum) ? billNum.substring(0, 6) : "");
             cpr.setPaid(getCellBolleanValue(row.getCell(14)));
             cpr.setAmortization(getCellBolleanValue(row.getCell(15)));
             cpr.setPrepayments(getCellBolleanValue(row.getCell(16)));

atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogTaxDocument.java

@@ -97,7 +97,7 @@ public class OperationLogTaxDocument implements Serializable {
      *
      * @mbg.generated
      */
-    @ExcelCell(index=6)
+//    @ExcelCell(index=6)
     private String ip;
 
     /**
@@ -107,7 +107,7 @@ public class OperationLogTaxDocument implements Serializable {
      *
      * @mbg.generated
      */
-    @ExcelCell(index=7)
+    @ExcelCell(index=6)
     private String comment;
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/entity/TaxDocument.java

@@ -316,7 +316,7 @@ public class TaxDocument implements Serializable {
      *
      * @mbg.generated
      */
-    @ExcelCell(index=11,isStatus = "0:未审核,1:审核通过,-1:审核不通过")
+    @ExcelCell(index=11,isStatus = "0:待审核,1:审核通过,-1:审核不通过")
     private Integer auditStatus;
 
     /**

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html

@@ -229,8 +229,11 @@
                 </div>
             </div>
             <div class="modal-footer">
+                <!--                <button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"-->
+                <!--                        ng-disabled="!hasEditPermission">{{'Confirm' | translate }}-->
+                <!--                </button>-->
                 <button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"
-                        ng-disabled="!hasEditPermission">{{'Confirm' | translate }}
+                >{{'Confirm' | translate }}
                 </button>
                 <button type="button" class="btn btn-third" ng-click="cancelAsset()" ng-if="!isDisabled"
                         ng-disabled="isDisabled">{{'ButtonCancel' | translate }}

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js

@@ -2260,15 +2260,21 @@ taxDocumentManageModule.directive('tempModule', function () {
                 };
 
                 $scope.transformAuditStatusToView = function (src) {
-                    var result = $translate.instant('ApprovalStandby');
-                    if (src == 0) {
-                        result = $translate.instant('ApprovalStandby');
-                    } else if (src == 1) {
-                        result = $translate.instant('ApprovalPass');
-                    } else if (src == -1) {
-                        result = $translate.instant('ApprovalReject');
-                    } else {
-                        result = "";
+                    var result="";
+                    if(typeof src == 'string'){
+                        if(src == "待审批"|| src == "审批通过"|| src == "拒绝审批"){
+                            result = src;
+                        }
+                    }else{
+                        if(src == 0){
+                            result = $translate.instant('ApprovalStandby');
+                        }else if(src == 1){
+                            result = $translate.instant('ApprovalPass');
+                        }else if(src == -1){
+                            result = $translate.instant('ApprovalReject');
+                        }else{
+                            result="";
+                        }
                     }
                     return result;
                 };