....

src/main/java/com/nbclass/activity/controller/ContentController.java

@@ -9,12 +9,14 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
 import com.nbclass.activity.model.*;
+import com.nbclass.activity.service.CommentService;
 import com.nbclass.activity.service.DataDictService;
 import com.nbclass.exception.ParameterException;
 import com.nbclass.system.service.UserService;
 import com.nbclass.util.JWTUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -61,6 +63,9 @@ public class ContentController extends BaseController {
     @Resource
     private DataDictService dataDictService;
 
+    @Autowired
+    private CommentService commentService;
+
     /**
      * 案例页面
      * @param model
@@ -543,4 +548,31 @@ public class ContentController extends BaseController {
         return Result.success(map);
     }
 
+    /**
+     * 标签、索引反馈日志列表
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getLabelLogger")
+    @ResponseBody
+    public PageResultVo getLabelLogger(Integer page,Integer pageSize,Integer id){
+        PageHelper.startPage(page,pageSize);
+        List<LabelLogger> list = commentService.getLabelLogger(id);
+        PageInfo<LabelLogger> pageInfo = new PageInfo<>(list);
+        return ResultUtil.table(list,pageInfo.getTotal());
+    }
+
+    /**
+     * 标签、索引反馈日志状态更新
+     * @param id
+     * @return
+     */
+    @PostMapping("/updateLogger")
+    @ResponseBody
+    public Result updateLogger(Integer id,Integer status){
+        commentService.updateLogger(id,status);
+        return Result.success();
+    }
+
 }

src/main/java/com/nbclass/activity/controller/casesfirst/CommentController.java

@@ -184,21 +184,6 @@ public class CommentController {
         return Result.success();
     }
 
-    /**
-     * 标签、索引反馈日志列表
-     * @param request
-     * @param page
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/getLabelLogger")
-    public Result getLabelLogger(HttpServletRequest request,Integer page,Integer pageSize){
-        String token = request.getHeader("token");
-        String userId = JWTUtils.getUserId(token);
-        PageInfo<LabelLogger> list = commentService.getLabelLogger(page,pageSize,Long.parseLong(userId));
-        return Result.success(list);
-    }
-
     /**
      * 新建文件夹
      * @param favoritesFolder

src/main/java/com/nbclass/activity/mapper/CommentMapper.java

@@ -198,10 +198,9 @@ public interface CommentMapper {
 
     /**
      * 标签、索引反馈日志列表
-     * @param userId
      * @return
      */
-    List<LabelLogger> getLabelLogger(Long userId);
+    List<LabelLogger> getLabelLogger(Integer id);
 
     /**
      * 案例打分
@@ -209,4 +208,11 @@ public interface CommentMapper {
      */
     void saveScoring(Scoring scoring);
 
+    /**
+     * 标签、索引反馈日志状态更新
+     * @param id
+     * @param status
+     */
+    void updateLogger(@Param("id") Integer id,
+                      @Param("status") Integer status);
 }

src/main/java/com/nbclass/activity/mapper/WxUserMapper.java

@@ -50,4 +50,10 @@ public interface WxUserMapper extends MyMapper<WxUser> {
 	 */
 	public void delOtherUsers(@Param("userids")List<String> userids);
 
+	/**
+	 * 获取企业微信头像
+	 * @param username
+	 * @return
+	 */
+    String getNickname(String username);
 }

src/main/java/com/nbclass/activity/model/LabelLogger.java

@@ -45,10 +45,5 @@ public class LabelLogger implements Serializable {
      */
     private String name;
 
-    /**
-     * 案例名称
-     */
-    private String contentName;
-
 }
 

src/main/java/com/nbclass/activity/service/CommentService.java

@@ -3,6 +3,8 @@ package com.nbclass.activity.service;
 import com.github.pagehelper.PageInfo;
 import com.nbclass.activity.model.*;
 
+import java.util.List;
+
 public interface CommentService {
 
     /**
@@ -193,11 +195,9 @@ public interface CommentService {
 
     /**
      * 标签、索引反馈日志列表
-     * @param page
-     * @param pageSize
      * @return
      */
-    PageInfo<LabelLogger> getLabelLogger(Integer page, Integer pageSize, Long userId);
+    List<LabelLogger> getLabelLogger(Integer id);
 
     /**
      * 案例打分
@@ -205,4 +205,9 @@ public interface CommentService {
      */
     void saveScoring(Scoring scoring);
 
+    /**
+     * 标签、索引反馈日志状态更新
+     * @param id
+     */
+    void updateLogger(Integer id,Integer status);
 }

src/main/java/com/nbclass/activity/service/WxUserService.java

@@ -27,4 +27,10 @@ public interface WxUserService{
 	 */
 	public void syncWxDepartment();
 
+	/**
+	 * 获取企业微信头像
+	 * @param username
+	 * @return
+	 */
+    String getNickname(String username);
 }

src/main/java/com/nbclass/activity/service/impl/CommentServiceImpl.java

@@ -164,10 +164,8 @@ public class CommentServiceImpl implements CommentService {
     }
 
     @Override
-    public PageInfo<LabelLogger> getLabelLogger(Integer page, Integer pageSize, Long userId) {
+    public List<LabelLogger> getLabelLogger(Integer id) {
-        PageHelper.startPage(page,pageSize);
+        return commentMapper.getLabelLogger(id);
-        List<LabelLogger> list = commentMapper.getLabelLogger(userId);
-        return new PageInfo<>(list);
     }
 
     @Override
@@ -175,4 +173,9 @@ public class CommentServiceImpl implements CommentService {
         commentMapper.saveScoring(scoring);
     }
 
+    @Override
+    public void updateLogger(Integer id, Integer status) {
+        commentMapper.updateLogger(id,status);
+    }
+
 }

src/main/java/com/nbclass/activity/service/impl/WxUserServiceImpl.java

@@ -136,6 +136,11 @@ public class WxUserServiceImpl implements WxUserService {
 		}
 	}
 
+	@Override
+	public String getNickname(String username) {
+		return wxUserMapper.getNickname(username);
+	}
+
 	public static void main(String[] args) {
 		String jsonstr = "{\"id\":1,\"Name\":\"信广龙\",\"Order\":100000000,\"parentId\":5}";
 		WxDepartment wxUser = JSON.toJavaObject(JSONObject.parseObject(jsonstr), WxDepartment.class);

src/main/java/com/nbclass/system/controller/QyWxLoginController.java

@@ -7,6 +7,8 @@ import java.net.URLEncoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.nbclass.activity.service.WxUserService;
+import com.nbclass.vo.base.Result;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
@@ -14,6 +16,7 @@ import org.apache.shiro.authc.LockedAccountException;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.alibaba.fastjson.JSONObject;
@@ -24,6 +27,7 @@ import com.nbclass.util.CommonUtils;
 import com.nbclass.util.HttpUtils;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 企业微信扫码登录
@@ -33,12 +37,15 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Controller
 @RequestMapping("/qywx")
-public class QyWxLoginController {
+public class QyWxLoginController extends BaseController {
 
 	private static final int AgentId = 1000016; // 企业微信登录应用ID(信广龙广告)
 
 	@Autowired
-    private UserService userService;
+	private UserService userService;
+
+	@Autowired
+    private WxUserService wxUserService;
 
 	/**
 	 * PC端网页授权(企业微信授权登录)
@@ -135,4 +142,16 @@ public class QyWxLoginController {
 		return result;
 	}
 
+	/**
+	 * 获取企业微信头像
+	 * @return
+	 */
+	@GetMapping("/getAvatar")
+	@ResponseBody
+	public Result getNickname(){
+		User loginUser = getLoginUser();
+		String avatar = wxUserService.getNickname(loginUser.getUsername());
+		return Result.success(avatar);
+	}
+
 }

src/main/resources/mapper/activity/CommentMapper.xml

@@ -571,16 +571,20 @@
 
     <select id="getLabelLogger" resultType="com.nbclass.activity.model.LabelLogger">
         SELECT
+            l.id,
             l.logger,
+            l.content_id as contentId,
             l.create_time as createTime,
             l.`status`,
-            c.title as contentName,
             u.nickname as name
         FROM
             label_logger l
         LEFT JOIN content c ON l.content_id = c.id
         LEFT JOIN weixi_user u ON l.user_id = u.id
-        where u.id = #{userId}
+        where 1=1
+            <if test="id!=null">
+                and l.content_id = #{id}
+            </if>
         order by l.create_time desc
     </select>
 
@@ -601,4 +605,12 @@
         )
     </insert>
 
+    <update id="updateLogger">
+        update label_logger set
+        <if test="status!=null">
+            status = #{status}
+        </if>
+        where id = #{id}
+    </update>
+
 </mapper>

src/main/resources/mapper/activity/ContentMapper.xml

@@ -400,6 +400,24 @@
 		<if test="quantity!=null and quantity == 1">
 			and c.label_feedback > 0
 		</if>
+		<if test="createtime!=null">
+			and DATE_FORMAT(c.createtime, '%Y-%m-%d')>=  DATE_FORMAT(#{createtime}, '%Y-%m-%d')
+		</if>
+		<if test="createtimeSection!=null">
+			and DATE_FORMAT(c.createtime, '%Y-%m-%d') &lt;= DATE_FORMAT(#{createtimeSection}, '%Y-%m-%d')
+		</if>
+		<if test="updatetime!=null">
+			and DATE_FORMAT(c.updatetime, '%Y-%m-%d')>=  DATE_FORMAT(#{updatetime}, '%Y-%m-%d')
+		</if>
+		<if test="updatetimeSection!=null">
+			and DATE_FORMAT(c.updatetime, '%Y-%m-%d') &lt;= DATE_FORMAT(#{updatetimeSection}, '%Y-%m-%d')
+		</if>
+		<if test="onlineTime!=null">
+			and DATE_FORMAT(c.online_time, '%Y-%m-%d')>=  DATE_FORMAT(#{onlineTime}, '%Y-%m-%d')
+		</if>
+		<if test="onlineTimeSection!=null">
+			and DATE_FORMAT(c.online_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{onlineTimeSection}, '%Y-%m-%d')
+		</if>
 		<if test="tagLists!=null and tagLists!=''">
 			and item.id in
 			<foreach collection="tagLists" open="(" separator="," item="id" close=")">
@@ -469,13 +487,13 @@
 			data_dict_item item
 			LEFT JOIN content_tags tags ON item.id = tags.tid
 			LEFT JOIN content c ON c.id = tags.cid and c.online_time is not null
+			<if test="type!=null and type==1">
+				and YEARWEEK( date_format(c.online_time, '%Y-%m-%d' ), 1 ) = YEARWEEK(now())
+			</if>
 		WHERE
 			item.dictid = 26
 		GROUP BY
 			item.id,c.id
-			<if test="type!=null and type==1">
-				and YEARWEEK( date_format(c.online_time, '%Y-%m-%d' ), 1 ) = YEARWEEK(now())
-			</if>
 			<if test="type!=null and type==2">
 				AND DATE_FORMAT( c.online_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
 			</if>

src/main/resources/mapper/activity/WxUserMapper.xml

@@ -63,4 +63,8 @@
 		</foreach>
 	</delete>
 
+	<select id="getNickname" resultType="java.lang.String">
+		select avatar from wx_user where userid = #{username}
+	</select>
+
 </mapper>

src/main/resources/templates/content-logger/list.html

@@ -0,0 +1,121 @@
+<section class="content-header">
+    <ol class="breadcrumb">
+        <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
+        <li class="active">标签、索引反馈日志</li>
+    </ol>
+</section>
+<section class="content">
+    <div class="jax-box">
+        <form id="formSearch" class="form-inline form-search">
+            <div class="form-group">
+                <label>案例编号: </label>
+                <input type="text" id="contentId" class="form-control" oninput = "value=value.replace(/[^\d]/g,'')">
+            </div>
+            <div class="form-group">
+                <div class="col-md-1 col-sm-3" style="text-align:left;">
+                    <button type="button" id="btn_query" class="btn btn-info">查 询</button>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-1 col-sm-3" style="text-align:left;">
+                    <button type="button" id="reset_query" class="btn btn-info">重置</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+
+    <div class="jax-box jax-box-table">
+        <table id="table" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap"></table>
+    </div>
+
+</section>
+
+<script type="text/javascript">
+    var columns = [
+        {field: 'contentId', title: '案例编号', align : "center"},
+       	{field: 'logger', title: '日志', align : "center",formatter:function(value,row, index){
+       	    console.log(row)
+            return "用户["+row.name+"]反馈案例标签["+row.logger+"]不准确";
+            }},
+        {field: 'createTime', title: '创建时间', align : "center"},
+        {field: 'status', title: '状态', align : "center",formatter: function(value, row, index) {
+            return row.status === 1 ? '已解决' : '未解决';
+            }},
+        {field : 'operation', title : '操作', align : "center", formatter: function(value, row, index) {
+            var submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="editPage('+row.id+',0)">暂不解决</a>';
+            var editHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="editPage('+row.id+',1)">已解决</a>';
+			return submitHtml+editHtml;
+       }}
+	];
+    var options={
+        id:"#table",
+        url: '[[@{/console/content/getLabelLogger}]]',
+        columns:columns,
+        toolbar: '#toolbar',
+        showRefresh: true,
+        queryParams : queryParams
+    }
+    Core.initTable(options);
+
+	//查询参数
+    function queryParams(params) {
+        var temp = {
+            page : params.limit, //页面大小
+            pageSize : params.offset, //页码
+            id: $("#contentId").val()
+        };
+        return temp;
+    }
+
+	// 预览
+	function previewNews(url) {
+		window.open(url, "_blank");
+	}
+
+	// 修改
+	function editPage(id,status) {
+        var msg = "确定更新改状态？";
+        Core.confirm(msg, function () {
+            Core.postAjax("[[@{/console/content/updateLogger}]]",{"id":id,"status":status},function (data) {
+                if(data.ret==0){
+                    layer.msg('更新成功！');
+                    Core.refreshTable("#table");
+                }else{
+                    layer.msg(data.msg);
+                }
+            },"POST");
+        })
+	//	openWindow("[[@{/console/content/edit}]]?id="+id, "编辑新闻", 1200, 600);
+	}
+
+	function openWindow(url, name, iWidth, iHeight){
+  		var iWidth;		// 弹出窗口的宽度;
+  		var iHeight;	// 弹出窗口的高度;
+  		var iTop = (window.screen.availHeight-30-iHeight)/2;	// 获得窗口的垂直位置;
+  		var iLeft = (window.screen.availWidth-10-iWidth)/2;		// 获得窗口的水平位置;
+  		window.open(url, name,'height='+iHeight+',innerHeight='+iHeight+',width='+iWidth+',innerWidth='+iWidth+',top='+iTop+',left='+iLeft+',toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no');
+	}
+
+
+
+	$(function () {
+		/*查询*/
+        $("#btn_query").click(function(){
+            Core.refreshTable("#table");
+        });
+
+        //重置搜索栏
+        $("#reset_query").click(function () {
+            $("#contentId").val("");
+        });
+
+	});
+
+
+
+
+
+
+
+</script>

src/main/resources/templates/content/application.html

@@ -8,15 +8,46 @@
 <section class="content">
     <div class="jax-box">
         <form id="formSearch" class="form-inline form-search">
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>案例编号: </label>
-                <input type="text" id="case_number" class="form-control">
+                <input type="text" id="case_number" class="form-control" oninput = "value=value.replace(/[^\d]/g,'')">
             </div>
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>标题: </label>
                 <input type="text" id="title" class="form-control">
             </div>
-            <div class="form-group">
+
+            <div class="form-group" style="margin-bottom: 10px">
+                <label>创建时间：</label>
+                <!--指定 date标记-->
+                <div class='input-group date' id='createTime'>
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
+                    <span class="input-group-addon">
+                        <span class="glyphicon glyphicon-calendar"></span>
+                    </span>
+                </div>
+            </div>
+
+            <div class="form-group" style="margin-bottom: 10px">
+                <label>至</label>
+                <!--指定 date标记-->
+                <div class='input-group date' id='createTimeSection'>
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
+                    <span class="input-group-addon">
+                        <span class="glyphicon glyphicon-calendar"></span>
+                    </span>
+                </div>
+            </div>
+
+            <div class="form-group" style="margin-bottom: 10px">
+                <label>品牌公司: </label>
+                <select id="brandCompany" name="tagLists" class="form-control">
+                    <option value="">请选择</option>
+                </select>
+            </div>
+
+            <br/>
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>状态: </label>
                 <select id="status" class="form-control">
                     <option value="">未提交</option>
@@ -25,7 +56,9 @@
                     <option value="3">未通过</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>反馈次数: </label>
                 <select id="count" class="form-control">
                     <option value="">请选择</option>
@@ -33,123 +66,108 @@
                     <option value="1">非0</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>标签: </label>
                 <select id="tags" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+
-                <label>品牌公司: </label>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <select id="brandCompany" name="tagLists" class="form-control">
+            <div class="form-group" style="margin-bottom: 10px">
-                    <option value="">请选择</option>
-                </select>
-            </div>
-            <div class="form-group">
                 <label>广告公司: </label>
                 <select id="advertisingAgency" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>案例用途: </label>
                 <select id="purposeCase" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>创意形式: </label>
                 <select id="formCreative" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>案例类型: </label>
                 <select id="typeCase" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>节日事件: </label>
                 <select id="eventsFestival" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
 
-            <div class="form-group">
-                <label>创建时间：</label>
-                <!--指定 date标记-->
-                <div class='input-group date' id='createTime'>
-                    <input type='text' class="form-control" readonly="readonly" />
-                    <span class="input-group-addon">
-                        <span class="glyphicon glyphicon-calendar"></span>
-                    </span>
-                </div>
-            </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
-                <label>至</label>
-                <!--指定 date标记-->
-                <div class='input-group date' id='createTimeSection'>
-                    <input type='text' class="form-control" readonly="readonly" />
-                    <span class="input-group-addon">
-                        <span class="glyphicon glyphicon-calendar"></span>
-                    </span>
-                </div>
-            </div>
-
-
-            <div class="form-group">
                 <label>修改时间：</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='updateTime'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>至</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='updateTimeSection'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>上线时间：</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='onlineTime'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>至</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='onlineTimeSection'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <div class="col-md-1 col-sm-3" style="text-align:left;">
                     <button type="button" id="btn_query" class="btn btn-info">查 询</button>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <div class="col-md-1 col-sm-3" style="text-align:left;">
                     <button type="button" id="reset_query" class="btn btn-info">重置</button>
                 </div>
@@ -160,7 +178,7 @@
 
     <div class="jax-box jax-box-table">
 
-        <table id="table"></table>
+        <table id="table" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap"></table>
     </div>
 </section>
 
@@ -263,7 +281,7 @@
         {field: 'collectionNumber', title: '收藏数', align : "center"},
         {field: 'comments', title: '评论数', align : "center"},
         {field: 'createtime', title: '创建时间', align : "center"},
-       // {field: 'updatetime', title: '修改时间', align : "center"},
+        {field: 'updatetime', title: '修改时间', align : "center"},
         {field: 'onlineTime', title: '上线时间', align : "center"},
         {field: 'position', title: '关联部门', align : "center", width: "170", formatter:function(value,row, index){
                 for(var i = 0; i < row.tagList.length;i++){
@@ -294,16 +312,16 @@
                 let seeHtml = "";
                 let editHtml = "";
                 if(row.status === 1){
-                    adoptHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="operationApplication('+row.applicationId+',2)">发布</a>';
+                    adoptHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="operationApplication('+row.applicationId+',2)">发布</a>';
-                    rejectHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="operationApplication('+row.applicationId+',3)">驳回</a>';
+                    rejectHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="operationApplication('+row.applicationId+',3)">驳回</a>';
-                    seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
+                    seeHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
                     editHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="editPage('+row.id+')">修改</a>';
                 }else if(row.status === 2){
-                    adoptHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="offlineApplication('+row.id+')">下线</a>';
+                    adoptHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="offlineApplication('+row.id+')">下线</a>';
-                    seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
+                    seeHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
                     editHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="editPage('+row.id+')">修改</a>';
                 }else if(row.status === 3){
-                    seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
+                    seeHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
                 }
                 return adoptHtml+rejectHtml+editHtml+seeHtml;
             }}
@@ -430,6 +448,12 @@
             $("#case_number").val("");
             $("#title").val("");
             $(".form-control").find("option:selected").attr("selected",false);
+            $("#createTime").find("input").val("");
+            $("#createTimeSection").find("input").val("");
+            $("#updateTime").find("input").val("");
+            $("#updateTimeSection").find("input").val("");
+            $("#onlineTime").find("input").val("");
+            $("#onlineTimeSection").find("input").val("");
         });
 
     });

src/main/resources/templates/content/list2.html

@@ -9,15 +9,33 @@
     <input class="hidden" id="name" name="username" th:value="${session.username}">
     <div class="jax-box">
         <form id="formSearch" class="form-inline form-search">
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>案例编号: </label>
-                <input type="text" id="case_number" class="form-control" oninput = "value=value.replace(/[^\d]/g,'')">
+                <input type="text" id="case_number" class="form-control" style="width: 100px" oninput = "value=value.replace(/[^\d]/g,'')">
             </div>
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
 				<label>标题: </label>
-				<input type="text" id="title" class="form-control">
+				<input type="text" id="title" class="form-control" style="width: 100px">
 			</div>
-			<div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
+                <label>品牌公司: </label>
+                <select id="brandCompany" name="tagLists" class="form-control">
+                    <option value="">请选择</option>
+                </select>
+            </div>
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
+                <label>广告公司: </label>
+                <select id="advertisingAgency" name="tagLists" class="form-control">
+                    <option value="">请选择</option>
+                </select>
+            </div>
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<div class="form-group" style="margin-bottom: 10px">
 				<label>状态: </label>
      			<select id="status" class="form-control">
      				<option value="">请选择</option>
@@ -26,7 +44,9 @@
      				<option value="3">未通过</option>
                 </select>
 			</div>
-            <div class="form-group">
+
+            <br/>
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>反馈次数: </label>
                 <select id="count" class="form-control">
                     <option value="">请选择</option>
@@ -34,123 +54,121 @@
                     <option value="1">非0</option>
                 </select>
             </div>
-            <div class="form-group">
+
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>标签: </label>
                 <select id="tags" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+
-                <label>品牌公司: </label>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <select id="brandCompany" name="tagLists" class="form-control">
+            <div class="form-group" style="margin-bottom: 10px">
-                    <option value="">请选择</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <label>广告公司: </label>
-                <select id="advertisingAgency" name="tagLists" class="form-control">
-                    <option value="">请选择</option>
-                </select>
-            </div>
-            <div class="form-group">
                 <label>案例用途: </label>
                 <select id="purposeCase" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>创意形式: </label>
                 <select id="formCreative" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>案例类型: </label>
                 <select id="typeCase" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="form-group">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>节日事件: </label>
                 <select id="eventsFestival" name="tagLists" class="form-control">
                     <option value="">请选择</option>
                 </select>
             </div>
 
-            <div class="form-group">
+            <br/>
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>创建时间：</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='createTime'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>至</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='createTimeSection'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>修改时间：</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='updateTime'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>至</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='updateTimeSection'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>上线时间：</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='onlineTime'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <label>至</label>
                 <!--指定 date标记-->
                 <div class='input-group date' id='onlineTimeSection'>
-                    <input type='text' class="form-control" readonly="readonly" />
+                    <input type='text' class="form-control" readonly="readonly" style="width: 100px"/>
                     <span class="input-group-addon">
                         <span class="glyphicon glyphicon-calendar"></span>
                     </span>
                 </div>
             </div>
 
-			<div class="form-group">
+
+			<div class="form-group" style="margin-bottom: 10px">
                 <div class="col-md-1 col-sm-3" style="text-align:left;">
                     <button type="button" id="btn_query" class="btn btn-info">查 询</button>
                 </div>
 			</div>
 
-            <div class="form-group">
+            <div class="form-group" style="margin-bottom: 10px">
                 <div class="col-md-1 col-sm-3" style="text-align:left;">
                     <button type="button" id="reset_query" class="btn btn-info">重置</button>
                 </div>
@@ -173,13 +191,13 @@
             </button>
             </shiro:hasPermission>
 
-            <shiro:hasPermission name="indexPage">
+            <!--<shiro:hasPermission name="indexPage">
             <button id="btn_synces" type="button" class="btn btn-info">
                 <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;同步数据到搜索引擎
             </button>
-            </shiro:hasPermission>
+            </shiro:hasPermission>-->
         </div>
-        <table id="table"></table>
+        <table id="table" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap"></table>
     </div>
 </section>
 
@@ -230,9 +248,7 @@
         {field: 'visibility', title: '可见性', align : "center",  formatter:function(value,row, index){
                 return row.visibility === 1 ? "可见" : "不可见";
             }},
-        {field: 'labelFeedback', title: '标签反馈数', align : "center",formatter:function(value,row, index){
+        {field: 'labelFeedback', title: '标签反馈数', align : "center"},
-
-            }},
         {field: 'purposeCase', title: '案例用途', align : "center", formatter:function(value,row, index){
             for(var i = 0; i < row.tagList.length;i++){
                 if(row.tagList[i].id === 19){
@@ -284,7 +300,7 @@
         {field: 'collectionNumber', title: '收藏数', align : "center" },
         {field: 'comments', title: '评论数', align : "center" },
         {field: 'createtime', title: '创建时间', align : "center"},
-        //{field: 'updatetime', title: '修改时间', align : "center"},
+        {field: 'updatetime', title: '修改时间', align : "center"},
         {field: 'onlineTime', title: '上线时间', align : "center"},
         {field: 'position', title: '关联部门', align : "center",width:170,formatter:function(value,row, index){
                 for(var i = 0; i < row.tagList.length;i++){
@@ -325,7 +341,7 @@
                     seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
                     delHtml =  '&nbsp;<a class="table-btn table-btn-danger" href="javascript:void(0)" onclick="deleteAction('+row.id+',1)">删除</a>';
                 }*/
-                submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="submitApplication('+row.id+')">提交</a>';
+                submitHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="submitApplication('+row.id+')">提交</a>';
                 editHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="editPage('+row.id+')">修改</a>';
                 delHtml =  '&nbsp;<a class="table-btn table-btn-danger" href="javascript:void(0)" onclick="deleteAction('+row.id+',1)">删除</a>';
             }else if(row.status === 1){
@@ -333,30 +349,30 @@
                     submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="withdrawApplication('+row.applicationId+')">撤回</a>';
                 }*/
                 //这里的1标记为查看状态
-                seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
+                seeHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
                 delHtml =  '&nbsp;<a class="table-btn table-btn-danger" href="javascript:void(0)" onclick="deleteAction('+row.id+',1)">删除</a>';
-                submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="withdrawApplication('+row.applicationId+')">撤回</a>';
+                submitHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="withdrawApplication('+row.applicationId+')">撤回</a>';
             }else if(row.status === 3){
                 /*if($("#name").val() !== 'admin'){
                     submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="updateApplication('+row.id+','+row.applicationId+')">更新</a>';
                 }*/
-                submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="updateApplication('+row.id+','+row.applicationId+')">更新</a>';
+                submitHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="updateApplication('+row.id+','+row.applicationId+')">更新</a>';
-                seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
+                seeHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
                 delHtml =  '&nbsp;<a class="table-btn table-btn-danger" href="javascript:void(0)" onclick="deleteAction('+row.id+',1)">删除</a>';
             }
             if(row.status === 2){
                 /*if($("#name").val() !== 'admin'){
                     offlineHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="offlineApplication('+row.id+')">下线</a>';
                 }*/
-                offlineHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="offlineApplication('+row.id+')">下线</a>';
+                offlineHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="offlineApplication('+row.id+')">下线</a>';
-                submitHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="updateApplication('+row.id+','+row.applicationId+')">更新</a>';
+                submitHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="updateApplication('+row.id+','+row.applicationId+')">更新</a>';
-                seeHtml = '<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
+                seeHtml = '&nbsp;<a class="table-btn table-btn-info" href="javascript:void(0)" onclick="seeApplication('+row.id+',1)">查看</a>';
             }
             /*if(row.status === 3){
                 delHtml =  '&nbsp;<a class="table-btn table-btn-danger" href="javascript:void(0)" onclick="deleteAction('+row.id+',1)">删除</a>';
             }*/
 
-			return offlineHtml+submitHtml+editHtml + delHtml + seeHtml;
+			return offlineHtml+submitHtml+editHtml+delHtml+seeHtml;
        }}
 	];
     var options={

src/main/resources/templates/fragments/navbar.html

@@ -1,7 +1,7 @@
 <div th:fragment="navbar" class="jax-header">
     <header class="main-header">
         <a href="admin" class="logo" style="font-size: 18px;">
-            <span class="logo-mini"><b>NB</b></span>
+            <span class="logo-mini"><b>CASES</b></span>
             <span class="logo-lg"><b>案例管理系统</b></span>
         </a>
         <nav class="navbar navbar-static-top">
@@ -12,7 +12,7 @@
                 <span class="icon-bar"></span>
             </a>
 
-            <div class="navbar-custom-menu">
+            <div class="navbar-custom-menu" style="color: #00c0ef">
             	<span style="float:left; vertical-align: middle; color:white; height: 20px;line-height: 20px; padding: 15px 0px;">
             	<!-- <shiro:principal property="rolename" /> -->
             	欢迎您
@@ -20,7 +20,7 @@
                 <ul class="nav navbar-nav">
                     <li class="dropdown user user-menu">
                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" style="float:right;">
-                            <img th:src="@{/img/person.jpg}" class="user-image" alt="">
+                            <img id="avatar" th:src="@{/img/admin.png}" class="user-image" alt="">
                             <span><shiro:principal property="username" /></span>
                             <span id="userId" style="display: none"><shiro:principal property="userId" /></span>
                         </a>
@@ -178,5 +178,16 @@
            		$('#lang-label').text('中文');
            	}
 		}
+        getAvatar();
+
+		//获取企业微信头像
+        function getAvatar(){
+            //初始化下拉框
+            $.getJSON("/cases/qywx/getAvatar",function (data){
+                if(data.data !== ""){
+                    $("#avatar").attr('src',data.data);
+                }
+            });
+        }
     </script>
 </div>