diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java index a341aa4d..de4cc16b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java @@ -178,4 +178,12 @@ public class XxhbtkxxController extends JeecgController> getDayTklist(HttpServletRequest req) { + List pageList = xxhbtkxxService.getDayTklist(); + return Result.OK(pageList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java index aca2c5ad..62ceb7ec 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java @@ -18,4 +18,6 @@ public interface XxhbtkxxMapper extends BaseMapper { boolean updateToKeTang(Wrapper queryWrapper); Xxhbtkxx getSumnum(); + + List getDayTklist(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml index 7cfc7987..3576b084 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml @@ -25,4 +25,9 @@ ${ew.customSqlSegment} + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java index 99b62635..dff2cf82 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java +++ b/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 { boolean updateToKeTang(Wrapper queryWrapper); Xxhbtkxx getSumnum(); + + List getDayTklist(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java index 1107382f..24c42911 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java +++ b/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 i public Xxhbtkxx getSumnum() { return baseMapper.getSumnum(); } + + @Override + public List getDayTklist() { + return baseMapper.getDayTklist(); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java index 4dc5a7fc..8eaba98b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java @@ -59,6 +59,7 @@ public class KcZhihuijiaoshiMonitorLogController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcZhihuijiaoshiMonitorLog, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = kcZhihuijiaoshiMonitorLogService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index d0bf9ba3..3062e721 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/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 and ktb.is_delete = 0 @@ -89,7 +90,11 @@ and jxljbxx.jzwh = #{kcKetangbiao.jzwh} + + and IF(tkxx.kcmc is null,'0','1') = 0 + + order by ktb.hh asc,kkdw.id asc,IF(tkxx.kcmc is null,'0','1') asc