1 测试-抽查隐患-修改时隐患分类分级编码 回显bug修复。 导出时 标题 错误问题修复。

2 测试专家申报-详情界面 时间显示不正确问题修复。
3 测试专家申报-导出时-燃气种类选多个时 导致导出的都是 燃气种类代码，不是燃气种类名称bug修复

zh-baseversion-common/src/main/java/com/zehong/common/utils/poi/ExcelUtil.java

@@ -1127,6 +1127,28 @@ public class ExcelUtil<T>
      * @throws Exception*/
 
     public static String getDictLabelByTypeAndValue(String value,String dictType) throws Exception {
+        // 20240723 wh 调整 专家申报 燃气种类可以是多个，此类的问题。
+        if (value.contains(",")) {
+            String[] split = value.split(",");
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < split.length; i++) {
+
+                String label = split[i];
+                try {
+                    label = DictUtils.getDictLabelByTypeAndValue(split[i], dictType, split[i]);
+
+                    if (i != split.length - 1) {
+                        sb.append(label).append(",");
+                    } else{
+                        sb.append(label);
+                    }
+                } catch (Exception e) {
+                    throw e;
+                }
+            }
+            return sb.toString();
+        }
+
         String label = value;
         try {
             label = DictUtils.getDictLabelByTypeAndValue(value, dictType, value);
@@ -1134,6 +1156,7 @@ public class ExcelUtil<T>
             throw e;
         }
         return label;
+
     }
 
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsSpotHazardRef.java

@@ -94,7 +94,7 @@ public class TInsSpotHazardRef extends BaseEntity
     private String fBeforePicture;
 
     /** 是否执行：1 是 0 否 */
-    @Excel(name = "是否执行：1 是 0 否",readConverterExp = "1=是,0=否")
+    @Excel(name = "是否执行",readConverterExp = "1=是,0=否")
     private String fIsEnforcement;
 
     /** 备注 */

zh-baseversion-system/src/main/java/com/zehong/system/domain/TProAppInfor.java

 package com.zehong.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 行业专家库-专家申报对象 t_pro_app_infor
  * 
@@ -43,8 +46,9 @@ public class TProAppInfor extends BaseEntity
     private String fSex;
 
     /** 出生日期 */
-    @Excel(name = "出生日期")
-    private String fBirthday;
+    @Excel(name = "出生日期",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date fBirthday;
 
     /** 邮箱 */
     @Excel(name = "邮箱")
@@ -79,8 +83,9 @@ public class TProAppInfor extends BaseEntity
     private String fWorkUnit;
 
     /** 参加工作时间 */
-    @Excel(name = "参加工作时间")
-    private String fWorkTime;
+    @Excel(name = "参加工作时间",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date fWorkTime;
 
     /** 所在部门 */
     @Excel(name = "所在部门")
@@ -233,12 +238,12 @@ public class TProAppInfor extends BaseEntity
     {
         return fSex;
     }
-    public void setfBirthday(String fBirthday) 
+    public void setfBirthday(Date fBirthday)
     {
         this.fBirthday = fBirthday;
     }
 
-    public String getfBirthday() 
+    public Date getfBirthday()
     {
         return fBirthday;
     }
@@ -314,12 +319,12 @@ public class TProAppInfor extends BaseEntity
     {
         return fWorkUnit;
     }
-    public void setfWorkTime(String fWorkTime) 
+    public void setfWorkTime(Date fWorkTime)
     {
         this.fWorkTime = fWorkTime;
     }
 
-    public String getfWorkTime() 
+    public Date getfWorkTime()
     {
         return fWorkTime;
     }

zh-baseversion-web/src/views/specialist/info/components/DetailInfo.vue

@@ -22,13 +22,13 @@
             <span v-else>-</span>
           </el-form-item>
         </el-col>
-
+<!--    没明确含义，先去掉
         <el-col :span="12">
           <el-form-item label="数据限定">
             <span v-if="detailInfo.fDeptCode">{{ detailInfo.fDeptCode }}</span>
             <span v-else>-</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <el-col :span="12">
           <el-form-item label="数据来源">