修改

src/main/java/com/ssj/framework/basic/common/bean/SplitPage.java

@@ -193,6 +193,21 @@ public class SplitPage implements Serializable{
         return htmlStr.toString();
     }
 
+    /*
+     * 循环产生分页的标签
+     */
+    private String generateHomePagerNum(int startNum, int endNum, int currentpage) {
+        StringBuffer htmlStr = new StringBuffer();
+        for (int i = startNum; i <= endNum; i++) {
+            if (i == currentpage) {
+                htmlStr.append("<a class='current' href='javascript:;' onclick='return false;'>" + i + "</a>\n");
+            } else {
+                htmlStr.append("<a href='javascript:;' onclick='listData(" + i + ");'>" + i + "</a>\n");
+            }
+        }
+        return htmlStr.toString();
+    }
+
     /**
      * 生成后台分页导航条
      * @return
@@ -458,5 +473,75 @@ public class SplitPage implements Serializable{
         html.append("</form>");
         return html.toString();
     }
+
+    /**
+     * 生成分页导航条
+     * @return
+     */
+    public String getHomeHtml() {
+        if (rowCnt <= 0) {
+            return "";
+        }
+        StringBuffer html = new StringBuffer();
+        int pageCnt = 0;// :一共有多少页
+        if ((rowCnt % pageSize) == 0) {
+            pageCnt = rowCnt / pageSize;
+        } else {
+            pageCnt = (rowCnt / pageSize) + 1;
+        }
+
+        int prePageNo = 1; //上一页页码
+        if (pageNo > 1) {
+            prePageNo = pageNo - 1;
+        }
+
+        int nextPageNo = pageCnt; //下一页页码
+        if (pageNo < pageCnt) {
+            nextPageNo = pageNo + 1;
+        }
+
+        //页面参数封装
+        html.append("<input type='hidden' id='pageNo' name='pageNo' value='").append(pageNo).append("'>\n");
+        html.append("<input type='hidden' id='pageSize' name='pageSize' value='").append(pageSize).append("'>\n");
+
+        //添加首页 --- bryan add 2016-01-21
+        if (pageCnt > 7) { //大于7页时才采取计算[左右为首尾页，中间5页]
+            //取得中间显示的那页
+            int centerPage = pageNo;
+            if (pageNo < 4) { //如果当前页小于4，就一直以4为中心
+                centerPage = 4;
+            } else if (pageNo + 3 > pageCnt) { //如果当前页快接近尾页，则以尾页减3为中心
+                centerPage = pageCnt - 3;
+            }
+
+            //中间5页中的左2页
+            if (centerPage > 4) { //如果中心页大于4，则表示前面与首页分开了
+                //先添加首页
+                html.append(generateHomePagerNum(1, 1, pageNo));
+
+                html.append("<a href=\"#\" onclick=\"javascript:return false;\">...</a>\n");
+                html.append(generateHomePagerNum(centerPage - 2, centerPage - 1, pageNo));
+            } else {
+                html.append(generateHomePagerNum(1, centerPage - 1, pageNo));
+            }
+
+            //产生中心页
+            html.append(generateHomePagerNum(centerPage, centerPage, pageNo));
+
+            //中间5页中的右2页
+            if (centerPage + 3 < pageCnt) { //如果中心页离尾页超过3页，则表示与尾页分开了
+                html.append(generateHomePagerNum(centerPage + 1, centerPage + 2, pageNo));
+                html.append("<a href=\"#\" onclick=\"javascript:return false;\">...</a>\n");
+
+                //添加尾页
+                html.append(generateHomePagerNum(pageCnt, pageCnt, pageNo));
+            } else {
+                html.append(generateHomePagerNum(centerPage + 1, pageCnt, pageNo));
+            }
+        } else {
+            html.append(generateHomePagerNum(1, pageCnt, pageNo));
+        }
+        return html.toString();
+    }
     
 }

src/main/java/com/ssj/service/mapper/CuratorMapper.java

@@ -148,7 +148,7 @@ public interface CuratorMapper {
      * @param searchValue
      * @return
      */
-    List<Map<String, Object>> homeworkIndex(Page page,@Param("libId") String libId,@Param("queryDate") String queryDate,@Param("searchValue") String searchValue);
+    List<Map<String, Object>> homeworkIndex(Page page,@Param("libId") String libId,@Param("queryDate") String queryDate,@Param("searchValue") String searchValue,@Param("queryEndDate") String queryEndDate);
 
     /**
      * 查询学生列表
@@ -180,6 +180,6 @@ public interface CuratorMapper {
 
     List<Map<String, Object>> searchHomeworkAllTop(Page page,@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("subject")String subject);
 
-    List<Map<String, Object>> searchActiveTop(@Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<Map<String, Object>> searchActiveTop(Page page,@Param("startDate")String startDate, @Param("endDate")String endDate);
 }
 

src/main/java/com/ssj/service/sys/fx/service/impl/SysCuratorServiceImpl.java

@@ -5,6 +5,7 @@ import com.ssj.framework.core.util.Constant;
 import com.ssj.framework.weixin.util.Collections3;
 import com.ssj.service.mapper.CuratorMapper;
 import com.ssj.service.sys.fx.service.SysCuratorService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -88,7 +89,7 @@ public class SysCuratorServiceImpl implements SysCuratorService {
     public Map<String, Object> homeworkIndex(String libId, int pageSize, int pageNo, Map<String, Object> params) {
         Map<String, Object> data = new HashMap<>(2);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page   page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
-        List<Map<String, Object>> list = curatorMapper.homeworkIndex(page,params.get("libId").toString(),params.get("queryDate").toString(),params.get("searchValue").toString());
+        List<Map<String, Object>> list = curatorMapper.homeworkIndex(page,params.get("libId").toString(),params.get("queryDate").toString(),params.get("searchValue").toString(), MapUtils.getString(params,"queryEndDate"));
         data.put("list",list);
         data.put("total",page.getTotal());
         return data;
@@ -105,27 +106,17 @@ public class SysCuratorServiceImpl implements SysCuratorService {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page   page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
         List<Map<String, Object>> list = curatorMapper.searchHomeworkAllTop(page,startDate,endDate,subject);
         data.put("list",list);
+        data.put("total",page.getTotal());
         return data;
     }
 
     @Override
     public Map<String, Object> searchActiveTop(String startDate, String endDate, int pageNo, int pageSize) {
         Map<String, Object> data = new HashMap<>(2);
-        //com.baomidou.mybatisplus.extension.plugins.pagination.Page   page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
-        List<Map<String, Object>> list = curatorMapper.searchActiveTop(startDate,endDate);
-        //排序取pageSize 个元素
-        list.forEach(stringObjectMap ->stringObjectMap.put("percent",Math.round(100*objectToInt(stringObjectMap.get("active_count"))/objectToInt(stringObjectMap.get("all_vips")))) );
-        //list.stream().sorted(Comparator.comparingInt().reversed());
-        Collections.sort(list, new Comparator<Map<String, Object>>() {
-            @Override
-            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                Integer name1 = Integer.valueOf(o1.get("percent").toString()) ;
-                Integer name2 = Integer.valueOf(o2.get("percent").toString()) ;
-                return name2.compareTo(name1);
-            }
-        });
-        List<Map<String, Object>> listLast = list.stream().limit(pageSize).collect(Collectors.toList());
-        data.put("list",listLast);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page   page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
+        List<Map<String, Object>> list = curatorMapper.searchActiveTop(page,startDate,endDate);
+        data.put("list",list);
+        data.put("total",page.getTotal());
         return data;
     }
 

src/main/java/com/ssj/sys/controller/SysCuratorController.java

@@ -115,8 +115,10 @@ public class SysCuratorController extends BaseController {
                              @RequestParam(required = false, defaultValue = "1") int pageNo,@RequestParam(required = false, defaultValue = "") String searchValue){
         Map<String, Object> params = new HashMap<String, Object>();
         String queryDate = request.getParameter("queryDate")==null? DateHelper.format(new Date(),"yyyy-MM-dd"):request.getParameter("queryDate");
+        String queryEndDate = request.getParameter("queryEndDate")==null? DateHelper.format(new Date(),"yyyy-MM-dd"):request.getParameter("queryEndDate");
         params.put("searchValue",searchValue==null?"":searchValue);
         params.put("queryDate",queryDate);
+        params.put("queryEndDate",queryEndDate);
         params.put("libId",libId);
         Map<String,Object> data = sysCuratorService.homeworkIndex(libId,pageSize,pageNo,params);
         getModel(model,data,params,pageSize,pageNo);
@@ -147,12 +149,17 @@ public class SysCuratorController extends BaseController {
 
     @RequestMapping(value = "/searchTop")
     @ResponseBody
-    public ResponseEntity searchTop(String startDate,String endDate,String  subject) {
+    public ResponseEntity searchTop(String startDate,String endDate,String  subject,@RequestParam(defaultValue = "1") Integer pageNo,@RequestParam(defaultValue = "10") Integer pageSize) {
         ResponseEntity responseEntity = new ResponseEntity();
         try{
-            int pageSize = 10;
-            int pageNo = 1;
+            SplitPage sp = new SplitPage();
+            sp.setAction(request.getRequestURI());
+            sp.setPageNo(pageNo);
+            sp.setPageSize(pageSize);
+
             Map<String, Object> map=sysCuratorService.searchTop(startDate,endDate,pageNo,pageSize,subject);
+            sp.setRowCnt(Integer.parseInt(map.get("total").toString()));
+            map.put("listNavigatHtml",sp.getHomeHtml().replace("listData","showTopByUser"));
             responseEntity.success(map,"操作成功");
         }catch (Exception e) {
             e.printStackTrace();
@@ -162,12 +169,17 @@ public class SysCuratorController extends BaseController {
 
     @RequestMapping(value = "/searchActiveTop")
     @ResponseBody
-    public ResponseEntity searchActiveTop(String startDate,String endDate,String  subject) {
+    public ResponseEntity searchActiveTop(String startDate,String endDate,String  subject,@RequestParam(defaultValue = "1") Integer pageNo,@RequestParam(defaultValue = "10") Integer pageSize) {
         ResponseEntity responseEntity = new ResponseEntity();
         try{
-            int pageSize = 10;
-            int pageNo = 1;
+            SplitPage sp = new SplitPage();
+            sp.setAction(request.getRequestURI());
+            sp.setPageNo(pageNo);
+            sp.setPageSize(pageSize);
+
             Map<String, Object> map=sysCuratorService.searchActiveTop(startDate,endDate,pageNo,pageSize);
+            sp.setRowCnt(Integer.parseInt(map.get("total").toString()));
+            map.put("listNavigatHtml",sp.getHomeHtml().replace("listData","showTopByActive"));
             responseEntity.success(map,"操作成功");
         }catch (Exception e) {
             e.printStackTrace();
@@ -198,6 +210,7 @@ public class SysCuratorController extends BaseController {
             //学生数据
             List<ExcelExportEntity> entity = new ArrayList<ExcelExportEntity>();
             entity.add(new ExcelExportEntity("馆名称", "league_name"));
+            entity.add(new ExcelExportEntity("模式", "sign_type"));
             entity.add(new ExcelExportEntity("活跃人数", "active_count"));
             entity.add(new ExcelExportEntity("总人数", "all_vips"));
             entity.add(new ExcelExportEntity("百分比(%)", "percent"));
@@ -356,6 +369,8 @@ public class SysCuratorController extends BaseController {
                 workbook.write(os);
             }else{
                 String queryDate = request.getParameter("queryDate")==null? DateHelper.format(new Date(),"yyyy-MM-dd"):request.getParameter("queryDate");
+                String queryEndDate = request.getParameter("queryEndDate")==null? DateHelper.format(new Date(),"yyyy-MM-dd"):request.getParameter("queryEndDate");
+                params.put("queryEndDate",queryEndDate);
                 params.put("queryDate",queryDate);
                 params.put("libId",request.getParameter("libId"));
                 params.put("searchValue",searchValue);

src/main/resources/application-common-dev.properties

@@ -1,6 +1,6 @@
 #\u5F00\u53D1\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E\uFF08\u9ED8\u8BA4\uFF09
 
-spring.datasource.url=jdbc:mysql://47.112.200.206:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&useLocalSessionState=true
+spring.datasource.url=jdbc:mysql://120.79.142.152:3306/ssj1?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&useLocalSessionState=true
 spring.datasource.username=root
 spring.datasource.password=ssj1QAZxsw2!@
 #spring.datasource.url=jdbc:mysql://120.79.215.176:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
@@ -24,7 +24,6 @@ spring.datasource.filters=stat,wall,slf4j
 spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
 
-config-redis.database=4
 spring.redis.database=0
 
 #spring.redis.host=120.79.157.115
@@ -40,7 +39,7 @@ spring.redis.block-when-exhausted=true
 
 
 #spring.redis.cluster.nodes=120.79.157.115:6379
-spring.redis.cluster.nodes=47.106.111.166:6380,47.106.111.166:6381,47.106.111.166:6382,47.106.111.166:6383,47.106.111.166:6384,47.106.111.166:6385
+spring.redis.cluster.nodes=120.79.142.152:6380
 spring.redis.cluster.timeout=30
 
 spring.redis.cluster.pool.max-active=8
@@ -51,7 +50,7 @@ spring.redis.cluster.pool.min-idle=0
 
 spring.jmx.enabled=false
 
-spring.rabbitmq.host=172.18.121.4
+spring.rabbitmq.host=192.168.1.153
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=admin1
 spring.rabbitmq.password=admin1

src/main/resources/mybatis/mapper/CuratorMapper.xml

@@ -371,8 +371,15 @@
                 left join scon_homework_picture t11 on t.id = t11.homework_id
                 left join tb_lib_vip t12 on t11.vip_id = t12.id
                 left join tb_lib_join t13 on t12.lib_id = t13.id
-                where t11.create_time regexp #{queryDate}
-                  and t12.lib_id=#{libId} and t11.is_delete = 0
+                where
+                    t12.lib_id=#{libId} and t11.is_delete = 0
+                <if test="queryDate !=null and queryDate!=''">
+                    and t11.create_time >= #{queryDate}
+                </if>
+               <if test="queryEndDate !=null and queryEndDate!=''">
+                    and  #{queryEndDate} >=t11.create_time
+                </if>
+
                 <if test="searchValue != '' ">
                     and t12.child_name regexp #{searchValue}
                 </if>
@@ -509,7 +516,7 @@
     </select>
 
     <select id="allLibIndex" resultType="java.util.Map">
-        select count(1) as totolCount,count(if(t.subject='语文',true,null)) as chineseCount,count(if(t.subject='数学',true,null)) as shuxueCount,count(if(t.subject='英语',true,null)) as englishCount from
+        select count(1) as totolCount,count(distinct t.vip_id) as activeCount,count(if(t.subject='语文',true,null)) as chineseCount,count(if(t.subject='数学',true,null)) as shuxueCount,count(if(t.subject='英语',true,null)) as englishCount from
         scon_homework_picture t
         left join tb_lib_vip t1 on t.vip_id = t1.id
         where t.is_delete = 0 and t1.lib_id is not null
@@ -538,19 +545,22 @@
             order by totolCount desc
     </select>
     <select id="searchActiveTop" resultType="java.util.Map">
-        select  t2.league_name,t1.lib_id ,
-        (select count(1) from tb_lib_vip a where a.lib_id = t1.lib_id) as all_vips,
-        count(distinct  t.vip_id) as active_count
-        from scon_homework t
-        left join tb_lib_vip t1 on t.vip_id = t1.id
-        join tb_lib_join t2 on t1.lib_id = t2.id
-        where  t1.lib_id is not null
-        <if test="startDate != null and startDate != '' ">
-            and t.create_time >= #{startDate}
-        </if>
-        <if test="endDate != null and endDate != '' ">
-            and #{endDate} >= t.create_time
-        </if>
-        group  by t1.lib_id
+        SELECT a.lib_id,a.league_name,sum(active_count) as active_count,a.all_vips,a.sign_type,sum(100*a.active_count/all_vips) as percent from (
+            select  t2.league_name,t1.lib_id ,
+            (select count(1) from tb_lib_vip a where a.lib_id = t1.lib_id) as all_vips,
+            count(distinct  t.vip_id) as active_count,case when t2.sign_type=0 then '旧' else '新' end sign_type
+            from scon_homework t
+            left join tb_lib_vip t1 on t.vip_id = t1.id
+            join tb_lib_join t2 on t1.lib_id = t2.id
+            where  t1.lib_id is not null
+            <if test="startDate != null and startDate != '' ">
+                and t.create_time >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != '' ">
+                and #{endDate} >= t.create_time
+            </if>
+            group  by t1.lib_id
+        )a GROUP BY a.lib_id
+        order by percent desc
     </select>
 </mapper>

src/main/resources/templates/sys/fx/curator/home.html

@@ -32,6 +32,9 @@
 		float: right;
 		margin-right:20px;
 	}
+	.current{
+		color: #2a91d8;
+	}
 </style>
 </head>
 <body>	
@@ -44,7 +47,17 @@
 <section class="wrapper">
 		<!-- //market-->
 		<div class="market-updates">
-			<div class="col-md-3 market-update-gd" style="width: 25%">
+			<div class="col-md-3 market-update-gd" style="width: 20%">
+				<div class="market-update-block clr-block-4">
+					 <div class="col-md-8 market-update-left">
+					 <h4></h4>
+					<h3>[[${activeCount}]]</h3>
+					<p>昨日活跃总人数</p>
+				  </div>
+				  <div class="clearfix"> </div>
+				</div>
+			</div>
+			<div class="col-md-3 market-update-gd" style="width: 20%">
 				<div class="market-update-block clr-block-2">
 					 <div class="col-md-8 market-update-left">
 					 <h4></h4>
@@ -54,7 +67,7 @@
 				  <div class="clearfix"> </div>
 				</div>
 			</div>
-			<div class="col-md-3 market-update-gd" style="width: 25%">
+			<div class="col-md-3 market-update-gd" style="width: 20%">
 				<div class="market-update-block clr-block-1">
 					<div class="col-md-8 market-update-left">
 					<h4></h4>
@@ -64,7 +77,7 @@
 				  <div class="clearfix"> </div>
 				</div>
 			</div>
-			<div class="col-md-3 market-update-gd" style="width: 25%">
+			<div class="col-md-3 market-update-gd" style="width: 20%">
 				<div class="market-update-block clr-block-3">
 					<div class="col-md-8 market-update-left">
 						<h4></h4>
@@ -74,7 +87,7 @@
 				  <div class="clearfix"> </div>
 				</div>
 			</div>
-			<div class="col-md-3 market-update-gd" style="width: 25%">
+			<div class="col-md-3 market-update-gd" style="width: 20%">
 				<div class="market-update-block clr-block-4">
 					<div class="col-md-8 market-update-left">
 						<h4></h4>
@@ -149,10 +162,8 @@
 			exportActiveInfo();
 		});
 		$("#userAddBtu").on('click',function(){
-			var starDate = $("#calendar").val();
-			var endDate = $("#calendar1").val();
-			showTopByUser("",starDate,endDate);
-			showTopByActive(starDate,endDate);
+			showTopByUser(1);
+			showTopByActive(1);
 		});
 	});
 	function exportInfo(){
@@ -169,22 +180,25 @@
 		$("#exportFrom").submit();
 	}
 	$(function(){
-		var starDate = $("#calendar").val();
-		var endDate = $("#calendar1").val();
-		showTopByUser("",starDate,endDate);
-		showTopByActive(starDate,endDate);
+		showTopByUser(1);
+		showTopByActive(1);
 	});
 	var path="[[${sysUrl}]]";
-	function showTopByUser(subject,startDate,endDate){
+	function showTopByUser(pageNo){
+		var startDate = $("#calendar").val();
+		var endDate = $("#calendar1").val();
+		var pageSize = $("#pageSize").val();
 		$.ajax({
 			url:path+"/sys/admin/curator/searchTop",
 			dataType:'json',
 			cache:false,
 			type:'get',
 			data:{
-				'subject':subject,
+				'subject':"",
 				'startDate':startDate,
-				'endDate':endDate
+				'endDate':endDate,
+				'pageNo':pageNo,
+				'pageSize':pageSize
 			},
 			error:function(){return false;},
 			success:function(data){
@@ -192,11 +206,16 @@
 				for(var i=0,len=obj.length;i<len;i++){
 					tmphtml.push('<li><div class="app-show-title"><span class="num s-index-org">'+(i+1)+'.</span>'+obj[i].league_name+'<span class="num s-index-org" style="float: right;">'+obj[i].totolCount+'份</span></div></li>');
 				}
+				tmphtml.push("<div style='float:right;margin-right: 20px'>");
+				tmphtml.push("<div>"+data.data.listNavigatHtml+"</div></div>")
 				$("#top").html(tmphtml.join(''));
 			}
 		});
 	}
-	function showTopByActive(startDate,endDate){
+	function showTopByActive(pageNo){
+		var startDate = $("#calendar").val();
+		var endDate = $("#calendar1").val();
+		var pageSize = $("#pageSize").val();
 		$.ajax({
 			url:path+"/sys/admin/curator/searchActiveTop",
 			dataType:'json',
@@ -204,14 +223,18 @@
 			type:'get',
 			data:{
 				'startDate':startDate,
-				'endDate':endDate
+				'endDate':endDate,
+				'pageNo':pageNo,
+				'pageSize':pageSize
 			},
 			error:function(){return false;},
 			success:function(data){
 				var tmphtml=[],obj=data.data.list;
 				for(var i=0,len=obj.length;i<len;i++){
-					tmphtml.push('<li><div class="app-show-title"><span class="num s-index-org">'+(i+1)+'.</span>'+obj[i].league_name+'<span class="num s-index-org" style="float: right;">'+obj[i].percent+'%</span>'+'<span class="num s-index-org" style="float:right;margin-right:20%">'+obj[i].active_count+'/'+obj[i].all_vips+'</span></div></li>');
+					tmphtml.push('<li><div class="app-show-title"><span class="num s-index-org">'+(i+1)+'.</span>'+obj[i].league_name+'('+obj[i].sign_type+')'+'<span class="num s-index-org" style="float: right;">'+obj[i].percent+'%</span>'+'<span class="num s-index-org" style="float:right;margin-right:20%">'+obj[i].active_count+'/'+obj[i].all_vips+'</span></div></li>');
 				}
+				tmphtml.push("<div style='float:right;margin-right: 20px'>");
+				tmphtml.push("<div>"+data.data.listNavigatHtml+"</div></div>")
 				$("#top2").html(tmphtml.join(''));
 
 			}

src/main/resources/templates/sys/fx/curator/homeworkIndex.html

@@ -20,14 +20,12 @@
      word-break:break-all;
 	}
 	.imgtd{
-		width:60%;
-		height: 60%;
+		height: 100%;
 		margin-top: 10px;
 		margin-left:10px;
 		align-content: center;
 	}
 	.imgshow{
-		width:100%;
 		height: 100%;
 		margin-top: 10px;
 		margin-left:10px;
@@ -44,8 +42,12 @@
 			<input name="searchValue" type="text" class="scinput" th:value="${search.get('searchValue')}"/>
 		</li>
 		<li>
-			<label>作业日期</label>
-			<input type="text" id="queryDate" name="queryDate" autocomplete="off"   onclick=" WdatePicker({ dateFmt: 'yyyy-MM-dd', isShowToday: false, isShowClear: false });" th:value="${search.queryDate }" class="scinput date_width " placeholder="作业日期">
+			<label>作业开始日期</label>
+			<input type="text" id="queryDate" name="queryDate" autocomplete="off"   onclick=" WdatePicker({ dateFmt: 'yyyy-MM-dd', isShowToday: false, isShowClear: false });" th:value="${search.queryDate }" class="scinput date_width " placeholder="作业开始日期">
+		</li>
+		<li>
+			<label>作业结束日期</label>
+			<input type="text" id="queryEndDate" name="queryEndDate" autocomplete="off"   onclick=" WdatePicker({ dateFmt: 'yyyy-MM-dd', isShowToday: false, isShowClear: false });" th:value="${search.queryEndDate }" class="scinput date_width " placeholder="作业结束日期">
 		</li>
 		<li>
 			<label>&nbsp;</label>
@@ -124,7 +126,7 @@
 			type: 1,
 			title: "图片查看",
 			//offset: '100px',
-			area: ['55%', '55%'],
+			area: ['55%', '100%'],
 			content: $("#showDiv")
 		});
 	}
@@ -136,7 +138,7 @@
 			type: 1,
 			title: "图片查看",
 			//offset: '100px',
-			area: ['80%', '80%'],
+			area: ['80%', '100%'],
 			content: content
 		});
 	}

src/main/resources/templates/sys/fx/curator/homeworkInfoVip.html

@@ -140,7 +140,7 @@
 		</div> 
 		
 		
-		<div class="s-index-side">
+		<div class="s-index-side" th:if="${correctDetail.relateKnowledgeList}">
 			<div class="title">
 				<h3 style="color: #FF4E00;font-weight: bold;font-size: 15px;padding-left:17px">错题知识点 </h3>
 			</div>

src/main/resources/templates/sys/fx/curator/index.html

@@ -80,7 +80,8 @@
                     <div class="col-md-8 market-update-left">
                         <h4></h4>
                         <h3 id="studentCount">[[${merchant.libService}]]</h3>
-                        <p>塾币消耗明细</p>
+                        <p th:if="${merchant.signType ==0}">塾币消耗明细</p>
+                        <p th:if="${merchant.signType >0}">套餐明细</p>
                     </div>
                     <div class="clearfix"> </div>
                 </div>