From 7ed459c73488fd550be582a1458dd9af32ddef21 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 3 Nov 2023 20:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=8F=8A?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A5=BC=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/config/entity/KcExportConfigTpkwcqkjzglx.java | 8 +++++--- .../modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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 a3b64826..9eca39b1 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 @@ -55,9 +55,6 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable { @ApiModelProperty(value = "所属部门") private String sysOrgCode; - /**任教专业*/ - @ApiModelProperty(value = "任教专业") - private String rjzy; /**学期学年*/ @Excel(name = "学年学期", width = 15) @@ -87,6 +84,11 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable { @Excel(name = "听课类型", width = 15) @ApiModelProperty(value = "身份") private String sf; + + /**任教专业*/ + @Excel(name = "任教专业", width = 15) + @ApiModelProperty(value = "任教专业") + private String rjzy; /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") 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 17f0a497..d0bf9ba3 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 @@ -39,7 +39,7 @@ from kc_ketangbiao ktb left join (select * from kc_yuyue where userid = #{kcKetangbiao.userid}) yy on ktb.id = yy.ketangbiaoid LEFT JOIN (SELECT DISTINCT jsbh, jsmc from kc_zhihuijiaoshi where sfyx=0) js on ktb.jsbh = js.jsbh - left join xxhbjsjbxx jsjbxx on jsjbxx.jsh = js.jsbh + left join xxhbjsjbxx jsjbxx on jsjbxx.jsmc = ktb.skdd left join xxhbjxljbxx jxljbxx on jsjbxx.jxlh = jxljbxx.jzwh left join kc_jieci jc on ktb.hh = jc.jieci 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