修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java

@@ -178,4 +178,12 @@ public class XxhbtkxxController extends JeecgController<Xxhbtkxx, IXxhbtkxxServi
         return super.importExcel(request, response, Xxhbtkxx.class);
     }
 
+
+	 @ApiOperation(value="获取今日停课信息", notes="获取今日停课信息")
+	 @GetMapping(value = "/getDayTklist")
+	 public Result<List<Xxhbtkxx>> getDayTklist(HttpServletRequest req) {
+		 List<Xxhbtkxx> pageList = xxhbtkxxService.getDayTklist();
+		 return Result.OK(pageList);
+	 }
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java

@@ -18,4 +18,6 @@ public interface XxhbtkxxMapper extends BaseMapper<Xxhbtkxx> {
     boolean updateToKeTang(Wrapper<Xxhbtkxx> queryWrapper);
 
     Xxhbtkxx getSumnum();
+
+    List<Xxhbtkxx> getDayTklist();
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml

@@ -25,4 +25,9 @@
         ${ew.customSqlSegment}
 
     </select>
+
+
+    <select id="getDayTklist" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
+        select * from kc_tkxx_view
+    </select>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java

@@ -5,6 +5,7 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @Description: 同步数据表(tkxx)
@@ -37,4 +38,6 @@ public interface IXxhbtkxxService extends IService<Xxhbtkxx> {
     boolean updateToKeTang(Wrapper<Xxhbtkxx> queryWrapper);
 
     Xxhbtkxx getSumnum();
+
+    List<Xxhbtkxx> getDayTklist();
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @Description: 同步数据表(tkxx)
@@ -79,4 +80,9 @@ public class XxhbtkxxServiceImpl extends ServiceImpl<XxhbtkxxMapper, Xxhbtkxx> i
     public Xxhbtkxx getSumnum() {
         return baseMapper.getSumnum();
     }
+
+    @Override
+    public List<Xxhbtkxx> getDayTklist() {
+        return baseMapper.getDayTklist();
+    }
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java

@@ -59,6 +59,7 @@ public class KcZhihuijiaoshiMonitorLogController extends JeecgController<KcZhihu
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper = QueryGenerator.initQueryWrapper(kcZhihuijiaoshiMonitorLog, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<KcZhihuijiaoshiMonitorLog> page = new Page<KcZhihuijiaoshiMonitorLog>(pageNo, pageSize);
 		IPage<KcZhihuijiaoshiMonitorLog> pageList = kcZhihuijiaoshiMonitorLogService.page(page, queryWrapper);
 		return Result.OK(pageList);

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml

@@ -45,6 +45,7 @@
         left join kc_kechengbiao kcb on kcb.kcmc = ktb.kcmc and kcb.kcxz = ktb.kcxz and kcb.skjs = ktb.skjs and kcb.skdd=ktb.skdd and kcb.kkdw = ktb.kkdw and kcb.kcbh = ktb.kcbh and kcb.id = ktb.kechengbiaoid
         left join (select distinct  tkxx.xm,tkxx.kcmc,concat(substring(tkxx.skrq,1,4),'-',substring(tkxx.skrq,5,2),'-',substring(tkxx.skrq,7,2)) as skrq,tkxx.skjs,tkxx.tksy from xxhbtkxx tkxx where tkxx.skrq is not null) tkxx
         on ktb.kcmc =tkxx.kcmc and ktb.skrq = tkxx.skrq and ktb.skdd=tkxx.skjs and ktb.skjs = tkxx.xm
+        left join kc_kkdw kkdw on ktb.kkdw = kkdw.kkdw
         <where>
             and ktb.is_delete = 0
             <if test="kcKetangbiao.ywmc!=null and kcKetangbiao.ywmc!=''">
@@ -89,7 +90,11 @@
             <if test="kcKetangbiao.jzwh!=null and kcKetangbiao.jzwh!=''">
                 and jxljbxx.jzwh = #{kcKetangbiao.jzwh}
             </if>
+            <if test="kcKetangbiao.sftkb!=null and kcKetangbiao.sftkb!=''">
+                and IF(tkxx.kcmc is null,'0','1') = 0
+            </if>
         </where>
+        order by ktb.hh asc,kkdw.id asc,IF(tkxx.kcmc is null,'0','1') asc
     </select>