yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改导出及教学楼查询

This commit is contained in:
yangjun 2023-11-03 20:00:50 +08:00
parent 27966f1218
commit 7ed459c734
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java
View File

@ -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 = "状态")

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

@ -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