fix: 企标计划-筛选条件失效

时间筛选/主起草单位筛选

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESPlanQueryDTO.java

@@ -1,10 +1,12 @@
 package com.jero.modules.laws.enterprise.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -55,15 +57,23 @@ public class ESPlanQueryDTO {
     @ApiModelProperty(value = "制修订类型")
     private String applicationCategory;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "计划报批日期")
     private Date planApprovalStartDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "计划报批日期")
     private Date planApprovalEndDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private Date createStartDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private Date createEndDate;
 

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml

@@ -148,7 +148,7 @@
             </if>
             <!--主起草单位-->
             <if test="param.mainDraftingUnit != null and param.mainDraftingUnit != ''">
-                AND d.depart_name LIKE CONCAT('%',#{param.mainDraftingUnit},'%')
+                AND p.main_drafting_unit = #{param.mainDraftingUnit}
             </if>
             <!--主起草单位负责人-->
             <if test="param.mainDraftingUnitResponsiblePerson != null and param.mainDraftingUnitResponsiblePerson != null">