From d2a7168c4195164ce102771aab8f0e7650764369 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Fri, 28 Jul 2023 00:58:10 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B47=E6=9C=8828=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=AF=BC=E5=87=BA=E8=BA=AB=E4=BB=BD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8,=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=8C=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxController.java | 4 +- .../entity/KcExportConfigTpkwcqkjzglx.java | 25 +++++++++--- .../modules/kc/config/export/Export.java | 2 + .../xml/KcExportConfigTpkwcqkjzglxMapper.xml | 40 +++++++++---------- .../RefreshLiveServer.java | 20 ++++++---- 5 files changed, 55 insertions(+), 36 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index 087f359d..e32ce7a4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -59,8 +59,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a", kcExportConfigTpkwcqkjzglx, req.getParameterMap()); - queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); +// queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc()); Page page = new Page(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java index b35d481b..86c935e9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java @@ -64,12 +64,25 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable { @ApiModelProperty(value = "听课类型（字典：tpkwcqkjzglx ）") private java.lang.String tklx; - //教职工姓名 - @TableField(exist = false) - private java.lang.String xm; - - //单位名称 - @TableField(exist = false) + /**学院*/ + @Excel(name = "学院", width = 15) + @ApiModelProperty(value = "学院") private java.lang.String dwmc; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String xm; + /**身份*/ + @Excel(name = "身份", width = 15) + @ApiModelProperty(value = "身份") + private java.lang.String sf; + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String zt; + /**每学期应听课次数*/ + @Excel(name = "每学期应听课次数", width = 15) + @ApiModelProperty(value = "每学期应听课次数") + private java.lang.String ytkcs; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java index cb5cabe2..02c8c743 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java @@ -157,11 +157,13 @@ public class Export extends BaseExport { } //********************************取数据END*********************************************************/ //********************************通用*************************************************************/ + //xym 学院名称 result.put("xqxn",xqxnParam); //填进去数量 result.put("oneListSize", StringUtils.defaultString(String.valueOf(oneList.size()),"0")); result.put("twoListSize", StringUtils.defaultString(String.valueOf(twoList.size()),"0")); result.put("threeListSize", StringUtils.defaultString(String.valueOf(threeList.size()),"0")); + //fourListSize //********************************表头END**********************************************************/ wo.replaceTextPlus(result); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml index 18d7d41a..5fbe0b50 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml @@ -2,26 +2,26 @@ - + + + + + + + + + + - + + + + + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java index 0b3f21c0..8b5fd6a6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java @@ -55,15 +55,19 @@ public class RefreshLiveServer extends BaseSync { log.error(e.getMessage(),e); } }); - UpdateWrapper onUw = new UpdateWrapper(); - onUw.set("sfyx",0); - onUw.in("id",onList); - kcZhihuijiaoshiService.update(onUw); + if(!onList.isEmpty()){ + UpdateWrapper onUw = new UpdateWrapper(); + onUw.set("sfyx",0); + onUw.in("id",onList); + kcZhihuijiaoshiService.update(onUw); + } - UpdateWrapper outUw = new UpdateWrapper(); - outUw.set("sfyx",1); - outUw.in("id",outList); - kcZhihuijiaoshiService.update(outUw); + if(!outList.isEmpty()) { + UpdateWrapper outUw = new UpdateWrapper(); + outUw.set("sfyx", 1); + outUw.in("id", outList); + kcZhihuijiaoshiService.update(outUw); + } } /**