修改列表，添加过滤条件

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxSendMessageMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
+        GROUP BY create_time DESC
     </select>
     
     <select id="selectWxSendMessageById" parameterType="Long" resultMap="WxSendMessageResult">

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/wxmessage/wxmessage.html

@@ -19,6 +19,14 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
+
+                            <li>
+                                <p>种类：</p>
+                                <select name="form" th:with="type=${@dict.getType('wx_send_message_form')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li class="select-time">
                                 <label>创建时间： </label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
@@ -47,6 +55,7 @@
     <script th:inline="javascript">
 
         var successDict = [[${@dict.getType('sys_success')}]];//销售人员等级
+        var messageForm = [[${@dict.getType('wx_send_message_form')}]];
         var prefix = ctx + "wxmessage";
 
 
@@ -68,27 +77,44 @@
                 },
                 {
                     field : 'toUser', 
-                    title : '发送给的用户'
+                    title : '发送给的用户',
+                    width : '100px',
+                    formatter:function (value, row, index) {
+                        // return $.table.tooltip(value,15)
+                        return '<div style="width: 300px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" title='+value+'>'+value+'</div>'
+                    }
                 },
                 {
                     field : 'isSuccess', 
                     title : '是否发送成功',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(successDict, value);
-                    }
+                    },
+                    width : '100px'
                 },
                 {
                     field : 'sendText', 
-                    title : '发送的文本'
+                    title : '发送的文本',
+                    width : '200px'
                 },
+                    {
+                        field : 'form',
+                        title : '种类',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(messageForm, value);
+                        },
+                        width : '100px'
+                    },
                 {
                     field : 'type', 
                     title : '类型',
-                    visible:false
+                    visible:false,
+                    width : '100px'
                 },
                 {
                     field : 'createTime',
-                    title : '创建时间'
+                    title : '创建时间',
+                    width : '150px'
                 },
                 {
                     title: '操作',
@@ -97,7 +123,8 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                         return actions.join('');
-                    }
+                    },
+                    width : '300px'
                 }]
             };
             $.table.init(options);