导出

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceJobTimeoutDto.java

@@ -34,7 +34,6 @@ public class EnforceJobTimeoutDto {
     @ApiModelProperty(value = "任务类型:NORMAL-日常检查,SPECIAL-专项检查，REPORT-举报检查,TOWNS-乡镇检查，OTHER-其他,REVIEW-复查,BRIGADE-总队督查）")
     private String jobTypeName;
 
-    @Excel(name = "合格情况")
     @ApiModelProperty(value = "PASS-合格,NOT_PASS:不合格,OVERPASS-不检查")
     private String enforceResult;
 

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/utils/ParamTypeUtil.java

@@ -1,11 +1,14 @@
 package com.zfjg.manage.api.utils;
 
+import com.zfjg.common.core.utils.StringUtils;
+
 /**
  * Created by Administrator on 2024/12/12 0012.
  */
 public class ParamTypeUtil {
     public static String getJobTypeName(String jobType){
         String name = "";
+        if (StringUtils.isNotEmpty(jobType)) {
         switch (jobType) {
             case "OTHER":
                 name="其他";
@@ -31,23 +34,26 @@ public class ParamTypeUtil {
             default:
                 break;
         }
+        }
         return  name;
     }
 
     public static String getEnforceResultName(String enforceResult){
         String name = "";
-        switch (enforceResult) {
-            case "PASS":
-                name="合格";
-                break;
-            case "NOT_PASS":
-                name="不合格";
-                break;
-            case "OVERPASS":
-                name="不检查";
-                break;
-            default:
-                break;
+        if (StringUtils.isNotEmpty(enforceResult)) {
+            switch (enforceResult) {
+                case "PASS":
+                    name="合格";
+                    break;
+                case "NOT_PASS":
+                    name="不合格";
+                    break;
+                case "OVERPASS":
+                    name="不检查";
+                    break;
+                default:
+                    break;
+            }
         }
         return  name;
     }