修改思政课问题
This commit is contained in:
parent
62d002fa38
commit
5f8fc96150
|
|
@ -352,25 +352,26 @@ public class KcZzSzkcController extends JeecgController<KcZzSzkc, IKcZzSzkcServi
|
|||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(ans14)){
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper14 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper14.eq("queid","75");
|
||||
kcEvaluationansQueryWrapper14.eq("ordernum",ans14);
|
||||
List<KcEvaluationans> kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper14);
|
||||
if(kcEvaluationansList15!=null && kcEvaluationansList15.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(74);
|
||||
kcEvaluations.setAnsid(0);
|
||||
kcEvaluations.setTextanscontent(ans14);
|
||||
kcEvaluations.setQueid(kcEvaluationansList15.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList15.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper15 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper15.eq("queid","75");
|
||||
kcEvaluationansQueryWrapper15.eq("ordernum",ans15);
|
||||
List<KcEvaluationans> kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper15);
|
||||
if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){
|
||||
if(StringUtils.isNotBlank(ans15)){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId());
|
||||
kcEvaluations.setQueid(74);
|
||||
kcEvaluations.setAnsid(0);
|
||||
kcEvaluations.setTextanscontent(ans15);
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
|
||||
if(StringUtils.isNotBlank(ans16)){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(76);
|
||||
|
|
|
|||
|
|
@ -90,54 +90,64 @@ public class KcZzSzkc implements Serializable {
|
|||
@ApiModelProperty(value = "评课时间")
|
||||
private java.util.Date pksj;
|
||||
/**教学态度*/
|
||||
@Excel(name = "教学态度", width = 15)
|
||||
@ApiModelProperty(value = "教学态度")
|
||||
@Excel(name = "仪表整洁、举止得体、精神饱满", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "仪表整洁、举止得体、精神饱满")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans1;
|
||||
/**教学内容*/
|
||||
@Excel(name = "教学内容", width = 15)
|
||||
@ApiModelProperty(value = "教学内容")
|
||||
@Excel(name = "遵守教学纪律，严格课堂管理", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "遵守教学纪律，严格课堂管理")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans2;
|
||||
/**教学方法*/
|
||||
@Excel(name = "教学方法", width = 15)
|
||||
@ApiModelProperty(value = "教学方法")
|
||||
@Excel(name = "备课充分，精心设计教学（有课件、教案等教学素材），教学投入", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "备课充分，精心设计教学（有课件、教案等教学素材），教学投入")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans3;
|
||||
/**教学效果*/
|
||||
@Excel(name = "教学效果", width = 15)
|
||||
@ApiModelProperty(value = "教学效果")
|
||||
@Excel(name = "坚持马克思主义立场观点方法，具有较为扎实的马克思主义理论功底，教学目标明确", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "坚持马克思主义立场观点方法，具有较为扎实的马克思主义理论功底，教学目标明确")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans4;
|
||||
/**课堂诊断*/
|
||||
@Excel(name = "课堂诊断", width = 15)
|
||||
@ApiModelProperty(value = "课堂诊断")
|
||||
@Excel(name = "有效使用统编教材配套课件、参考讲义、辅导用书，教学内容科学完整，基本理论阐释清楚，基本事实讲述准确，重点、难点比较突出", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "有效使用统编教材配套课件、参考讲义、辅导用书，教学内容科学完整，基本理论阐释清楚，基本事实讲述准确，重点、难点比较突出")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans5;
|
||||
/**总体评价*/
|
||||
@Excel(name = "总体评价", width = 15)
|
||||
@ApiModelProperty(value = "总体评价")
|
||||
@Excel(name = "理论联系实际，熟悉党史、新中国史、改革开放史、社会主义发展史、中华民族发展史，注重史论结合，教学素材多样，案例鲜活生动，及时将新时代中国特色社会主义的生动实践转化为课堂教学资源", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "理论联系实际，熟悉党史、新中国史、改革开放史、社会主义发展史、中华民族发展史，注重史论结合，教学素材多样，案例鲜活生动，及时将新时代中国特色社会主义的生动实践转化为课堂教学资源")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans6;
|
||||
/**指导建议*/
|
||||
@Excel(name = "指导建议", width = 15)
|
||||
@ApiModelProperty(value = "指导建议")
|
||||
@Excel(name = "贴近学生实际，善于发掘身边人身边事蕴含的育人元素，有效回应学生关心问题和思想困惑", width = 15,dicCode = "five_dict")
|
||||
@ApiModelProperty(value = "贴近学生实际，善于发掘身边人身边事蕴含的育人元素，有效回应学生关心问题和思想困惑")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans7;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "熟悉教学法基本原理，注重教学逻辑与学术逻辑的辩证统一，教学设计符合学生认知规律、关注学生差异性", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans8;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "熟练运用启发式、案例式等教学法，注重课堂互动，不照本宣科，善于调动学生积极性，启发学生思考", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans9;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "综合运用现代信息技术手段，增强课堂教学的生动性、吸引力，帮助学生理解领会教学内容", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans10;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "注重思想性和理论性，具有亲和力和感染力，能够把道理讲深、讲透、讲活，学生学习积极性高，愿意与教师交流反馈", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans11;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "注重价值引领，增进对党的创新理论的政治认同、思想认同、理论认同、情感认同，坚定“四个自信”", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans12;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "完成教学计划，课堂秩序良好", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans13;
|
||||
private java.lang.String ans14;
|
||||
@Dict(dicCode = "five_dict")
|
||||
@Excel(name = "总体评价", width = 15,dicCode = "five_dict")
|
||||
private java.lang.String ans15;
|
||||
@Excel(name = "课堂诊断", width = 15)
|
||||
private java.lang.String ans14;
|
||||
@Excel(name = "指导建议", width = 15)
|
||||
private java.lang.String ans16;
|
||||
|
||||
@TableField(exist = false)
|
||||
|
|
|
|||
|
|
@ -435,6 +435,17 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
|
|||
// Step.1 组装查询条件
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
String xnxq = kcTkmx.getXnxq();
|
||||
|
||||
if(StringUtils.isNotBlank(xnxq)){
|
||||
QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
|
||||
kcXqxnHistoryQueryWrapper.eq("title",xnxq);
|
||||
kcXqxnHistoryQueryWrapper.last("limit 1");
|
||||
KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
|
||||
kcTkmx.setStartTime(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
|
||||
kcTkmx.setEndTime(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
|
||||
}
|
||||
|
||||
// 过滤选中数据
|
||||
// Step.2 获取导出数据
|
||||
List<KcTkmx> exportList = kcTingkeService.selectTkmxExportList(kcTkmx);
|
||||
|
|
|
|||
|
|
@ -214,6 +214,8 @@ public class KcTkmx implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String endDate;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String xnxq;
|
||||
/**
|
||||
* 节次
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -77,14 +77,16 @@
|
|||
SELECT tk.userid, tk.username, tksf1, tkyq, sjtksl, mltksl, tkdw
|
||||
FROM ( SELECT tk.userid, tk.username, count( tk.id ) sjtksl,
|
||||
count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl,
|
||||
college AS tkdw , kt.skrq,kt.kcxz
|
||||
FROM kc_tingke tk, kc_ketangbiao kt, kc_casusers cu
|
||||
WHERE tk.kechengbiaoid = kt.id AND tk.userid = cu.`user` AND tk.tingketime > 1
|
||||
cu.dwmc AS tkdw , kt.skrq,kt.kcxz
|
||||
FROM kc_tingke tk, kc_ketangbiao kt, kc_export_config_tpkwcqkjzglx cu
|
||||
WHERE tk.kechengbiaoid = kt.id AND tk.userid = cu.gh AND tk.tingketime > 1
|
||||
<if test="startTime!=null and startTime!=''">
|
||||
AND kt.skrq >= #{startTime}
|
||||
and cu.update_time >= #{startTime}
|
||||
</if>
|
||||
<if test="endTime!=null and endTime!=''">
|
||||
AND kt.skrq <= #{endTime}
|
||||
AND cu.update_time <= CONCAT(#{endTime},' 23:59:59')
|
||||
</if>
|
||||
<if test="szdw!=null and szdw!=''">
|
||||
AND college = #{szdw}
|
||||
|
|
@ -101,7 +103,7 @@
|
|||
<if test="userid!=null and userid!=''">
|
||||
AND tk.userid =#{userid}
|
||||
</if>
|
||||
GROUP BY tk.userid, tk.username, college
|
||||
GROUP BY tk.userid, tk.username, cu.dwmc
|
||||
) tk LEFT JOIN (
|
||||
|
||||
select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,max(ytkcs-0) as tkyq from kc_export_config_tpkwcqkjzglx a
|
||||
|
|
@ -111,6 +113,12 @@
|
|||
<if test="tksf!=null and tksf!=''">
|
||||
and b.item_value = #{tksf}
|
||||
</if>
|
||||
<if test="startTime!=null and startTime!=''">
|
||||
and a.update_time >= #{startTime}
|
||||
</if>
|
||||
<if test="endTime!=null and endTime!=''">
|
||||
AND a.update_time <= CONCAT(#{endTime},' 23:59:59')
|
||||
</if>
|
||||
GROUP BY gh,xm
|
||||
) au ON tk.userid = au.usercode
|
||||
ORDER BY sjtksl DESC
|
||||
|
|
@ -777,15 +785,25 @@
|
|||
|
||||
|
||||
<select id="selectTkmxExportList" resultType="org.jeecg.modules.kc.tktj.entity.KcTkmx">
|
||||
SELECT tk.id, tk.user as userid, tk.cn as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime
|
||||
|
||||
SELECT tk.id, tk.userid as userid, tk.username as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime,tk.xnxq,
|
||||
if(kcb.szkc='1','是','否') as szkc
|
||||
FROM
|
||||
( SELECT k.*, t.tingketime, c.USER, c.college, c.cn
|
||||
FROM kc_ketangbiao k, kc_tingke t, kc_casusers c
|
||||
WHERE k.id = t.kechengbiaoid AND t.userid = c.USER
|
||||
( SELECT k.*, t.tingketime, c.USER, c.college, c.cn,
|
||||
t.username,
|
||||
t.userid
|
||||
FROM kc_tingke t
|
||||
LEFT JOIN kc_ketangbiao k on t.kechengbiaoid = k.id
|
||||
LEFT JOIN kc_casusers c on t.userid = c.`user`
|
||||
) tk
|
||||
LEFT JOIN (SELECT usercode,username, GROUP_CONCAT(assess1) assess1
|
||||
FROM kc_assessuser
|
||||
GROUP BY usercode) 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-0) 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.userid = sf.usercode
|
||||
left join kc_kechengbiao kcb on tk.kechengbiaoid = kcb.id
|
||||
|
||||
<where>
|
||||
<if test="tksf !=null and tksf != ''">
|
||||
and sf.assesscode = #{tksf}
|
||||
|
|
|
|||
|
|
@ -77,6 +77,14 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl<WjxWjxxTmlbMapper, WjxWj
|
|||
//2.子表数据重新插入
|
||||
if(wjxWjxxTmxxList!=null && wjxWjxxTmxxList.size()>0) {
|
||||
for(WjxWjxxTmxx entity:wjxWjxxTmxxList) {
|
||||
String itemSelected[] = wjxWjxxTmlb.getItemSelected().split(",");
|
||||
String sfxz = wjxWjxxTmlb.getItemSelected();
|
||||
for(String par:itemSelected){
|
||||
if(StringUtils.equals(par, entity.getItemIndex().toString())){
|
||||
sfxz = "true";
|
||||
}
|
||||
}
|
||||
entity.setItemSelected(sfxz);
|
||||
//外键设置
|
||||
entity.setWjIndex(wjxWjxxTmlb.getWjIndex());
|
||||
wjxWjxxTmxxMapper.insert(entity);
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
ZyInfo zyInfo = zyInfoService.getById(object.getMainId());
|
||||
ZyInfo zyInfo = zyInfoService.getById(object.getYwid());
|
||||
|
||||
SysUser teacher = sysUserService.getUserByName(zyInfo.getCreateBy());
|
||||
// 过滤选中数据
|
||||
|
|
@ -558,6 +558,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
List<String> selectionList = Arrays.asList(selections.split(","));
|
||||
queryWrapper.in("a.id",selectionList);
|
||||
}
|
||||
queryWrapper.eq("main_id",zyInfo.getId());
|
||||
// Step.2 获取导出数据
|
||||
List<ZyInfoStudent> exportList = service.list(queryWrapper);
|
||||
|
||||
|
|
@ -568,7 +569,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
mv.addObject(NormalExcelConstants.CLASS, clazz);
|
||||
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
|
||||
// 课程名称:毕业论文 考试类型:考试-期末考试 打印日期:2024-05-11
|
||||
String twoTitle = "课程名称:"+zyInfo.getTitle()+" 授课教师："+teacher.getRealname()+" 作业占比："+zyInfo.getScore()+"% 打印日期:"+ DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
|
||||
String twoTitle = "作业名称:"+zyInfo.getTitle()+" 授课教师："+teacher.getRealname()+" 作业占比："+zyInfo.getScore()+"% 打印日期:"+ DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
|
||||
ExportParams exportParams=new ExportParams("[第"+zyInfo.getSort()+"次作业] "+title + "报表", twoTitle+" 导出人:" + sysUser.getRealname(), title);
|
||||
exportParams.setImageBasePath(upLoadPath);
|
||||
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue