修改外来标准实施日期为多选，一般检索去掉实施日期排序

2024-09-11 11:03:32 +08:00
parent ce0a40425d
commit 06e591fecf
5 changed files with 26 additions and 27 deletions
@@ -58,7 +58,6 @@
        sort_index DESC,
        standard_type_order ASC,
        standard_state_order ASC,
-        implementation_date DESC,
        create_time DESC
    </select>
    <select id="getCount1" resultType="com.jero.modules.laws.home.vo.LawsHomeNormalSearchCountVO">
@@ -23,7 +23,6 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.document.utils.ReadPdfUtil;
 import com.jero.modules.document.utils.ReadWordUtil;
 import com.jero.modules.laws.common.constant.FieldCommon;
-import com.jero.modules.laws.common.mapper.LawsCommonMapper;
 import com.jero.modules.laws.common.service.ILawsCommonService;
 import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
 import com.jero.modules.laws.home.common.LawsHomeSearchCommon;
@@ -34,8 +33,6 @@ import com.jero.modules.laws.home.mapper.LawsHomeSearchMapper;
 import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService;
 import com.jero.modules.laws.home.service.ILawsHomeSearchService;
 import com.jero.modules.laws.home.vo.*;
-import com.jero.modules.laws.standard.controller.LawsDomesticController;
-import com.jero.modules.laws.standard.controller.LawsEnterpriseController;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.entity.LawsNewsFeed;
@@ -49,7 +46,6 @@ import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.entity.SarFileSplitItemsValEO;
 import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
-import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.tag.entity.LawsTag;
 import com.jero.modules.tag.enums.TableNameEnum;
@@ -113,16 +109,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
    @Resource
    private ILawsTagService lawsTagService;
    @Resource
-    private LawsDomesticController lawsDomesticController;
-    @Resource
-    private LawsEnterpriseController lawsEnterpriseController;
-    @Resource
-    private LawsCommonMapper lawsCommonMapper;
-    @Resource
    private ISysDictService sysDictService;
    @Resource
-    private ISysDictItemService sysDictItemService;
-    @Resource
    private SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper;
    @Resource
    private IDocumentSplitService documentSplitService;
@@ -767,12 +755,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
 //        mDesc44.put(order,"desc");
 //        m33.put("release_date",mDesc44);
 //        sort.add(m33);
-
-        Map<String,Object> m4 = new HashMap<>();
-        Map<String,Object> mDesc4 = new HashMap<>();
-        mDesc4.put(order,"desc");
-        m4.put(IMPLEMENTATION_DATE,mDesc4);
-        sort.add(m4);
+          // 实施日期改成多选，去掉了排序
+//        Map<String,Object> m4 = new HashMap<>();
+//        Map<String,Object> mDesc4 = new HashMap<>();
+//        mDesc4.put(order,"desc");
+//        m4.put(IMPLEMENTATION_DATE,mDesc4);
+//        sort.add(m4);

        Map<String,Object> m5 = new HashMap<>();
        Map<String,Object> mDesc5 = new HashMap<>();
@@ -1223,7 +1211,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                    if(!Objects.isNull(lawsEnterpriseStandard)){
                        lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
                        lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
-                        lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
+                        if(!Objects.isNull(lawsEnterpriseStandard.getImplementationDate())){
+                            lawsHomeNormalSearchExportExcelVO.
+                                    setImplementationDate(new SimpleDateFormat("yyyy-MM-dd").
+                                            format(lawsEnterpriseStandard.getImplementationDate()));
+                        }
                    }
                }
                lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
@@ -1276,7 +1268,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                    if(!Objects.isNull(lawsEnterpriseStandard)){
                        lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
                        lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
-                        lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
+                        if(!Objects.isNull(lawsEnterpriseStandard.getImplementationDate())){
+                            lawsHomeNormalSearchExportExcelVO.setImplementationDate(
+                                    new SimpleDateFormat("yyyy-MM-dd")
+                                            .format(lawsEnterpriseStandard.getImplementationDate()));
+                        }
+
                    }
                }
                lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
@@ -1844,7 +1841,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                        case "7": obj.setStandardStateOrder("2");break;
                        default: obj.setStandardStateOrder("4");break;
                    }
-                    obj.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
+                    if(!Objects.isNull(lawsEnterpriseStandard.getImplementationDate())){
+                        obj.setImplementationDate(new SimpleDateFormat("yyyy-MM-dd")
+                                .format(lawsEnterpriseStandard.getImplementationDate()));
+                    }
                    obj.setCreateTime(lawsEnterpriseStandard.getCreateTime());
                    obj.setReleaseDate(lawsEnterpriseStandard.getReleaseDate());
                    obj.setStandardState(lawsEnterpriseStandard.getStandardState());
@@ -2024,9 +2024,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
        map.put(ENTERPRISE_STANDARD_STATE,"," + (StringUtils.isBlank(obj.getEnterpriseStandardState()) ? "" : obj.getEnterpriseStandardState()) + ",");
        map.put("applicable_market","," + (StringUtils.isBlank(obj.getApplicableMarket()) ? "" : obj.getApplicableMarket()) + ",");
        map.put("release_date",obj.getReleaseDate());
+        map.put(IMPLEMENTATION_DATE,StringUtils.isBlank(obj.getImplementationDate()) ? "" : obj.getImplementationDate());
        // 没有时间 强行加入最早时间
        try {
-            map.put(IMPLEMENTATION_DATE,Objects.isNull(obj.getImplementationDate()) ? new SimpleDateFormat(YYYY_MM_DD).parse("1900-01-01") : obj.getImplementationDate());
            map.put("create_time_c",Objects.isNull(obj.getCreateTime()) ? new SimpleDateFormat(YYYY_MM_DD).parse("1900-01-01") : obj.getCreateTime());
        }catch (Exception e){
            log.error("文档库添加es失败",e);
@@ -41,6 +41,6 @@ public class LawsHomeNormalSearchExportExcelVO implements Serializable {
     * 实施日期
     */
    @ApiModelProperty(value = "实施日期")
-    @Excel(name = "实施日期", width = 20, format = "yyyy-MM-dd")
-    private Date implementationDate;
+    @Excel(name = "实施日期", width = 20)
+    private String implementationDate;
 }
@@ -107,7 +107,7 @@ public class LawsHomeNormalSearchVO implements Serializable {
    @ApiModelProperty(value = "实施日期")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date implementationDate;
+    private String implementationDate;
    /**
     * 入库时间
     */
@@ -98,7 +98,7 @@ public class LawsDomesticStandard implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "实施日期")
-    private java.util.Date implementationDate;
+    private java.lang.String implementationDate;
 	/**在产车实施日期*/
 	@Excel(name = "新认证车实施日期", width = 15)
    @ApiModelProperty(value = "新认证车实施日期")