Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java

@@ -49,9 +49,9 @@ public class DcBoardReleaseLog extends BaseEntity
     @ApiModelProperty(value="发布内容")
     private String releaseContent;
 
-    /** 发布状态（0：成功；1：失败） */
-    @Excel(name = "发布状态", readConverterExp = "0=成功,1失败")
-    @ApiModelProperty(value="发布状态0=：成功；1：失败")
+    /** 发布状态（0：失败；1：成功） */
+    @Excel(name = "发布状态", readConverterExp = "0=失败,1成功")
+    @ApiModelProperty(value="发布状态0=：失败；1：成功")
     private String releaseStatus;
 
     /** 发布时间 */
@@ -60,6 +60,14 @@ public class DcBoardReleaseLog extends BaseEntity
     @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releaseTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="范围查询-开始时间")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="范围查询-结束时间")
+    private Date endTime;
+
     /** 发布机构 */
     @Excel(name = "发布机构")
     @ApiModelProperty(value="发布机构")
@@ -161,7 +169,24 @@ public class DcBoardReleaseLog extends BaseEntity
     {
         return releaseTime;
     }
-    public void setReleaseDeptName(String releaseDeptName) 
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public void setReleaseDeptName(String releaseDeptName)
     {
         this.releaseDeptName = releaseDeptName;
     }

zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml

@@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="releaseContent != null  and releaseContent != ''"> and t1.release_content = #{releaseContent}</if>
             <if test="releaseStatus != null  and releaseStatus != ''"> and t1.release_status = #{releaseStatus}</if>
             <if test="releaseTime != null "> and t1.release_time = #{releaseTime}</if>
+            <if test="startTime != null"> and date_format(t1.release_time,'%Y-%m-%d %H:%i:%s') >= date_format(#{startTime},'%Y-%m-%d %H:%i:%s')</if>
+            <if test="endTime != null"> and date_format(t1.release_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')</if>
             <if test="releaseDeptName != null  and releaseDeptName != ''"> and t1.release_dept_name like concat('%', #{releaseDeptName}, '%')</if>
             <if test="releaseDeptId != null  and releaseDeptId != ''"> and t1.release_dept_id = #{releaseDeptId}</if>
             <if test="releaseUserName != null  and releaseUserName != ''"> and t1.release_user_name like concat('%', #{releaseUserName}, '%')</if>