From a8c912f83d8f08449fcbb0a80221dda3f782e073 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 3 Jun 2023 12:09:50 +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 --- .../controller/KcZzThpjbController.java | 334 +++++++++++------- .../kc/kcZzThpjb/entity/KcZzThpjb.java | 74 ++-- .../controller/KcZzXstkbController.java | 63 ++-- .../controller/KcZzYbtkbController.java | 82 ++--- .../modules/kc/tktj/entity/KcTingke.java | 4 + .../kc/tktj/mapper/xml/KcTingkeMapper.xml | 4 +- 6 files changed, 316 insertions(+), 245 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java index 87e3715a..a661cc75 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java @@ -215,7 +215,7 @@ public class KcZzThpjbController extends JeecgController0){ errNum++; newList.remove(KcZzThpjbPar); - errorRest += KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"
"; + errorRest += "数据重复："+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"
"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); @@ -226,25 +226,115 @@ public class KcZzThpjbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); - String ans1 = KcZzThpjbPar.getAns1();//25 授课有启发性，能给予学生思考、联想、创造的启迪 - String ans2 = KcZzThpjbPar.getAns2();//26 能有效利用各种教学媒体，课件或板书使用效果好 - String ans3 = KcZzThpjbPar.getAns3();//27 仪表得体，按时上下课，严格要求学生 - String ans4 = KcZzThpjbPar.getAns4();//23 讲课有热情，精神饱满，能调动学生情绪，课堂气氛活跃 - String ans5 = KcZzThpjbPar.getAns5();//24 教学目标明确，内容丰富，重点突出，语言表达清楚 - String ans6 = KcZzThpjbPar.getAns6();//28 无迟到、早退、旷课现象 - String ans7 = KcZzThpjbPar.getAns7();//29 课堂教学秩序好，无喧闹、打瞌睡、发短信、玩手机等现象 - String ans8 = KcZzThpjbPar.getAns8();//30 上课认真听讲、积极思考，主动与老师交流互动 - String ans9 = KcZzThpjbPar.getAns9();//31 课堂教学总体印象评价 - String ans10 = KcZzThpjbPar.getAns10();//32 对课堂内容以及其他方面的具体意见或建议 - String ans11 = KcZzThpjbPar.getAns11();//32 对课堂内容以及其他方面的具体意见或建议 - String ans12 = KcZzThpjbPar.getAns12();//32 对课堂内容以及其他方面的具体意见或建议 - String ans13 = KcZzThpjbPar.getAns13();//32 对课堂内容以及其他方面的具体意见或建议 - String ans14 = KcZzThpjbPar.getAns14();//32 对课堂内容以及其他方面的具体意见或建议 - String ans15 = KcZzThpjbPar.getAns15();//32 对课堂内容以及其他方面的具体意见或建议 - String ans16 = KcZzThpjbPar.getAns16();//32 对课堂内容以及其他方面的具体意见或建议 - String ans17 = KcZzThpjbPar.getAns17();//32 对课堂内容以及其他方面的具体意见或建议 - String ans18 = KcZzThpjbPar.getAns18();//32 对课堂内容以及其他方面的具体意见或建议 - String ans19 = KcZzThpjbPar.getAns19();//32 对课堂内容以及其他方面的具体意见或建议 + + String ans1 = KcZzThpjbPar.getAns1();// + String ans2 = KcZzThpjbPar.getAns2();// + String ans3 = KcZzThpjbPar.getAns3();// + String ans4 = KcZzThpjbPar.getAns4();// + String ans5 = KcZzThpjbPar.getAns5();// + String ans6 = KcZzThpjbPar.getAns6();// + String ans7 = KcZzThpjbPar.getAns7();// + String ans8 = KcZzThpjbPar.getAns8();// + String ans9 = KcZzThpjbPar.getAns9();// + String ans10 = KcZzThpjbPar.getAns10();// + String ans11 = KcZzThpjbPar.getAns11();// + String ans12 = KcZzThpjbPar.getAns12();// + String ans13 = KcZzThpjbPar.getAns13();// + String ans14 = KcZzThpjbPar.getAns14();// + String ans15 = KcZzThpjbPar.getAns15();// + String ans16 = KcZzThpjbPar.getAns16();// + String ans17 = KcZzThpjbPar.getAns17();// + String ans18 = KcZzThpjbPar.getAns18();// + String ans19 = KcZzThpjbPar.getAns19();// + + String jxlj = KcZzThpjbPar.getJxlj(); + if(StringUtils.isBlank(jxlj)){ + jxlj = "0"; + } + int dqfs1 = Integer.parseInt(jxlj) / 3; + ans1 = dqfs1+""; + ans2 = dqfs1 +""; + ans3 = (Integer.parseInt(jxlj) - dqfs1-dqfs1)+""; + if(Integer.parseInt(ans1)>5){ans1="5";} + if(Integer.parseInt(ans2)>5){ans2="5";} + if(Integer.parseInt(ans3)>5){ans3="5";} +// 教学理解（10分） +// 33 具有教育理想、敬业精神和教学追求，热爱学生、学科和教学工作。 +// 34 掌握所教学科必需的专业与教学知识。具备所教学科的教学设计、实施、评价、反思和研究能力。 +// 35 把握学生身心发展规律与特点，尊重学生主体性与差异性。 + String jxtd = KcZzThpjbPar.getJxtd(); + if(StringUtils.isBlank(jxtd)){ + jxtd = "0"; + } + int dqfs2 = Integer.parseInt(jxtd) / 2; + ans4 = dqfs2+""; + ans5 = (Integer.parseInt(jxtd) - dqfs2)+""; + if(Integer.parseInt(ans4)>5){ans4="5";} + if(Integer.parseInt(ans5)>5){ans5="5";} +// 教学态度（10分） +// 36 立德树人，为人师表，语言规范，情绪饱满，思想积极向上。 +// 37 执行教学计划，遵守教学纪律，严谨从教。 + String jxgc = KcZzThpjbPar.getJxgc(); + if(StringUtils.isBlank(jxgc)){ + jxgc = "0"; + } + int dqfs3 = Integer.parseInt(jxgc) / 3; + ans6 = dqfs3+""; + ans7 = dqfs3 +""; + ans8 = dqfs3 +""; + ans9 = dqfs3 +""; + ans10 = (Integer.parseInt(jxgc) - dqfs3-dqfs3-dqfs3-dqfs3)+""; + if(Integer.parseInt(ans6)>5){ans6="5";} + if(Integer.parseInt(ans7)>5){ans7="5";} + if(Integer.parseInt(ans8)>5){ans8="5";} + if(Integer.parseInt(ans9)>5){ans9="5";} + if(Integer.parseInt(ans10)>5){ans10="5";} +// 教学过程（30分） +// 38 系统规划和设计教学活动，合理确定教学目标和教学内容的重难点，选择合适的教学方法、教学媒体和教学形式。 +// 39 清晰讲解课程内容，恰当解释知识中蕴含的本源性思想和学科方法，适时引导学生关注课程领域发展新动态。 +// 40 启发学生思考，鼓励学生发现、提出问题，恰当给予回应和引导。 +// 41 监控教学过程，富有教学机智，教学体现生成性。 +// 42 运用多元评价方式，了解学习状况，诊断学习问题，及时反馈。 + String jxxg = KcZzThpjbPar.getJxxg(); + if(StringUtils.isBlank(jxxg)){ + jxxg = "0"; + } + int dqfs4 = Integer.parseInt(jxxg) / 2; + ans11 = dqfs4+""; + ans12 = (Integer.parseInt(jxxg) - dqfs4)+""; + if(Integer.parseInt(ans11)>5){ans11="5";} + if(Integer.parseInt(ans12)>5){ans12="5";} +// 教学效果（30分） +// 43 学习认真积极，踊跃参与课堂活动，体会课程学习的挑战与乐趣，感悟课程的意义与价值。 +// 44 掌握所学课程的基本概念与原理，理解课程的知识结构与思想体系，了解所学知识的运用情境、策略和方法。 + String jxts = KcZzThpjbPar.getJxts(); + if(StringUtils.isBlank(jxts)){ + jxts = "0"; + } + int dqfs5 = Integer.parseInt(jxts) / 3; + ans13 = dqfs5+""; + ans14 = dqfs5 +""; + ans15 = (Integer.parseInt(jxts) - dqfs5-dqfs5)+""; + if(Integer.parseInt(ans13)>5){ans13="5";} + if(Integer.parseInt(ans14)>5){ans14="5";} + if(Integer.parseInt(ans15)>5){ans15="5";} +// 教学特色（20分） +// 45 遵循教学一般规律，具有鲜明的创新意识和个性风貌。 +// 46 尊重学科本质属性，凸显学科育人价值，注重培养学科核心素养。 +// 47 课堂教学蕴含理性美，具有教学魅力，体现教学艺术性。 + + + + + + +// 48 你对该课程的总体评价情况，5分是满分，您给打几分？ +// 49 您认为该课堂值得肯定的方面 +// 50 您认为该课堂需要改进的方面 +// 51 其它建议 + + + int upuserid = Integer.parseInt(KcZzThpjbPar.getPkjsbh()); String upuser = KcZzThpjbPar.getPkjsxm(); Date tkrq = KcZzThpjbPar.getPjsj(); @@ -268,103 +358,89 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper10 = new QueryWrapper<>(); kcEvaluationansQueryWrapper10.eq("queid","42"); - kcEvaluationansQueryWrapper10.eq("ordernum",ans9); + kcEvaluationansQueryWrapper10.eq("ordernum",ans10); List kcEvaluationansList10 = kcEvaluationansService.list(kcEvaluationansQueryWrapper10); if(kcEvaluationansList10!=null && kcEvaluationansList10.size()>0){ kcEvaluations.setId(null); @@ -495,7 +571,7 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper11 = new QueryWrapper<>(); kcEvaluationansQueryWrapper11.eq("queid","43"); - kcEvaluationansQueryWrapper11.eq("ordernum",ans9); + kcEvaluationansQueryWrapper11.eq("ordernum",ans11); List kcEvaluationansList11 = kcEvaluationansService.list(kcEvaluationansQueryWrapper11); if(kcEvaluationansList11!=null && kcEvaluationansList11.size()>0){ kcEvaluations.setId(null); @@ -506,7 +582,7 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper12 = new QueryWrapper<>(); kcEvaluationansQueryWrapper12.eq("queid","44"); - kcEvaluationansQueryWrapper12.eq("ordernum",ans9); + kcEvaluationansQueryWrapper12.eq("ordernum",ans12); List kcEvaluationansList12 = kcEvaluationansService.list(kcEvaluationansQueryWrapper12); if(kcEvaluationansList12!=null && kcEvaluationansList12.size()>0){ kcEvaluations.setId(null); @@ -517,7 +593,7 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper13 = new QueryWrapper<>(); kcEvaluationansQueryWrapper13.eq("queid","45"); - kcEvaluationansQueryWrapper13.eq("ordernum",ans9); + kcEvaluationansQueryWrapper13.eq("ordernum",ans13); List kcEvaluationansList13 = kcEvaluationansService.list(kcEvaluationansQueryWrapper13); if(kcEvaluationansList13!=null && kcEvaluationansList13.size()>0){ kcEvaluations.setId(null); @@ -528,7 +604,7 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper14 = new QueryWrapper<>(); kcEvaluationansQueryWrapper14.eq("queid","46"); - kcEvaluationansQueryWrapper14.eq("ordernum",ans9); + kcEvaluationansQueryWrapper14.eq("ordernum",ans14); List kcEvaluationansList14 = kcEvaluationansService.list(kcEvaluationansQueryWrapper14); if(kcEvaluationansList14!=null && kcEvaluationansList14.size()>0){ kcEvaluations.setId(null); @@ -539,7 +615,7 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper15 = new QueryWrapper<>(); kcEvaluationansQueryWrapper15.eq("queid","47"); - kcEvaluationansQueryWrapper15.eq("ordernum",ans9); + kcEvaluationansQueryWrapper15.eq("ordernum",ans15); List kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper15); if(kcEvaluationansList15!=null && kcEvaluationansList15.size()>0){ kcEvaluations.setId(null); @@ -548,32 +624,32 @@ public class KcZzThpjbController extends JeecgController kcEvaluationansQueryWrapper16 = new QueryWrapper<>(); - kcEvaluationansQueryWrapper16.eq("queid","48"); - kcEvaluationansQueryWrapper16.eq("ordernum",ans9); - List kcEvaluationansList16 = kcEvaluationansService.list(kcEvaluationansQueryWrapper16); - if(kcEvaluationansList16!=null && kcEvaluationansList16.size()>0){ - kcEvaluations.setId(null); - kcEvaluations.setQueid(kcEvaluationansList16.get(0).getQueid()); - kcEvaluations.setAnsid(kcEvaluationansList16.get(0).getId()); - kcEvaluationsService.save(kcEvaluations); - } - - - if(StringUtils.isNotBlank(ans17)){ - kcEvaluations.setId(null); - kcEvaluations.setQueid(49); - kcEvaluations.setAnsid(0); - kcEvaluations.setTextanscontent(ans17); - kcEvaluationsService.save(kcEvaluations); - } - if(StringUtils.isNotBlank(ans18)){ - kcEvaluations.setId(null); - kcEvaluations.setQueid(50); - kcEvaluations.setAnsid(0); - kcEvaluations.setTextanscontent(ans18); - kcEvaluationsService.save(kcEvaluations); - } +// QueryWrapper kcEvaluationansQueryWrapper16 = new QueryWrapper<>(); +// kcEvaluationansQueryWrapper16.eq("queid","48"); +// kcEvaluationansQueryWrapper16.eq("ordernum",ans16); +// List kcEvaluationansList16 = kcEvaluationansService.list(kcEvaluationansQueryWrapper16); +// if(kcEvaluationansList16!=null && kcEvaluationansList16.size()>0){ +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(kcEvaluationansList16.get(0).getQueid()); +// kcEvaluations.setAnsid(kcEvaluationansList16.get(0).getId()); +// kcEvaluationsService.save(kcEvaluations); +// } +// +// +// if(StringUtils.isNotBlank(ans17)){ +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(49); +// kcEvaluations.setAnsid(0); +// kcEvaluations.setTextanscontent(ans17); +// kcEvaluationsService.save(kcEvaluations); +// } +// if(StringUtils.isNotBlank(ans18)){ +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(50); +// kcEvaluations.setAnsid(0); +// kcEvaluations.setTextanscontent(ans18); +// kcEvaluationsService.save(kcEvaluations); +// } if(StringUtils.isNotBlank(ans19)){ kcEvaluations.setId(null); kcEvaluations.setQueid(51); @@ -600,7 +676,7 @@ public class KcZzThpjbController extends JeecgController"+errorRest; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java index 9f10d546..3a6882de 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java @@ -73,6 +73,20 @@ public class KcZzThpjb implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "授课时间") private java.util.Date sksj; + /**评价时间*/ + @Excel(name = "评价时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "评价时间") + private java.util.Date pjsj; + /**评课教师工号*/ + @Excel(name = "评课教师工号", width = 15) + @ApiModelProperty(value = "评课教师工号") + private java.lang.String pkjsbh; + /**评课教师姓名*/ + @Excel(name = "评课教师姓名", width = 15) + @ApiModelProperty(value = "评课教师姓名") + private java.lang.String pkjsxm; /**上课地点*/ @Excel(name = "上课地点", width = 15) @ApiModelProperty(value = "上课地点") @@ -82,131 +96,123 @@ public class KcZzThpjb implements Serializable { @ApiModelProperty(value = "使用教材") private java.lang.String syjc; /**教学理解*/ + @Excel(name = "教学理解", width = 15) @ApiModelProperty(value = "教学理解") private java.lang.String jxlj; /**教学态度*/ + @Excel(name = "教学态度", width = 15) @ApiModelProperty(value = "教学态度") private java.lang.String jxtd; /**教学过程*/ + @Excel(name = "教学过程", width = 15) @ApiModelProperty(value = "教学过程") private java.lang.String jxgc; /**教学效果*/ + @Excel(name = "教学效果", width = 15) @ApiModelProperty(value = "教学效果") private java.lang.String jxxg; /**教学特殊*/ + @Excel(name = "教学特殊", width = 15) @ApiModelProperty(value = "教学特殊") private java.lang.String jxts; /**总分*/ + @Excel(name = "总分", width = 15) @ApiModelProperty(value = "总分") private java.lang.String zf; /**优点或建议*/ + @Excel(name = "优点或建议", width = 15) @ApiModelProperty(value = "优点或建议") private java.lang.String ydhjy; - /**评价时间*/ - @Excel(name = "评价时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "评价时间") - private java.util.Date pjsj; - - /**评课教师工号*/ - @Excel(name = "评课教师工号", width = 15) - @ApiModelProperty(value = "评课教师工号") - private java.lang.String pkjsbh; - /**评课教师姓名*/ - @Excel(name = "评课教师姓名", width = 15) - @ApiModelProperty(value = "评课教师姓名") - private java.lang.String pkjsxm; /**1.具有教育理想、敬业精神和教学追求，热爱学生、学科和教学工作。*/ - @Excel(name = "1.具有教育理想、敬业精神和教学追求，热爱学生、学科和教学工作。", width = 15, dicCode = "five_dict") +// @Excel(name = "1.具有教育理想、敬业精神和教学追求，热爱学生、学科和教学工作。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "1.具有教育理想、敬业精神和教学追求，热爱学生、学科和教学工作。") @Dict(dicCode = "five_dict") private java.lang.String ans1; /**2.掌握所教学科必需的专业与教学知识。具备所教学科的教学设计、实施、评价、反思和研究能力。*/ - @Excel(name = "2.掌握所教学科必需的专业与教学知识。具备所教学科的教学设计、实施、评价、反思和研究能力。", width = 15, dicCode = "five_dict") +// @Excel(name = "2.掌握所教学科必需的专业与教学知识。具备所教学科的教学设计、实施、评价、反思和研究能力。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "2.掌握所教学科必需的专业与教学知识。具备所教学科的教学设计、实施、评价、反思和研究能力。") @Dict(dicCode = "five_dict") private java.lang.String ans2; /**3.把握学生身心发展规律与特点，尊重学生主体性与差异性。*/ - @Excel(name = "3.把握学生身心发展规律与特点，尊重学生主体性与差异性。", width = 15, dicCode = "five_dict") +// @Excel(name = "3.把握学生身心发展规律与特点，尊重学生主体性与差异性。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "3.把握学生身心发展规律与特点，尊重学生主体性与差异性。") @Dict(dicCode = "five_dict") private java.lang.String ans3; /**4.立德树人，为人师表，语言规范，情绪饱满，思想积极向上*/ - @Excel(name = "4.立德树人，为人师表，语言规范，情绪饱满，思想积极向上", width = 15, dicCode = "five_dict") +// @Excel(name = "4.立德树人，为人师表，语言规范，情绪饱满，思想积极向上", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "4.立德树人，为人师表，语言规范，情绪饱满，思想积极向上") @Dict(dicCode = "five_dict") private java.lang.String ans4; /**5.执行教学计划，遵守教学纪律，严谨从教*/ - @Excel(name = "5.执行教学计划，遵守教学纪律，严谨从教", width = 15, dicCode = "five_dict") +// @Excel(name = "5.执行教学计划，遵守教学纪律，严谨从教", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "5.执行教学计划，遵守教学纪律，严谨从教") @Dict(dicCode = "five_dict") private java.lang.String ans5; /**6.系统规划和设计教学活动，合理确定教学目标和教学内容的重难点，选择合适的教学方法、教学媒体和教学形式*/ - @Excel(name = "6.系统规划和设计教学活动，合理确定教学目标和教学内容的重难点，选择合适的教学方法、教学媒体和教学形式", width = 15, dicCode = "five_dict") +// @Excel(name = "6.系统规划和设计教学活动，合理确定教学目标和教学内容的重难点，选择合适的教学方法、教学媒体和教学形式", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "6.系统规划和设计教学活动，合理确定教学目标和教学内容的重难点，选择合适的教学方法、教学媒体和教学形式") @Dict(dicCode = "five_dict") private java.lang.String ans6; /**7.清晰讲解课程内容，恰当解释知识中蕴含的本源性思想和学科方法，适时引导学生关注课程领域发展新动态。*/ - @Excel(name = "7.清晰讲解课程内容，恰当解释知识中蕴含的本源性思想和学科方法，适时引导学生关注课程领域发展新动态。", width = 15, dicCode = "five_dict") +// @Excel(name = "7.清晰讲解课程内容，恰当解释知识中蕴含的本源性思想和学科方法，适时引导学生关注课程领域发展新动态。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "7.清晰讲解课程内容，恰当解释知识中蕴含的本源性思想和学科方法，适时引导学生关注课程领域发展新动态。") @Dict(dicCode = "five_dict") private java.lang.String ans7; /**8.启发学生思考，鼓励学生发现、提出问题，恰当给予回应和引导。*/ - @Excel(name = "8.启发学生思考，鼓励学生发现、提出问题，恰当给予回应和引导。", width = 15, dicCode = "five_dict") +// @Excel(name = "8.启发学生思考，鼓励学生发现、提出问题，恰当给予回应和引导。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "8.启发学生思考，鼓励学生发现、提出问题，恰当给予回应和引导。") @Dict(dicCode = "five_dict") private java.lang.String ans8; /**9.监控教学过程，富有教学机智，教学体现生成性。*/ - @Excel(name = "9.监控教学过程，富有教学机智，教学体现生成性。", width = 15, dicCode = "five_dict") +// @Excel(name = "9.监控教学过程，富有教学机智，教学体现生成性。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "9.监控教学过程，富有教学机智，教学体现生成性。") @Dict(dicCode = "five_dict") private java.lang.String ans9; /**10.运用多元评价方式，了解学习状况，诊断学习问题，及时反馈*/ - @Excel(name = "10.运用多元评价方式，了解学习状况，诊断学习问题，及时反馈", width = 15, dicCode = "five_dict") +// @Excel(name = "10.运用多元评价方式，了解学习状况，诊断学习问题，及时反馈", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "10.运用多元评价方式，了解学习状况，诊断学习问题，及时反馈") @Dict(dicCode = "five_dict") private java.lang.String ans10; /**11.学习认真积极，踊跃参与课堂活动，体会课程学习的挑战与乐趣，感悟课程的意义与价值。*/ - @Excel(name = "11.学习认真积极，踊跃参与课堂活动，体会课程学习的挑战与乐趣，感悟课程的意义与价值。", width = 15, dicCode = "five_dict") +// @Excel(name = "11.学习认真积极，踊跃参与课堂活动，体会课程学习的挑战与乐趣，感悟课程的意义与价值。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "11.学习认真积极，踊跃参与课堂活动，体会课程学习的挑战与乐趣，感悟课程的意义与价值。") @Dict(dicCode = "five_dict") private java.lang.String ans11; /**12.掌握所学课程的基本概念与原理，理解课程的知识结构与思想体系，了解所学知识的运用情境、策略和方法。*/ - @Excel(name = "12.掌握所学课程的基本概念与原理，理解课程的知识结构与思想体系，了解所学知识的运用情境、策略和方法。", width = 15, dicCode = "five_dict") +// @Excel(name = "12.掌握所学课程的基本概念与原理，理解课程的知识结构与思想体系，了解所学知识的运用情境、策略和方法。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "12.掌握所学课程的基本概念与原理，理解课程的知识结构与思想体系，了解所学知识的运用情境、策略和方法。") @Dict(dicCode = "five_dict") private java.lang.String ans12; /**13.遵循教学一般规律，具有鲜明的创新意识和个性风貌。*/ - @Excel(name = "13.遵循教学一般规律，具有鲜明的创新意识和个性风貌。", width = 15, dicCode = "five_dict") +// @Excel(name = "13.遵循教学一般规律，具有鲜明的创新意识和个性风貌。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "13.遵循教学一般规律，具有鲜明的创新意识和个性风貌。") @Dict(dicCode = "five_dict") private java.lang.String ans13; /**14.尊重学科本质属性，凸显学科育人价值，注重培养学科核心素养。*/ - @Excel(name = "14.尊重学科本质属性，凸显学科育人价值，注重培养学科核心素养。", width = 15, dicCode = "five_dict") +// @Excel(name = "14.尊重学科本质属性，凸显学科育人价值，注重培养学科核心素养。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "14.尊重学科本质属性，凸显学科育人价值，注重培养学科核心素养。") @Dict(dicCode = "five_dict") private java.lang.String ans14; /**15.课堂教学蕴含理性美，具有教学魅力，体现教学艺术性。*/ - @Excel(name = "15.课堂教学蕴含理性美，具有教学魅力，体现教学艺术性。", width = 15, dicCode = "five_dict") +// @Excel(name = "15.课堂教学蕴含理性美，具有教学魅力，体现教学艺术性。", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "15.课堂教学蕴含理性美，具有教学魅力，体现教学艺术性。") @Dict(dicCode = "five_dict") private java.lang.String ans15; /**16.你对该课程的总体评价情况，5分是满分，您给打几分？*/ - @Excel(name = "16.你对该课程的总体评价情况，5分是满分，您给打几分？", width = 15, dicCode = "five_dict") +// @Excel(name = "16.你对该课程的总体评价情况，5分是满分，您给打几分？", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "16.你对该课程的总体评价情况，5分是满分，您给打几分？") @Dict(dicCode = "five_dict") private java.lang.String ans16; /**17.您认为该课堂值得肯定的方面*/ - @Excel(name = "17.您认为该课堂值得肯定的方面", width = 15, dicCode = "five_dict") +// @Excel(name = "17.您认为该课堂值得肯定的方面", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "17.您认为该课堂值得肯定的方面") private java.lang.String ans17; /**18.您认为该课堂需要改进的方面*/ - @Excel(name = "18.您认为该课堂需要改进的方面", width = 15, dicCode = "five_dict") +// @Excel(name = "18.您认为该课堂需要改进的方面", width = 15, dicCode = "five_dict") @ApiModelProperty(value = "18.您认为该课堂需要改进的方面") private java.lang.String ans18; /**19.其它建议*/ - @Excel(name = "19.其它建议", width = 15) +// @Excel(name = "19.其它建议", width = 15) @ApiModelProperty(value = "19.其它建议") private java.lang.String ans19; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java index 32b3f07a..4ad6ef9a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java @@ -263,54 +263,47 @@ public class KcZzXstkbController extends JeecgController kcEvaluationansQueryWrapper1 = new QueryWrapper<>(); kcEvaluationansQueryWrapper1.eq("queid","11"); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java index 778e0d1f..180f9d75 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java @@ -259,68 +259,60 @@ public class KcZzYbtkbController extends JeecgController kcEvaluationansQueryWrapper1 = new QueryWrapper<>(); kcEvaluationansQueryWrapper1.eq("queid","25"); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java index 6b9c99f1..cc177f21 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java @@ -217,5 +217,9 @@ public class KcTingke implements Serializable { */ @TableField(exist = false) private String hh; + + @TableField(exist = false) + private String score; + // private java.lang.String tingketime; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index 019f9e24..756d4325 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -412,7 +412,7 @@ SELECT tingketime, tkrq, shijian, hq, mq, tk.kcmc, tk.ketangbiaoid, tk.skjs, tk.kkdw, tk.userid, tk.hh, tk.WEEK, - ev.evaluationid, ev.evaluationver, ev.score, suibi.id as suibiId ,suibi.notes as suibiNotes , + ev.evaluationid, ev.evaluationver, ev.score,ev.source, suibi.id as suibiId ,suibi.notes as suibiNotes , tk.skdd, tk.skrq, tkpj.bh,tk.kcbh FROM ( @@ -444,7 +444,7 @@ ) tk LEFT JOIN ( SELECT - ev.id AS evaluationid, ev.evaluationver, evs.ketangbiaoid, ea.score + ev.id AS evaluationid, ev.evaluationver, evs.ketangbiaoid, ea.score,ev.source FROM kc_evaluation ev, kc_evaluations evs,