修改bug
This commit is contained in:
parent
a70068187f
commit
1058aca925
|
@ -205,7 +205,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
|
||||
}
|
||||
// queryWrapper.eq("zt","在职");
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
|
||||
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
|
||||
<select id="getTjlist" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
|
||||
select count(tklx) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and zt = '在职'
|
||||
select count(tklx) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0))
|
||||
and tklx in (${tklx})
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and dwmc = #{dwmc}
|
||||
|
@ -56,7 +56,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 (${tklx})
|
||||
where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${tklx})
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and dwmc = #{dwmc}
|
||||
</if>
|
||||
|
@ -69,7 +69,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 tklx in (${kcExportConfigTpkwcqkjzglx.code})
|
||||
where xqxn = #{kcExportConfigTpkwcqkjzglx.xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${kcExportConfigTpkwcqkjzglx.code})
|
||||
<if test="kcExportConfigTpkwcqkjzglx.dwmc != null and kcExportConfigTpkwcqkjzglx.dwmc != ''">
|
||||
and dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc}
|
||||
</if>
|
||||
|
@ -93,7 +93,7 @@
|
|||
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
|
||||
LEFT JOIN kc_kkdw d on a.dwmc = d.kkdw
|
||||
where xqxn = #{xqxn} and zt = '在职' and tklx in (${code}) and dwjc is not null
|
||||
where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${code}) and dwjc is not null
|
||||
GROUP BY d.dwjc
|
||||
) a
|
||||
</select>
|
||||
|
@ -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
|
||||
<if test="kcExportConfigTpkwcqkjzglx.dwmc != null and kcExportConfigTpkwcqkjzglx.dwmc != ''">
|
||||
and a.dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc}
|
||||
</if>
|
||||
|
@ -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
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and a.dwmc = #{dwmc}
|
||||
</if>
|
||||
|
@ -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})
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and dwmc = #{dwmc}
|
||||
</if>
|
||||
|
|
|
@ -142,6 +142,7 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
|
|||
tklxList.add("210,270,280");
|
||||
tklxList.add("110");
|
||||
tklxList.add("10");
|
||||
tklxList.add("40");
|
||||
// 学校教务委员会 70
|
||||
// 学校督学 100
|
||||
// 校领导 160
|
||||
|
@ -173,47 +174,14 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
|
|||
for(String tklx:tklxList){
|
||||
// KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||
Map<String, Object> 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);
|
||||
|
|
|
@ -159,10 +159,9 @@ public class XxhbtkxxController extends JeecgController<Xxhbtkxx, IXxhbtkxxServi
|
|||
* @param request
|
||||
* @param xxhbtkxx
|
||||
*/
|
||||
@RequiresPermissions("grab.imports:xxhbtkxx:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, Xxhbtkxx xxhbtkxx) {
|
||||
return super.exportXls(request, xxhbtkxx, Xxhbtkxx.class, "同步数据表(tkxx)");
|
||||
return super.exportXls(request, xxhbtkxx, Xxhbtkxx.class, "停课信息");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -34,56 +34,53 @@ public class Xxhbtkxx implements Serializable {
|
|||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
|
||||
@Excel(name = "学年学期", width = 15)
|
||||
@TableField(exist = false)
|
||||
private String xqxn;
|
||||
/**姓名*/
|
||||
@Excel(name = "姓名", width = 15)
|
||||
@ApiModelProperty(value = "姓名")
|
||||
private java.lang.String xm;
|
||||
/**cjr*/
|
||||
@Excel(name = "cjr", width = 15)
|
||||
@Excel(name = "创建人", width = 15)
|
||||
@ApiModelProperty(value = "cjr")
|
||||
private java.lang.String cjr;
|
||||
/**sjh*/
|
||||
@Excel(name = "sjh", width = 15)
|
||||
@Excel(name = "手机号", width = 15)
|
||||
@ApiModelProperty(value = "sjh")
|
||||
private java.lang.String sjh;
|
||||
/**tksy*/
|
||||
@Excel(name = "tksy", width = 15)
|
||||
@Excel(name = "调课事由", width = 15)
|
||||
@ApiModelProperty(value = "tksy")
|
||||
private java.lang.String tksy;
|
||||
/**xyjwmsshyj*/
|
||||
@Excel(name = "xyjwmsshyj", width = 15)
|
||||
@ApiModelProperty(value = "xyjwmsshyj")
|
||||
private java.lang.String xyjwmsshyj;
|
||||
/**yjxq*/
|
||||
@Excel(name = "yjxq", width = 15)
|
||||
@ApiModelProperty(value = "yjxq")
|
||||
private java.lang.String yjxq;
|
||||
/**sqrdw*/
|
||||
@Excel(name = "sqrdw", width = 15)
|
||||
@Excel(name = "申请人单位", width = 15)
|
||||
@ApiModelProperty(value = "sqrdw")
|
||||
private java.lang.String sqrdw;
|
||||
/**bizbh*/
|
||||
@Excel(name = "bizbh", width = 15)
|
||||
@ApiModelProperty(value = "bizbh")
|
||||
private java.lang.String bizbh;
|
||||
/**jwcsh*/
|
||||
@Excel(name = "jwcsh", width = 15)
|
||||
@ApiModelProperty(value = "jwcsh")
|
||||
private java.lang.String jwcsh;
|
||||
/**szxyldshyj*/
|
||||
@Excel(name = "szxyldshyj", width = 15)
|
||||
@ApiModelProperty(value = "szxyldshyj")
|
||||
private java.lang.String szxyldshyj;
|
||||
/**shxq*/
|
||||
@Excel(name = "shxq", width = 15)
|
||||
@ApiModelProperty(value = "shxq")
|
||||
private java.lang.String shxq;
|
||||
/**lcjgbh*/
|
||||
@Excel(name = "lcjgbh", width = 15)
|
||||
@ApiModelProperty(value = "lcjgbh")
|
||||
private java.lang.String lcjgbh;
|
||||
/**bkjh*/
|
||||
@Excel(name = "bkjh", width = 15)
|
||||
@Excel(name = "补课计划", width = 15)
|
||||
@ApiModelProperty(value = "bkjh")
|
||||
private java.lang.String bkjh;
|
||||
/**时间戳*/
|
||||
|
@ -95,7 +92,6 @@ public class Xxhbtkxx implements Serializable {
|
|||
@ApiModelProperty(value = "课程名称")
|
||||
private java.lang.String kcmc;
|
||||
/**pbh*/
|
||||
@Excel(name = "pbh", width = 15)
|
||||
@ApiModelProperty(value = "pbh")
|
||||
private java.lang.String pbh;
|
||||
/**教材*/
|
||||
|
@ -107,15 +103,15 @@ public class Xxhbtkxx implements Serializable {
|
|||
@ApiModelProperty(value = "上课日期")
|
||||
private java.lang.String skrq;
|
||||
/**kcxxbh*/
|
||||
@Excel(name = "kcxxbh", width = 15)
|
||||
@Excel(name = "课程信息编号", width = 15)
|
||||
@ApiModelProperty(value = "kcxxbh")
|
||||
private java.lang.String kcxxbh;
|
||||
/**学期*/
|
||||
@Excel(name = "学期", width = 15)
|
||||
@ApiModelProperty(value = "学期")
|
||||
@Excel(name = "校区", width = 15)
|
||||
@ApiModelProperty(value = "校区")
|
||||
private java.lang.String xq;
|
||||
/**jsgh*/
|
||||
@Excel(name = "jsgh", width = 15)
|
||||
@Excel(name = "教师工号", width = 15)
|
||||
@ApiModelProperty(value = "jsgh")
|
||||
private java.lang.String jsgh;
|
||||
/**编号*/
|
||||
|
@ -123,20 +119,16 @@ public class Xxhbtkxx implements Serializable {
|
|||
@ApiModelProperty(value = "编号")
|
||||
private java.lang.String bh;
|
||||
/**授课教师*/
|
||||
@Excel(name = "授课教师", width = 15)
|
||||
@ApiModelProperty(value = "授课教师")
|
||||
@Excel(name = "授课教室", width = 15)
|
||||
@ApiModelProperty(value = "授课教室")
|
||||
private java.lang.String skjs;
|
||||
/**lcbh*/
|
||||
@Excel(name = "lcbh", width = 15)
|
||||
@ApiModelProperty(value = "lcbh")
|
||||
private java.lang.String lcbh;
|
||||
/**1-调整时间,2-调整地点,3-更换教师,4-其他*/
|
||||
@Excel(name = "1-调整时间,2-调整地点,3-更换教师,4-其他", width = 15)
|
||||
@ApiModelProperty(value = "1-调整时间,2-调整地点,3-更换教师,4-其他")
|
||||
private java.lang.String tklx;
|
||||
@TableField(exist = false)
|
||||
private Integer mysqlnum;
|
||||
@TableField(exist = false)
|
||||
private String xqxn;
|
||||
|
||||
}
|
||||
|
|
|
@ -26,6 +26,12 @@
|
|||
|
||||
</select>
|
||||
|
||||
<select id="selectList" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
|
||||
select a.*,b.title as xqxn from xxhbtkxx a
|
||||
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ <= b.end_time +''
|
||||
${ew.customSqlSegment}
|
||||
|
||||
</select>
|
||||
|
||||
<select id="getDayTklist" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
|
||||
select * from kc_tkxx_view
|
||||
|
|
Loading…
Reference in New Issue