Browse Source

微信通知

qxp 4 years ago
parent
commit
07c44de918

+ 1 - 1
suishenbang-admin/src/main/resources/application-test.yml

@@ -133,6 +133,6 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接(多个用逗号分隔)
-   excludes: /system/notice/*,/system/config/*
+  excludes: /system/notice/*,/system/config/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*

+ 1 - 1
suishenbang-admin/src/main/resources/templates/appIndex.html

@@ -53,7 +53,7 @@
                         <li><a class="menuItem" th:href="@{/system/main}">了解若依</a></li>
                     </ul>
                 </li>-->
-ff                <li th:each="menu : ${menus}" id="li-menu">
+               <li th:each="menu : ${menus}" id="li-menu">
                 	<a th:class="@{${menu.url != '' && menu.url != '#'} ? ${menu.target}}" th:href="@{${menu.url == ''} ? |#| : ${menu.url}}">
                 		<i class="fa fa-bar-chart-o" th:class="${menu.icon}"></i>
                     	<span class="nav-label" th:text="${menu.menuName}">一级菜单</span> 

+ 1 - 0
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -109,6 +109,7 @@ public class WxController extends ApiBaseController {
         ParameterObject obj =  getParameterObject();
         JSONObject jobj = obj.getJSONObject();
         Set<String> customerCodes = jobj.keySet();
+        logger.info("收到需要通知的经销商组织代码:"+customerCodes.toString());
         Map<String,Map<String,Object>> maps = sysUserService.selectLoginNamesByCostumerCode(customerCodes);
         String temple =configService.selectConfigByKey("wx.notification.time");
         if(customerCodes.size()>0){

+ 3 - 1
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/qywxutils/QyWxSendMessageUtil.java

@@ -67,7 +67,9 @@ public class QyWxSendMessageUtil {
                     QyWxTextMessage qyWxTextMessage = new QyWxTextMessage();
                     qyWxTextMessage.setTouser(maps.get(code).get("touser").toString());
                     wm.setToUser(qyWxTextMessage.getTouser());
-                    qyWxTextMessage.setText(String.format(temple,obj.getString(code),code));
+                    String str = obj.getString(code).split(",").length+"";
+                    String text = String.format(temple,str,code);
+                    qyWxTextMessage.setText(text);
                     wm.setSendText(qyWxTextMessage.getText().getContent());
                     try{
                         sendMessage(qyWxTextMessage);

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

@@ -24,6 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isSuccess != null  and isSuccess != ''"> and is_success = #{isSuccess}</if>
             <if test="sendText != null  and sendText != ''"> and send_text = #{sendText}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
     </select>
     

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

@@ -2,6 +2,8 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('企业微信发送消息历史记录列表')" />
+    <th:block th:include="include :: datetimepicker-css" />
+
 </head>
 <body class="gray-bg">
      <div class="container-div">
@@ -11,16 +13,18 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <p>是否发送成功:</p>
-                                <input type="text" name="isSuccess"/>
-                            </li>
-                            <li>
-                                <p>类型:</p>
-                                <select name="type" th:with="type=${@dict.getType('')}">
+                                <p>是否成功:</p>
+                                <select name="isSuccess" th:with="type=${@dict.getType('sys_success')}">
                                     <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]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -39,10 +43,13 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('wxportal:wxmessage:edit')}]];
+
+        var successDict = [[${@dict.getType('sys_success')}]];//销售人员等级
         var prefix = ctx + "wxmessage";
 
+
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -65,7 +72,10 @@
                 },
                 {
                     field : 'isSuccess', 
-                    title : '是否发送成功'
+                    title : '是否发送成功',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(successDict, value);
+                    }
                 },
                 {
                     field : 'sendText', 
@@ -73,19 +83,30 @@
                 },
                 {
                     field : 'type', 
-                    title : '类型'
+                    title : '类型',
+                    visible:false
                 },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        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('');
                     }
                 }]
             };
             $.table.init(options);
+
+            $('#date').datetimepicker({
+                forceParse: 0,//设置为0,时间不会跳转1899,会显示当前时间。
+                language: 'zh-CN',//显示中文
+                format: 'yyyy-mm-dd',//显示格式
+                minView: "month",//设置只显示到月份
+                initialDate: new Date(),//初始化当前日期
+                autoclose: true,//选中自动关闭
+                todayBtn: true//显示今日按钮
+            })
         });
     </script>
 </body>