merge 档案管理

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-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/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) {
+                    var result="";
+                    if(typeof src == 'string'){
+                        if(src == "待审批"|| src == "审批通过"|| src == "拒绝审批"){
+                            result = src;
+                        }
+                    }else{
+                        if(src == 0){
                             result = $translate.instant('ApprovalStandby');
-                    } else if (src == 1) {
+                        }else if(src == 1){
                             result = $translate.instant('ApprovalPass');
-                    } else if (src == -1) {
+                        }else if(src == -1){
                             result = $translate.instant('ApprovalReject');
-                    } else {
-                        result = "";
+                        }else{
+                            result="";
+                        }
                     }
                     return result;
                 };