feat(首页高级检索): 完善

laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java

@@ -54,6 +54,7 @@ import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.tag.entity.LawsTag;
 import com.jero.modules.tag.enums.TableNameEnum;
 import com.jero.modules.tag.service.ILawsTagService;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -1527,10 +1528,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         Map<String, Object> parameterMapByEnterprise = new HashMap<>(parameterMap);
 
         // 显示字段
-        String selectFieldByDomestic = "standard_number, standard_name, null, implementation_date, " +
+        String selectFieldByDomestic = "standard_number, standard_name, null release_date, implementation_date, " +
                 "new_product_impl_date, new_auth_impl_date, standard_state, create_time, 1 resource_type";
         String selectFieldByEnterprise = "standard_number, standard_name, release_date, implementation_date, " +
-                "null, null, standard_state, create_time, 3 resource_type";
+                "null new_product_impl_date, null new_auth_impl_date, standard_state, create_time, 3 resource_type";
 
         // 构建搜索条件
         String orderBy = "order by create_time desc";
@@ -1559,6 +1560,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                     ? STANDARD_STATE : ENTERPRISE_STANDARD_STATE;
             String dictText = sysDictService.queryDictTextByKey(code, standardState);
             data.put("standard_state_dictText", dictText);
+
+            if (!Objects.isNull(data.get("release_date"))){
+                Data releaseDate = (Data) data.get("release_date");
+                data.put("release_date", new SimpleDateFormat(YYYY_MM_DD).format(releaseDate));
+            }
         }
         return Result.OK(advancedSearchAll);
     }