diff --git a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java
new file mode 100644
index 0000000..53dac94
--- /dev/null
+++ b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java
@@ -0,0 +1,36 @@
+package com.sincere.common.dto.smartCampus;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/29 0029 14:27
+ */
+public class CensusKqDto {
+    private String className ;
+    private int allT ;
+    private int kqT ;
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public int getAllT() {
+        return allT;
+    }
+
+    public void setAllT(int allT) {
+        this.allT = allT;
+    }
+
+    public int getKqT() {
+        return kqT;
+    }
+
+    public void setKqT(int kqT) {
+        this.kqT = kqT;
+    }
+}
diff --git a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/KqTeacherDto.java b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/KqTeacherDto.java
index 2edbaca..94ee788 100644
--- a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/KqTeacherDto.java
+++ b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/KqTeacherDto.java
@@ -13,7 +13,7 @@ public class KqTeacherDto {
     private String pass ;
     private String DingUserId ;
     private String weChatUserId ;
-    private String xSTOpenId ;
+    private String openId ;
     private String face ;
 
     public String getUserId() {
@@ -72,12 +72,12 @@ public class KqTeacherDto {
         this.weChatUserId = weChatUserId;
     }
 
-    public String getxSTOpenId() {
-        return xSTOpenId;
+    public String getOpenId() {
+        return openId;
     }
 
-    public void setxSTOpenId(String xSTOpenId) {
-        this.xSTOpenId = xSTOpenId;
+    public void setOpenId(String openId) {
+        this.openId = openId;
     }
 
     public String getFace() {
diff --git a/cloud/common/src/main/java/com/sincere/common/util/DateUtils.java b/cloud/common/src/main/java/com/sincere/common/util/DateUtils.java
index a6a5ec2..879fd0c 100644
--- a/cloud/common/src/main/java/com/sincere/common/util/DateUtils.java
+++ b/cloud/common/src/main/java/com/sincere/common/util/DateUtils.java
@@ -72,4 +72,33 @@ public class DateUtils {
         int weekday = c.get(Calendar.DAY_OF_WEEK);
         return weekday-1 ;
     }
+
+    public static String getWeekName(){
+        Date today = new Date();
+        Calendar c = Calendar.getInstance();
+        c.setTime(today);
+        int weekday = c.get(Calendar.DAY_OF_WEEK);
+        if(weekday == 1){
+            return "周日";
+        }
+        if(weekday == 2){
+            return "周一";
+        }
+        if(weekday == 3){
+            return "周二";
+        }
+        if(weekday == 4){
+            return "周三";
+        }
+        if(weekday == 5){
+            return "周四";
+        }
+        if(weekday == 6){
+            return "周五";
+        }
+        if(weekday == 7){
+            return "周六";
+        }
+        return "";
+    }
 }
diff --git a/cloud/quartz/pom.xml b/cloud/quartz/pom.xml
index fba7ac2..c8b1d0c 100644
--- a/cloud/quartz/pom.xml
+++ b/cloud/quartz/pom.xml
@@ -89,7 +89,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>com.sincere.smartSearch.SmartSearchApplication</mainClass>
+                            <mainClass>com.sincere.quartz.QuartzApplication</mainClass>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
                         </manifest>
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/enums/KqTypeEnums.java b/cloud/quartz/src/main/java/com/sincere/quartz/enums/KqTypeEnums.java
new file mode 100644
index 0000000..d5e4cd7
--- /dev/null
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/enums/KqTypeEnums.java
@@ -0,0 +1,56 @@
+package com.sincere.quartz.enums;
+
+import com.sincere.common.dto.smartCampus.KqTeacherDto;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/29 0029 11:44
+ */
+public enum KqTypeEnums {
+    morning_to_school(1,"早上到校"),
+    noon_le_school(2,"中午离校"),
+    afternoon_to_school(3,"下午到校"),
+    afternoon_le_school(4,"下午离校"),
+    night_to_school(5,"晚上到校"),
+    night_le_school(6,"晚上离校"),
+    morning_to_chamber(7,"早上离寝"),
+    noon_to_chamber(8,"中午到寝"),
+    noon_le_chamber(9,"中午离寝"),
+    afternoon_to_chamber(10,"下午到寝"),
+    afternoon_le_chamber(11,"下午离寝"),
+    night_to_chamber(12,"晚上到寝");
+
+    private int type ;
+    private String name ;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    KqTypeEnums(int type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    public static String getName(int type){
+        for(KqTypeEnums enums : KqTypeEnums.values()){
+            if(enums.getType() == type){
+                return enums.getName();
+            }
+        }
+        return "" ;
+    }
+}
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/enums/TypeEnums.java b/cloud/quartz/src/main/java/com/sincere/quartz/enums/TypeEnums.java
new file mode 100644
index 0000000..c52c059
--- /dev/null
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/enums/TypeEnums.java
@@ -0,0 +1,35 @@
+package com.sincere.quartz.enums;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/29 0029 11:25
+ */
+public enum TypeEnums {
+
+    kaoqing(10,"考勤");
+
+    TypeEnums(int type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    private int type ;
+    private String name ;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/feign/ScFeign.java b/cloud/quartz/src/main/java/com/sincere/quartz/feign/ScFeign.java
index b5b271d..55d04ec 100644
--- a/cloud/quartz/src/main/java/com/sincere/quartz/feign/ScFeign.java
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/feign/ScFeign.java
@@ -1,6 +1,7 @@
 package com.sincere.quartz.feign;
 
 import com.sincere.common.dto.smartCampus.AppDto;
+import com.sincere.common.dto.smartCampus.CensusKqDto;
 import com.sincere.common.dto.smartCampus.KqTeacherDto;
 import com.sincere.common.dto.smartCampus.TemplateDto;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -26,4 +27,7 @@ public interface ScFeign {
 
     @RequestMapping(value = "/sm/kq/getApp",method = RequestMethod.GET)
     AppDto getApp(@RequestParam("schoolId")int schoolId , @RequestParam("type") int type);
+
+    @RequestMapping(value = "/sm/kq/getCensusKq",method = RequestMethod.GET)
+    List<CensusKqDto> getCensusKq(@RequestParam("userId") String userId , @RequestParam("type") int type);
 }
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java b/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java
index 3ad5604..5228fbc 100644
--- a/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java
@@ -1,9 +1,12 @@
 package com.sincere.quartz.job;
 
 import com.sincere.common.dto.smartCampus.AppDto;
+import com.sincere.common.dto.smartCampus.CensusKqDto;
 import com.sincere.common.dto.smartCampus.KqTeacherDto;
 import com.sincere.common.dto.smartCampus.TemplateDto;
 import com.sincere.common.util.DateUtils;
+import com.sincere.quartz.enums.KqTypeEnums;
+import com.sincere.quartz.enums.TypeEnums;
 import com.sincere.quartz.feign.ScFeign;
 import com.sincere.quartz.mapper.SmsMapper;
 import com.sincere.quartz.model.DingSms;
@@ -16,6 +19,8 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 
 /**
+ * 考勤任务推送调用
+ * 主要推送盯盯以及企业号
  * @author chen
  * @version 1.0
  * @date 2019/11/27 0027 17:05
@@ -47,8 +52,7 @@ public class QDService {
         List<String> keyList = new ArrayList<>();
         for(Map.Entry<String, String> entity : map.entrySet()){
             String endTime = entity.getValue().split("_")[1];
-            if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>0
-                && DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")<5){
+            if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>=2){
                 String key = entity.getKey();
                 String[] messageArray = key.split("_");
                 List<KqTeacherDto> list = scFeign.getTeacherList(Integer.valueOf(messageArray[1]));
@@ -81,9 +85,10 @@ public class QDService {
                     String endTime = msg.substring(msg.indexOf("EndTime")+9,msg.indexOf("EndTime")+14);
                     String templateId = msg.substring(msg.indexOf("TemplateID")+12,msg.indexOf("TemplateID")+22);
                     String Week = msg.substring(msg.indexOf("Week")+6,msg.indexOf("Week")+19);
+                    String type = msg.substring(msg.indexOf("Type")+6,msg.indexOf("Type")+7);
                     int nowWeek = DateUtils.getWeek() ;
                     if(Week.contains(nowWeek+"")){
-                        map.put(templateId+"_"+templateDto.getSchoolId()+"_"+templateDto.getType() , beginTime+"_"+endTime);
+                        map.put(templateId+"_"+templateDto.getSchoolId()+"_"+templateDto.getType() , beginTime+"_"+endTime+"_"+type);
                     }
                 }catch (Exception e){
                     e.printStackTrace();
@@ -94,48 +99,71 @@ public class QDService {
 
     private void dingPush(List<KqTeacherDto> list , String key){
         String[] times = key.split("_");
-        String Date = DateUtils.date2String(new Date(),DateUtils.format1);
         String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
         AppDto appDto = scFeign.getApp(list.get(0).getSchoolId(),1);
         for(KqTeacherDto teacher : list){
-            if(StringUtils.isNotBlank(teacher.getDingUserId())){
-                DingSms dingSms = new DingSms();
-                dingSms.setTableName("DingSmsNew"+tableSuffix);
-                dingSms.setMsg("{\"title\":\"请查看签到信息\",\"form\":[{\"key\":\"开始时间:\",\"value\":\"" +
-                        Date+" "+times[0]+"\"},{\"key\":\"结束时间:\",\"value\":\""+Date+" "+times[1]+"\"}]}");
-                dingSms.setSchoolId(teacher.getSchoolId());
-                dingSms.setDingUserId(teacher.getDingUserId());
-                dingSms.setAgentId(appDto.getAgentId()); //智能校卫
-                String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
-                        "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+
-                        "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+
-                        "&face=&sourcetype=16&soutype=3&timestamp="+ DateUtils.getDate() ;
-                dingSms.setWapUrl(wapUrl);
-                smsMapper.insertDing(dingSms);
+            if(teacher.getName().equals("陈杰") || teacher.getName().equals("沈川")) {
+                if(StringUtils.isNotBlank(teacher.getDingUserId())){
+                    List<CensusKqDto> censusKqDtos = scFeign.getCensusKq(teacher.getUserId(),Integer.valueOf(times[2]));
+                    String message = "";
+                    for(CensusKqDto censusKqDto : censusKqDtos){
+                        int number = censusKqDto.getAllT() - censusKqDto.getKqT() ;
+                        message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;";
+                    }
+                    DingSms dingSms = new DingSms();
+                    dingSms.setTableName("DingSmsNew"+tableSuffix);
+                    dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
+                                    "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
+                                    "签到时间："+times[0]+"-"+ times[1] +" \n - "+
+                                    "整体数据：" + message.substring(0,message.length()-1));
+                    dingSms.setSchoolId(teacher.getSchoolId());
+                    dingSms.setDingUserId(teacher.getDingUserId());
+                    dingSms.setAgentId(appDto.getAgentId());
+                    String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
+                            "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+
+                            "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+
+                            "&face=&sourcetype=16&soutype=3&timestamp="+ DateUtils.getDate() ;
+                    dingSms.setWapUrl(wapUrl);
+                    dingSms.setTdType(TypeEnums.kaoqing.getType());
+                    smsMapper.insertDing(dingSms);
+                }
             }
         }
     }
 
     private void weChatPush(List<KqTeacherDto> list , String key){
+        String[] times = key.split("_");
         String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
         AppDto appDto = scFeign.getApp(list.get(0).getSchoolId(),0);
         for(KqTeacherDto teacher : list){
-            if(StringUtils.isNotBlank(teacher.getxSTOpenId())){
-                WeChatSms weChatSms = new WeChatSms();
-                weChatSms.setTableName("qyhSmsNew"+tableSuffix);
-                weChatSms.setSchoolId(teacher.getSchoolId());
-                weChatSms.setName(teacher.getName());
-                weChatSms.setxSTOpenId(teacher.getxSTOpenId());
-                weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId());
-                weChatSms.setReceiveUserId(teacher.getUserId());
-                weChatSms.setAppId(appDto.getAgentId());
-                weChatSms.setSecret(appDto.getAgentSecret());
-                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
-                        "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+
-                        "&data="+teacher.getWeChatUserId()+"&type=1&stype=3&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+
-                        "&face="+ teacher.getFace() +"&sourcetype=16&soutype=2&timestamp="+ DateUtils.getDate() ;
-                weChatSms.setMsgUrl(msgUrl);
-                smsMapper.insertWeChat(weChatSms);
+            if(teacher.getName().equals("陶汉栋") || teacher.getName().equals("沈川")) {
+                if (StringUtils.isNotBlank(teacher.getOpenId())) {
+                    List<CensusKqDto> censusKqDtos = scFeign.getCensusKq(teacher.getUserId(),Integer.valueOf(times[2]));
+                    String message = "";
+                    for(CensusKqDto censusKqDto : censusKqDtos){
+                        int number = censusKqDto.getAllT() - censusKqDto.getKqT() ;
+                        message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;";
+                    }
+                    WeChatSms weChatSms = new WeChatSms();
+                    weChatSms.setTableName("qyhSmsNew" + tableSuffix);
+                    weChatSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
+                            "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
+                            "签到时间："+times[0]+"-"+ times[1] +" \n - "+
+                            "整体数据：" + message.substring(0,message.length()-1));
+                    weChatSms.setSchoolId(teacher.getSchoolId());
+                    weChatSms.setName(teacher.getName());
+                    weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId());
+                    weChatSms.setReceiveUserId(teacher.getUserId());
+                    weChatSms.setAppId(appDto.getAgentId());
+                    weChatSms.setSecret(appDto.getAgentSecret());
+                    String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
+                            "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +
+                            "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
+                            "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2&timestamp=" + DateUtils.getDate();
+                    weChatSms.setMsgUrl(msgUrl);
+                    weChatSms.setTdType(TypeEnums.kaoqing.getType());
+                    smsMapper.insertWeChat(weChatSms);
+                }
             }
         }
     }
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java b/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java
index 7650e2e..608b41c 100644
--- a/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java
@@ -13,6 +13,7 @@ public class DingSms {
     private String dingUserId ;
     private String wapUrl ;
     private String agentId ;
+    private int tdType ;
 
     public String getTableName() {
         return tableName;
@@ -61,4 +62,12 @@ public class DingSms {
     public void setAgentId(String agentId) {
         this.agentId = agentId;
     }
+
+    public int getTdType() {
+        return tdType;
+    }
+
+    public void setTdType(int tdType) {
+        this.tdType = tdType;
+    }
 }
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/model/WeChatSms.java b/cloud/quartz/src/main/java/com/sincere/quartz/model/WeChatSms.java
index 79103a1..dc3a1bc 100644
--- a/cloud/quartz/src/main/java/com/sincere/quartz/model/WeChatSms.java
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/model/WeChatSms.java
@@ -14,9 +14,10 @@ public class WeChatSms {
     private int schoolId ;
     private String msgUrl ;
     private String name ;
-    private String xSTOpenId ;
     private String appId ;
     private String secret ;
+    private int tdType ;
+    private String msg ;
 
 
     public String getAppId() {
@@ -83,11 +84,19 @@ public class WeChatSms {
         this.name = name;
     }
 
-    public String getxSTOpenId() {
-        return xSTOpenId;
+    public int getTdType() {
+        return tdType;
     }
 
-    public void setxSTOpenId(String xSTOpenId) {
-        this.xSTOpenId = xSTOpenId;
+    public void setTdType(int tdType) {
+        this.tdType = tdType;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
     }
 }
diff --git a/cloud/quartz/src/main/resources/mapper/SmsMapper.xml b/cloud/quartz/src/main/resources/mapper/SmsMapper.xml
index f15df11..af023b4 100644
--- a/cloud/quartz/src/main/resources/mapper/SmsMapper.xml
+++ b/cloud/quartz/src/main/resources/mapper/SmsMapper.xml
@@ -3,12 +3,12 @@
 <mapper namespace="com.sincere.quartz.mapper.SmsMapper">
 
     <insert id="insertDing" parameterType="com.sincere.quartz.model.DingSms">
-            insert into ${tableName} (Msg,SchoolID,Type,Status,intime,sendtime,DingUserId,WapUrl,agentid)
-            values (#{msg},#{schoolId},2,0,GETDATE(),GETDATE(),#{dingUserId},#{wapUrl},#{agentId})
+            insert into ${tableName} (Msg,MsgID,SchoolID,Type,Status,intime,sendtime,DingUserId,WapUrl,agentid,tdtype)
+            values (#{msg},-1,#{schoolId},1,0,GETDATE(),GETDATE(),#{dingUserId},#{wapUrl},#{agentId},#{tdType})
     </insert>
 
     <insert id="insertWeChat" parameterType="com.sincere.quartz.model.WeChatSms">
-            insert into ${tableName} (SchoolID,WapUrl,Status,intime,sendTime,SendUserName,ReceiveUserID,QiYeHaoUserId,AppID,Secret)
-            values (#{schoolId},#{msgUrl},0,GETDATE(),GETDATE(),#{name},#{receiveUserId},#{qiYeHaoUserId},#{appId},#{secret})
+            insert into ${tableName} (SchoolID,MsgID,Guid,WapUrl,Status,intime,sendTime,SendUserName,ReceiveUserID,QiYeHaoUserId,AppID,Secret,tdtype)
+            values (#{schoolId},-1,#{msg},#{msgUrl},0,GETDATE(),GETDATE(),'智能校卫',#{receiveUserId},#{qiYeHaoUserId},#{appId},#{secret},#{tdType})
     </insert>
 </mapper>
diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java
index 45f62fe..1d53a82 100644
--- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java
+++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java
@@ -1,8 +1,10 @@
 package com.sincere.smartSearch.controller;
 
 import com.sincere.common.dto.smartCampus.AppDto;
+import com.sincere.common.dto.smartCampus.CensusKqDto;
 import com.sincere.common.dto.smartCampus.KqTeacherDto;
 import com.sincere.common.dto.smartCampus.TemplateDto;
+import com.sincere.common.util.DateUtils;
 import com.sincere.smartSearch.model.KqTemplate;
 import com.sincere.smartSearch.service.KqService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,10 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author chen
@@ -55,4 +54,14 @@ public class KqController {
         map.put("type",type);
         return kqService.selectApp(map);
     }
+
+    @RequestMapping(value = "getCensusKq",method = RequestMethod.GET)
+    public List<CensusKqDto> getCensusKq(@RequestParam("userId") String userId , @RequestParam("type") int type){
+        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+        Map<String,String> map = new HashMap<>();
+        map.put("userId",userId);
+        map.put("tableName","SZ_AttendanceRecords"+tableSuffix);
+        map.put("type",type+"");
+        return kqService.selectCensusKq(map);
+    }
 }
diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java
index 4191f7d..33e01c6 100644
--- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java
+++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java
@@ -1,6 +1,7 @@
 package com.sincere.smartSearch.mapper;
 
 import com.sincere.common.dto.smartCampus.AppDto;
+import com.sincere.common.dto.smartCampus.CensusKqDto;
 import com.sincere.common.dto.smartCampus.KqTeacherDto;
 import com.sincere.smartSearch.model.KqTemplate;
 
@@ -19,4 +20,6 @@ public interface KqTemplateMapper {
     List<KqTeacherDto> selectSchoolTeacher(int schoolId);
 
     AppDto selectApp(Map<String,Integer> map);
+
+    List<CensusKqDto> selectCensusKq(Map<String ,String> map);
 }
diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/KqService.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/KqService.java
index e978c44..3c899f0 100644
--- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/KqService.java
+++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/KqService.java
@@ -1,6 +1,7 @@
 package com.sincere.smartSearch.service;
 
 import com.sincere.common.dto.smartCampus.AppDto;
+import com.sincere.common.dto.smartCampus.CensusKqDto;
 import com.sincere.common.dto.smartCampus.KqTeacherDto;
 import com.sincere.smartSearch.model.KqTemplate;
 
@@ -19,4 +20,6 @@ public interface KqService {
     List<KqTeacherDto> selectSchoolTeacher(int schoolId);
 
     AppDto selectApp(Map<String,Integer> map);
+
+    List<CensusKqDto> selectCensusKq(Map<String ,String> map);
 }
diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java
index 8713378..e102189 100644
--- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java
+++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java
@@ -1,6 +1,7 @@
 package com.sincere.smartSearch.service.impl;
 
 import com.sincere.common.dto.smartCampus.AppDto;
+import com.sincere.common.dto.smartCampus.CensusKqDto;
 import com.sincere.common.dto.smartCampus.KqTeacherDto;
 import com.sincere.smartSearch.mapper.KqTemplateMapper;
 import com.sincere.smartSearch.model.KqTemplate;
@@ -36,4 +37,9 @@ public class KqServiceImpl implements KqService {
     public AppDto selectApp(Map<String, Integer> map) {
         return kqTemplateMapper.selectApp(map);
     }
+
+    @Override
+    public List<CensusKqDto> selectCensusKq(Map<String, String> map) {
+        return kqTemplateMapper.selectCensusKq(map);
+    }
 }
diff --git a/cloud/search_smartCampus/src/main/resources/application.yml b/cloud/search_smartCampus/src/main/resources/application.yml
index 2498f41..8e80247 100644
--- a/cloud/search_smartCampus/src/main/resources/application.yml
+++ b/cloud/search_smartCampus/src/main/resources/application.yml
@@ -11,7 +11,6 @@ spring:
 ##mybatis
 mybatis:
   mapper-locations: classpath:mapper/*.xml
-#  type-aliases-package: com.sincere.smartSearch.model
   type-aliases-package: com.sincere.smartSearch.mapper
   check-config-location: true
 
diff --git a/cloud/search_smartCampus/src/main/resources/logback.xml b/cloud/search_smartCampus/src/main/resources/logback.xml
index 242d4bf..11dbd29 100644
--- a/cloud/search_smartCampus/src/main/resources/logback.xml
+++ b/cloud/search_smartCampus/src/main/resources/logback.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
         <!-- 项目名称 -->
-        <property name="PROJECT_NAME" value="schedule" />
+        <property name="PROJECT_NAME" value="search_smartCampus" />
 
         <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <!--    <property name="LOG_HOME" value="/opt/web/log/" />-->
-        <property name="LOG_HOME" value="C://smartCampus_java//log"/>
+        <property name="LOG_HOME" value="C://log"/>
 
         <!-- 控制台输出 -->
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
@@ -22,7 +21,7 @@
             <!-- 过滤器，只打印ERROR级别的日志 -->
             <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
                 <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log</FileNamePattern>
+                <FileNamePattern>${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd HH}.%i.log</FileNamePattern>
                 <!--日志文件保留天数-->
                 <MaxHistory>30</MaxHistory>
                 <!--日志文件最大的大小-->
diff --git a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml
index 5646afc..0f9c52d 100644
--- a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml
+++ b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml
@@ -11,7 +11,7 @@
     <select id="selectKqTemplate" resultMap="TemplateMap">
         select XA_KqTemplate.config , XA_KqTemplate.SchoolId ,SZ_School.MsgTypes as type from XA_KqTemplate
         join SZ_School on XA_KqTemplate.SchoolId = SZ_School.school_id
-         where XA_KqTemplate.State = 1 and XA_KqTemplate.ScenceType = 0
+         where XA_KqTemplate.State = 1 and XA_KqTemplate.ScenceType = 0 and XA_KqTemplate.TType = 1
          and (SZ_School.MsgTypes like '%4%' or SZ_School.MsgTypes like '%5%')
     </select>
 
@@ -23,14 +23,16 @@
         <result column="pass" property="pass"/>
         <result column="DingUserId" property="dingUserId"/>
         <result column="QiYeHaoUserId" property="weChatUserId"/>
-        <result column="XSTOpenId" property="xSTOpenId"/>
+        <result column="OpenId" property="openId"/>
         <result column="face" property="face"/>
     </resultMap>
     <select id="selectSchoolTeacher" parameterType="java.lang.Integer" resultMap="TeacherMap">
-        select SZ_User.user_id , SZ_UserRole.school_id , SZ_User.name , SZ_User.mobile , SZ_User.pass ,
-        SZ_User.DingUserId , SZ_User.QiYeHaoUserId , SZ_User.XSTOpenId ,SZ_User.face
-        from SZ_User join SZ_UserRole on SZ_User.user_id = SZ_UserRole.user_id
-        where SZ_UserRole.school_id = #{schoolId} and SZ_UserRole.usertype = 0
+        select distinct a.user_id,a.school_id,a.name,a.mobile,a.face,a.pass, a.OpenId,a.QiYeHaoUserId,a.DingUserId
+        from SZ_V_School_Teacher a
+        inner join SZ_Class b on a.class_id=b.class_id and b.state=1 and b.is_finish=0
+        join SZ_UserRole on a.user_id = SZ_UserRole.user_id
+        and a.school_id=#{schoolId}
+        where a.role_state=1 and SZ_UserRole.userType = 0
     </select>
 
     <resultMap id="AppMap" type="com.sincere.common.dto.smartCampus.AppDto">
@@ -41,4 +43,20 @@
         select AgentId,AgentSecret from EM_QYHApply where SchoolId=#{schoolId} and type= #{type}
         and ApplyName = '智能校卫'
     </select>
+
+    <resultMap id="KqMap" type="com.sincere.common.dto.smartCampus.CensusKqDto">
+        <result column="class_name" property="className"/>
+        <result column="allT" property="allT"/>
+        <result column="kqT" property="kqT"/>
+    </resultMap>
+    <select id="selectCensusKq" parameterType="java.util.Map" resultMap="KqMap">
+         select distinct b.class_name,
+        (select count(distinct user_id) from SZ_V_School_Student x where c.class_id=x.class_id) as allT,
+        (select count(distinct customerid) from dblan27.xiaoanhxy.dbo.${tableName} y
+        where convert(varchar(10),y.intime,120)=convert(varchar(10),getdate(),120) and y.class_id=c.class_id and y.card_type=#{type}) as kqT
+        from sz_userrole c
+        inner join SZ_Class b on c.class_id=b.class_id and b.state=1 and b.is_finish=0
+        inner join SZ_V_School_Teacher a on a.user_id=c.user_id and c.usertype=0
+        where a.role_state=1 and a.user_id=#{userId}
+    </select>
 </mapper>
--
libgit2 0.21.0