From 707d65ad963bafeab9df0324985538c00afc1f41 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 9 Nov 2023 23:26:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxController.java | 11 ++ .../entity/KcExportConfigTpkwcqkjzglx.java | 7 + .../KcExportConfigTpkwcqkjzglxMapper.java | 8 + .../xml/KcExportConfigTpkwcqkjzglxMapper.xml | 24 +++ .../IKcExportConfigTpkwcqkjzglxService.java | 7 + ...KcExportConfigTpkwcqkjzglxServiceImpl.java | 161 +++++++++++++++++- .../SynchronizationService/JzgzzztTask.java | 51 ++++++ 7 files changed, 266 insertions(+), 3 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/JzgzzztTask.java 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 dd9b1f88..0aa9b5f3 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 @@ -323,6 +323,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } + queryWrapper.eq("zt","在职"); // Step.2 获取导出数据 List exportList = service.list(queryWrapper); @@ -446,4 +447,14 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController>> getTjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx,HttpServletRequest req) { + List> pageList = kcExportConfigTpkwcqkjzglxService.getTjlist(kcExportConfigTpkwcqkjzglx); + 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 9eca39b1..52059e90 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 @@ -119,4 +119,11 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable { @TableField(exist = false) private String findGh; + + @TableField(exist = false) + private String znum; + @TableField(exist = false) + private String sjtkcs; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java index 48e1d6e6..e6554527 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; +import java.util.List; + /** * @Description: kc_export_config_tpkwcqkjzglx * @Author: jeecg-boot @@ -21,4 +23,10 @@ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper getTjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); + + List getTjinfoList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1); + + void updateJzgzzzt(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); } 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 d0fc2c59..9806ad38 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 @@ -43,4 +43,28 @@ where tklx = #{tklx} limit 1 + + + + + + + + update kc_export_config_tpkwcqkjzglx t,(select gh,zzzt,mc from (select t1.gh,t1.xm,t1.zzzt,t2.mc from xxhbuser t1 left join xxhbjzgdqzt t2 on t1.ZZZT = t2.dm)a)b set t.zt = b.mc where t.gh = b.gh and t.xqxn = #{xqxn} + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java index 51562086..8e43443e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; +import java.util.List; +import java.util.Map; + /** * @Description: kc_export_config_tpkwcqkjzglx * @Author: jeecg-boot @@ -21,4 +24,8 @@ public interface IKcExportConfigTpkwcqkjzglxService extends IService> getTjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); + + void updateJzgzzzt(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); } 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 d84a849d..bb7af067 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 @@ -6,19 +6,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; import org.jeecg.modules.kc.config.mapper.KcExportConfigTpkwcqkjzglxMapper; import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser; +import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.tksf.kctksfyq.entity.KcTksfyq; import org.jeecg.modules.kc.tksf.kctksfyq.service.IKcTksfyqService; +import org.jeecg.modules.system.service.impl.SysBaseApiImpl; +import org.jeecg.modules.tools.DictUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description: kc_export_config_tpkwcqkjzglx @@ -34,6 +40,15 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl> getTjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) { + List> resMapList = new ArrayList<>(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + List roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); + String adminRole = "1";//0 admin 1教务秘书 + for(String role :roleList){ + if(StringUtils.equals("admin",role)){ + adminRole = "0"; + break; + } + } + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + + //-------------如果是教务秘书获取是哪个学校的--------------------------- + String schoolname = ""; + List tklxList = new ArrayList<>(); + tklxList.add("30"); + tklxList.add("20"); + tklxList.add("330"); + tklxList.add("60"); + tklxList.add("210,270,280"); + tklxList.add("110"); + tklxList.add("10"); +// 学校教务委员会 70 +// 学校督学 100 +// 校领导 160 +// 学院教务委员会 30 +// 系主任（专业负责人） 20 +// 教学副院长 330 +// 行政负责人 60 +// 其他党政领导 210 270 280 +// 辅导员 110 +// 其他专任教师 10 + if(StringUtils.equals("1",adminRole)){//获取当前人所在的学院 + QueryWrapper xxhbuserQueryWrapper = new QueryWrapper<>(); + xxhbuserQueryWrapper.eq("username",sysUser.getUsername()); + xxhbuserQueryWrapper.apply("limit 1"); + Xxhbuser xxhbuser = xxhbuserService.getOne(xxhbuserQueryWrapper); + if(xxhbuser==null){//如果没有查到，则返回空，什么也不显示 + return null; + }else{ + schoolname = xxhbuser.getDwmc(); + } + }else{//管理员还需要查这几个 + tklxList.add("70"); + tklxList.add("100"); + tklxList.add("160"); + } + //-------------如果是教务秘书获取是哪个学校的--------------------------- + + //------------------获取统计数据------------------------------------ + for(String tklx:tklxList){ +// KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + Map resMap = new HashMap<>(); + if(StringUtils.equals("70",tklx)){ + resMap.put("title", "学校教务委员会"); + resMap.put("code", "70"); + 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"); + } + KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1 = new KcExportConfigTpkwcqkjzglx(); + kcExportConfigTpkwcqkjzglx1.setDwmc(schoolname); + kcExportConfigTpkwcqkjzglx1.setTklx(tklx); + kcExportConfigTpkwcqkjzglx1.setXqxn(kcExportConfigTpkwcqkjzglx.getXqxn()); + List infolist = baseMapper.getTjinfoList(kcExportConfigTpkwcqkjzglx1); + int ywcrs = 0;//已完成人数 + int wwcrs = 0;//未完成人数 + int ypkcs = 0;//应评课次数 + int sjpkcs = 0;//实际评课次数 + for(int i=0;i param){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = new KcExportConfigTpkwcqkjzglx(); + kcExportConfigTpkwcqkjzglx.setXqxn(kcSysConfig.getFlag1()); + kcExportConfigTpkwcqkjzglxService.updateJzgzzzt(kcExportConfigTpkwcqkjzglx); + } + + public void run(){ + run(null); + } + +}