合伙招商后台

ruoyi-system/src/main/java/com/ruoyi/system/domain/PartnerFeedbackInfo.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 反馈列表对象 partner_feedback_info
  * 
@@ -54,6 +56,11 @@ public class PartnerFeedbackInfo extends BaseEntity
     @Excel(name = "状态(1-提交；2-处理)")
     private Integer status;
 
+    @Excel(name = "更新时间")
+    private Date updateTime;
+    @Excel(name = "提交时间")
+    private Date createTime;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -145,6 +152,26 @@ public class PartnerFeedbackInfo extends BaseEntity
         return status;
     }
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/resources/mapper/feedbackInfo/PartnerFeedbackInfoMapper.xml

@@ -35,6 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispContent != null  and dispContent != ''"> and disp_content = #{dispContent}</if>
             <if test="dispUserName != null  and dispUserName != ''"> and disp_user_name like concat('%', #{dispUserName}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="params.beginSubmitTime != null and params.beginSubmitTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginSubmitTime},'%y%m%d')
+            </if>
+            <if test="params.endSubmitTime != null and params.endSubmitTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endSubmitTime},'%y%m%d')
+            </if>
         </where>
     </select>
     

ruoyi-system/src/main/resources/templates/feedbackInfo/info/info.html

@@ -18,6 +18,12 @@
                                 <label>用户名称：</label>
                                 <input type="text" name="userName"/>
                             </li>
+                            <li>
+                                <label>提交时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="提交开始时间" name="params[beginSubmitTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="提交结束时间" name="params[endSubmitTime]"/>
+                            </li>
 <!--                            <li>-->
 <!--                                <label>职务：</label>-->
 <!--                                <input type="text" name="position"/>-->
@@ -92,10 +98,10 @@
                     field: 'userName',
                     title: '用户名称'
                 },
-                // {
-                //     field: 'position',
-                //     title: '职务'
-                // },
+                {
+                    field: 'position',
+                    title: '职务'
+                },
                 // {
                 //     field: 'infoSource',
                 //     title: '信息来源'
@@ -121,8 +127,8 @@
                 //     title: '状态(1-提交；2-处理)'
                 // },
                 {
-                    field: 'status',
-                    title: '状态(1-提交；2-处理)'
+                    field: 'createTime',
+                    title: '提交时间'
                 },
                 {
                     title: '操作',