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 caed66f5..1894ceaa 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 @@ -205,7 +205,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0))"); +// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))"); queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)"); Page page = new Page<>(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); 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 484464ed..f4053e4e 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 @@ -45,7 +45,7 @@ @@ -108,7 +108,7 @@ select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a LEFT JOIN kc_xqxn_history b on a.xqxn = b.title LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time - where xqxn=#{kcExportConfigTpkwcqkjzglx.xqxn} and zt = '在职' and rjzy is not null + where xqxn=#{kcExportConfigTpkwcqkjzglx.xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and rjzy is not null and a.dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc} @@ -120,7 +120,7 @@ select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a LEFT JOIN kc_xqxn_history b on a.xqxn = b.title LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time - where xqxn=#{xqxn} and zt = '在职' and rjzy is not null + where xqxn=#{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and rjzy is not null and a.dwmc = #{dwmc} @@ -134,7 +134,7 @@ select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a LEFT JOIN kc_xqxn_history b on a.xqxn = b.title LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time - where xqxn = #{xqxn} and zt = '在职' and tklx in (${code}) + where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${code}) and dwmc = #{dwmc} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java index 495c8bd3..3806b4cd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java @@ -142,6 +142,7 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl resMap = new HashMap<>(); - if(StringUtils.equals("70",tklx)){ - resMap.put("title", "学校教务委员会"); - resMap.put("code", "70"); + String title = dictUtils.translateDictValue("tpkwcqkjzglx",tklx); + if(StringUtils.equals("70",tklx)||StringUtils.equals("100",tklx)||StringUtils.equals("160",tklx)){ resMap.put("type","0");//0代表管理员 1代表教务秘书 - }else if(StringUtils.equals("100",tklx)){ - resMap.put("title", "学校督学"); - resMap.put("code", "100"); - resMap.put("type","0"); - }else if(StringUtils.equals("160",tklx)){ - resMap.put("title", "校领导"); - resMap.put("code", "160"); - resMap.put("type","0"); - }else if(StringUtils.equals("30",tklx)){ - resMap.put("title", "学院教务委员会"); - resMap.put("code", "30"); - resMap.put("type","1"); - }else if(StringUtils.equals("20",tklx)){ - resMap.put("title", "系主任(专业负责人)"); - resMap.put("code", "20"); - resMap.put("type","1"); - }else if(StringUtils.equals("330",tklx)){ - resMap.put("title", "教学副院长"); - resMap.put("code", "330"); - resMap.put("type","1"); - }else if(StringUtils.equals("60",tklx)){ - resMap.put("title", "行政负责人"); - resMap.put("code", "60"); - resMap.put("type","1"); - }else if(StringUtils.equals("210,270,280",tklx)){ - resMap.put("title", "其他党政领导"); - resMap.put("code", "210,270,280"); - resMap.put("type","1"); - }else if(StringUtils.equals("110",tklx)){ - resMap.put("title", "辅导员"); - resMap.put("code", "110"); - resMap.put("type","1"); - }else if(StringUtils.equals("10",tklx)){ - resMap.put("title", "其他专任教师"); - resMap.put("code", "10"); - resMap.put("type","1"); + }else{ + resMap.put("type","1");//0代表管理员 1代表教务秘书 } + resMap.put("code", tklx); + resMap.put("title", title); KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1 = new KcExportConfigTpkwcqkjzglx(); kcExportConfigTpkwcqkjzglx1.setDwmc(schoolname); kcExportConfigTpkwcqkjzglx1.setTklx(tklx); 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 de4cc16b..5a4a26ca 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 @@ -159,10 +159,9 @@ public class XxhbtkxxController extends JeecgController +