修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java

@@ -106,6 +106,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 			}
 			queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
 		}
+		queryWrapper.eq("zt","在职");
 		Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
 		IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
 
@@ -476,4 +477,22 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 		return Result.OK(pageList);
 	}
 
+
+	@ApiOperation(value="获取其他专任教书数据", notes="获取其他专任教书数据")
+	@GetMapping(value = "/getListQtzrjs")
+	public Result<IPage<KcExportConfigTpkwcqkjzglx>> getListQtzrjs(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx,
+																   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																   HttpServletRequest req) {
+		Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
+		IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.getListQtzrjs(page, kcExportConfigTpkwcqkjzglx);
+		return Result.OK(pageList);
+	}
+	@ApiOperation(value="获取其他专任教书数据", notes="获取其他专任教书数据")
+	@GetMapping(value = "/getListQtzrjsChar")
+	public  Result<?> getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx, HttpServletRequest req) {
+		List<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.getListQtzrjsChar(kcExportConfigTpkwcqkjzglx);
+		return Result.OK(pageList);
+	}
+
 }

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

@@ -126,6 +126,8 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
     private String sjtkcs;
     @TableField(exist = false)
     private String code;
+    @TableField(exist = false)
+    private String type;
 
 
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java

@@ -33,4 +33,8 @@ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper<KcExportCon
     IPage<KcExportConfigTpkwcqkjzglx> getListByCode(Page<KcExportConfigTpkwcqkjzglx> page, @Param("kcExportConfigTpkwcqkjzglx")KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
 
     List<KcExportConfigTpkwcqkjzglx> getBarlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
+
+    IPage<KcExportConfigTpkwcqkjzglx> getListQtzrjs(Page<KcExportConfigTpkwcqkjzglx> page, KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
+
+    List<KcExportConfigTpkwcqkjzglx> getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml

@@ -65,6 +65,7 @@
 
 
     <select id="getListByCode" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
+        select * from (
         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
@@ -73,6 +74,16 @@
             and dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc}
         </if>
         GROUP BY a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy
+        ) a
+        <where>
+            <if test='kcExportConfigTpkwcqkjzglx.type != null and kcExportConfigTpkwcqkjzglx.type == "1"'>
+                and ytkcs -0 &lt;= sjtkcs - 0
+            </if>
+            <if test='kcExportConfigTpkwcqkjzglx.type != null and kcExportConfigTpkwcqkjzglx.type == "2"'>
+                and ytkcs -0 > sjtkcs - 0
+            </if>
+
+        </where>
     </select>
 
 
@@ -90,4 +101,30 @@
     <update id="updateJzgzzzt">
         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}
     </update>
+
+
+
+    <select id="getListQtzrjs" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
+        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
+        <if test="kcExportConfigTpkwcqkjzglx.dwmc != null and kcExportConfigTpkwcqkjzglx.dwmc != ''">
+            and a.dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc}
+        </if>
+        GROUP BY a.gh,a.xm
+    </select>
+
+
+    <select id="getListQtzrjsChar" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
+        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
+        <if test="dwmc != null and dwmc != ''">
+            and a.dwmc = #{dwmc}
+        </if>
+        GROUP BY a.gh,a.xm
+
+    </select>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java

@@ -32,4 +32,8 @@ public interface IKcExportConfigTpkwcqkjzglxService extends IService<KcExportCon
     IPage<KcExportConfigTpkwcqkjzglx> getListByCode(Page<KcExportConfigTpkwcqkjzglx> page, KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
 
     List<KcExportConfigTpkwcqkjzglx> getBarlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
+
+    IPage<KcExportConfigTpkwcqkjzglx> getListQtzrjs(Page<KcExportConfigTpkwcqkjzglx> page, KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
+
+    List<KcExportConfigTpkwcqkjzglx> getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java

@@ -307,4 +307,37 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
         List<KcExportConfigTpkwcqkjzglx> infolist = baseMapper.getBarlist(kcExportConfigTpkwcqkjzglx);
         return infolist;
     }
+
+    @Override
+    public IPage<KcExportConfigTpkwcqkjzglx> getListQtzrjs(Page<KcExportConfigTpkwcqkjzglx> page, KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
+        KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+        kcExportConfigTpkwcqkjzglx.setXqxn(kcSysConfig.getFlag1());
+        return baseMapper.getListQtzrjs(page,kcExportConfigTpkwcqkjzglx);
+    }
+
+    @Override
+    public List<KcExportConfigTpkwcqkjzglx> getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理---------------------------
+        List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
+        String adminRole = "1";//0 admin  1教务秘书
+        for(String role :roleList){
+            if(StringUtils.equals("admin",role)){
+                adminRole = "0";
+                break;
+            }
+        }
+        if(StringUtils.equals("1",adminRole)){
+            QueryWrapper<Xxhbuser> uqw = new QueryWrapper<>();
+            uqw.eq("gh",sysUser.getUsername());
+            uqw.last("limit 1");
+            Xxhbuser xxhbUser = xxhbuserService.getOne(uqw);
+            kcExportConfigTpkwcqkjzglx.setDwmc(xxhbUser.getDwmc());
+        }
+        KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+        kcExportConfigTpkwcqkjzglx.setXqxn(kcSysConfig.getFlag1());
+
+        List<KcExportConfigTpkwcqkjzglx> infolist = baseMapper.getListQtzrjsChar(kcExportConfigTpkwcqkjzglx);
+        return infolist;
+    }
 }