修改bug
This commit is contained in:
parent
ce1e3a71e5
commit
6abe47cb40
|
@ -204,6 +204,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
}
|
||||
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
|
||||
}
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
// queryWrapper.eq("zt","在职");
|
||||
// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
// queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
|
@ -381,7 +382,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
}
|
||||
|
||||
@RequestMapping(value = "/exportXls3")
|
||||
public ModelAndView exportXls2(HttpServletRequest request, KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
|
||||
public ModelAndView exportXls3(HttpServletRequest request, KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
|
||||
return exportXls3(request, kcExportConfigTpkwcqkjzglx, KcExportConfigTpkwcqkjzglx.class, "人员信息");
|
||||
}
|
||||
public ModelAndView exportXls(HttpServletRequest request, KcExportConfigTpkwcqkjzglx object, Class<KcExportConfigTpkwcqkjzglx> clazz, String title) {
|
||||
|
@ -406,7 +407,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
queryWrapper.in("id",selectionList);
|
||||
}
|
||||
// queryWrapper.eq("zt","在职");
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
// Step.2 获取导出数据
|
||||
List<KcExportConfigTpkwcqkjzglx> exportList = service.list(queryWrapper);
|
||||
|
@ -464,6 +465,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
}
|
||||
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
|
||||
}
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
// 过滤选中数据
|
||||
String selections = request.getParameter("selections");
|
||||
if (oConvertUtils.isNotEmpty(selections)) {
|
||||
|
|
|
@ -139,7 +139,7 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
|
|||
tklxList.add("20");
|
||||
tklxList.add("330");
|
||||
tklxList.add("60");
|
||||
tklxList.add("210,270,280");
|
||||
tklxList.add("50,150,180,210,230,350");//副院长、党委副书记、副部长、学院党委副书记、副书记、常务副书记
|
||||
tklxList.add("110");
|
||||
tklxList.add("10");
|
||||
tklxList.add("40");
|
||||
|
@ -176,7 +176,7 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
|
|||
Map<String, Object> resMap = new HashMap<>();
|
||||
String title = dictUtils.translateDictValue("tpkwcqkjzglx",tklx);
|
||||
resMap.put("title", title);
|
||||
if(StringUtils.equals("210,270,280",tklx)){
|
||||
if(StringUtils.equals("50,150,180,210,230,350",tklx)){
|
||||
resMap.put("title", "学院(部)其他党政领导");
|
||||
}
|
||||
if(StringUtils.equals("70",tklx)||StringUtils.equals("100",tklx)||StringUtils.equals("160",tklx)){
|
||||
|
|
|
@ -247,6 +247,7 @@ public class SyncZwdtEvaluation extends BaseSync {
|
|||
inQw.in("xspg2","A", "B", "C", "D", "E");
|
||||
inQw.in("xspg3","A", "B", "C", "D", "E");
|
||||
inQw.in("ztpj", "A", "B", "C", "D", "E");
|
||||
inQw.eq("tkrxm", "刘芮方");
|
||||
// inQw.last("limit 100");
|
||||
List<Xxhbbkjxtkpj> inDataList = xxhbbkjxtkpjService.list(inQw);
|
||||
List<KcEvaluation> saveMainList = Lists.newArrayList();
|
||||
|
|
|
@ -129,10 +129,10 @@ public class KcWechatSendLogController extends JeecgController<KcWechatSendLog,
|
|||
// 1、xx老师,你好,您本学期(2023秋)听课要求为:5次,当前实际听课次数:3次,请尽快完成本学期的听课任务。
|
||||
// 如需听评课,请点击:课程信息中心(链接)
|
||||
sendMag.put("first", new WeChatTemplateMsg(kcWechatSendLog.getTeacherName()));//授课老师
|
||||
sendMag.put("keyword1", new WeChatTemplateMsg(kcWechatSendLog.getXqxn()));//授课老师
|
||||
sendMag.put("keyword2", new WeChatTemplateMsg("请尽快完成"));//授课老师
|
||||
String message = "应听课次数:"+kcWechatSendLog.getYtkcs()+";实际听课次数:"+kcWechatSendLog.getSjtkcs();
|
||||
sendMag.put("remark", new WeChatTemplateMsg(message));//授课老师
|
||||
sendMag.put("keyword1", new WeChatTemplateMsg("["+kcWechatSendLog.getXqxn()+"]"+kcWechatSendLog.getTeacherName()));//授课老师
|
||||
// String message = "应听"+kcWechatSendLog.getYtkcs()+"次;实听"+kcWechatSendLog.getSjtkcs()+"次,请尽快完成";
|
||||
sendMag.put("keyword2", new WeChatTemplateMsg(kcWechatSendLog.getYtkcs()));//授课老师
|
||||
sendMag.put("remark", new WeChatTemplateMsg(kcWechatSendLog.getYtkcs()));//授课老师
|
||||
// sendMag.put("thing9", new WeChatTemplateMsg(message));//上课时间
|
||||
// sendMag.put("number4", new WeChatTemplateMsg(kcWechatSendLog.getYtkcs()));//应听课次数
|
||||
// sendMag.put("number9", new WeChatTemplateMsg(kcWechatSendLog.getSjtkcs()));//实际听课次数
|
||||
|
|
|
@ -50,12 +50,22 @@
|
|||
</if>
|
||||
GROUP BY tk.userid, tk.username, college
|
||||
) tk LEFT JOIN (
|
||||
SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc
|
||||
FROM kc_assessuser
|
||||
|
||||
select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,max(ytkcs) as tkyq from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
|
||||
and a.xqxn = (select flag1 from kc_sys_config where id = 1)
|
||||
WHERE 1 = 1
|
||||
<if test="kcTingke.tksf!=null and kcTingke.tksf!=''">
|
||||
assesscode = #{kcTingke.tksf}
|
||||
and b.item_value = #{kcTingke.tksf}
|
||||
</if>
|
||||
WHERE 1 = 1 GROUP BY usercode, username
|
||||
GROUP BY gh,xm
|
||||
|
||||
<!-- SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc-->
|
||||
<!-- FROM kc_assessuser-->
|
||||
<!-- <if test="kcTingke.tksf!=null and kcTingke.tksf!=''">-->
|
||||
<!-- assesscode = #{kcTingke.tksf}-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY usercode, username-->
|
||||
) au ON tk.userid = au.usercode
|
||||
ORDER BY sjtksl DESC
|
||||
</select>
|
||||
|
@ -103,9 +113,12 @@
|
|||
FROM kc_ketangbiao k, kc_tingke t, kc_casusers c
|
||||
WHERE k.id = t.kechengbiaoid AND t.userid = c.USER
|
||||
) tk
|
||||
LEFT JOIN (SELECT gh as usercode,xm as username, GROUP_CONCAT(zwmc) assess1
|
||||
FROM kc_tksfrzb
|
||||
GROUP BY gh) sf ON tk.USER = sf.usercode
|
||||
LEFT JOIN (
|
||||
select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,max(ytkcs) as tkyq from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
|
||||
and a.xqxn = (select flag1 from kc_sys_config where id = 1)
|
||||
GROUP BY gh,xm
|
||||
) sf ON tk.USER = sf.usercode
|
||||
left join kc_kechengbiao kcb on tk.kechengbiaoid = kcb.id
|
||||
|
||||
${ew.customSqlSegment}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{xym}学院(部){xqxn}学期听评课制度落实情况
|
||||
|
||||
学院(部)党政领导、学院(部)教务委员会委员、专业负责人、基层教学组织负责人、辅导员、专任教师等人员的听评课情况,建议学院(部)党政领导关注思政课的课堂教学效果。具体要求详见《本科教育教学质量管理实施办法》(附件4)、《关于本科教学听课制度的规定》(附件5)。
|
||||
{xqxn}学期本科教学听课情况表
|
||||
{xym}学院(部)
|
||||
学院(部)党政领导、学院(部)教务委员会委员、专业负责人、基层教学组织负责人、辅导员、专任教师等人员的听评课情况,建议学院(部)党政领导关注思政课的课堂教学效果。具体要求详见《本科教育教学质量管理实施办法》、《关于本科教学听课制度的规定》。
|
||||
{xqxn}学期听课情况:
|
||||
学院(部)教务委员会委员人数:{oneListSize}人
|
||||
姓名
|
||||
|
@ -38,4 +38,3 @@ z
|
|||
z
|
||||
z
|
||||
z
|
||||
|
||||
|
|
Loading…
Reference in New Issue