Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java
# Conflicts: # jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java
This commit is contained in:
commit
9929d5ce80
|
|
@ -300,7 +300,7 @@
|
|||
|
||||
|
||||
<select id="groupTklxList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
|
||||
select max(id) as id,gh,GROUP_CONCAT(tklx) as tklx,dwmc,xm,sf,zt,max(ytkcs) as ytkcs,rjzy,xqxn
|
||||
select max(id) as id,gh,GROUP_CONCAT(tklx) as tklx,dwmc,xm,sf,zt,max(ytkcs-0) as ytkcs,rjzy,xqxn
|
||||
from kc_export_config_tpkwcqkjzglx
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,256 @@
|
|||
package org.jeecg.modules.kc.grab.SynchronizationService;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
|
||||
import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat;
|
||||
import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService;
|
||||
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
|
||||
import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
public class SyncEvaluationsThpjbNewStat extends BaseSync {
|
||||
|
||||
@Autowired
|
||||
private IKcEvaluationsStatService kcEvaluationsStatService;
|
||||
|
||||
@Autowired
|
||||
private IKcSysConfigService kcSysConfigService;
|
||||
|
||||
/**
|
||||
* 若参数变量名修改 QuartzJobController中也需对应修改
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void execute(JobExecutionContext jobExecutionContext) {
|
||||
start();
|
||||
run(getParamMap());
|
||||
end();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 有参定时任务实现
|
||||
* @param param
|
||||
*/
|
||||
public void run(Map<String, Object> param){
|
||||
List<KcEvaluationsStat> thpjblist = kcEvaluationsStatService.getXbthpjbpcSyncList();
|
||||
|
||||
|
||||
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||
|
||||
for(KcEvaluationsStat KcEvaluationsStat:thpjblist){
|
||||
KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1());
|
||||
List<KcEvaluationsStat> entityList = kcEvaluationsStatService.getXbthpjbSyncList(KcEvaluationsStat);
|
||||
if(entityList!=null && entityList.size()>0){
|
||||
KcEvaluationsStat entity = entityList.get(0);
|
||||
String col78113 = entity.getCol78113();
|
||||
if(col78113.length()>0){
|
||||
System.out.println("xbthpjb----"+entity.getCol00());
|
||||
String arr[] = col78113.split("@");
|
||||
try {
|
||||
entity.setCol79(arr[1]);
|
||||
}catch (Exception e){
|
||||
entity.setCol79("");
|
||||
}
|
||||
try {
|
||||
entity.setCol80(arr[2]);
|
||||
}catch (Exception e){
|
||||
entity.setCol80("");
|
||||
}
|
||||
try {
|
||||
entity.setCol81(arr[3]);
|
||||
}catch (Exception e){
|
||||
entity.setCol81("");
|
||||
}
|
||||
try {
|
||||
entity.setCol82(arr[4]);
|
||||
}catch (Exception e){
|
||||
entity.setCol82("");
|
||||
}
|
||||
try {
|
||||
entity.setCol83(arr[5]);
|
||||
}catch (Exception e){
|
||||
entity.setCol83("");
|
||||
}
|
||||
try {
|
||||
entity.setCol84(arr[6]);
|
||||
}catch (Exception e){
|
||||
entity.setCol84("");
|
||||
}
|
||||
try {
|
||||
entity.setCol85(arr[7]);
|
||||
}catch (Exception e){
|
||||
entity.setCol85("");
|
||||
}
|
||||
try {
|
||||
entity.setCol86(arr[8]);
|
||||
}catch (Exception e){
|
||||
entity.setCol86("");
|
||||
}
|
||||
try {
|
||||
entity.setCol87(arr[9]);
|
||||
}catch (Exception e){
|
||||
entity.setCol87("");
|
||||
}
|
||||
try {
|
||||
entity.setCol88(arr[10]);
|
||||
}catch (Exception e){
|
||||
entity.setCol88("");
|
||||
}
|
||||
try {
|
||||
entity.setCol89(arr[11]);
|
||||
}catch (Exception e){
|
||||
entity.setCol89("");
|
||||
}
|
||||
try {
|
||||
entity.setCol90(arr[12]);
|
||||
}catch (Exception e){
|
||||
entity.setCol90("");
|
||||
}
|
||||
try {
|
||||
entity.setCol91(arr[13]);
|
||||
}catch (Exception e){
|
||||
entity.setCol91("");
|
||||
}
|
||||
try {
|
||||
entity.setCol92(arr[14]);
|
||||
}catch (Exception e){
|
||||
entity.setCol92("");
|
||||
}
|
||||
try {
|
||||
entity.setCol93(arr[15]);
|
||||
}catch (Exception e){
|
||||
entity.setCol93("");
|
||||
}
|
||||
try {
|
||||
entity.setCol94(arr[16]);
|
||||
}catch (Exception e){
|
||||
entity.setCol94("");
|
||||
}
|
||||
try {
|
||||
entity.setCol95(arr[17]);
|
||||
}catch (Exception e){
|
||||
entity.setCol95("");
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
entity.setCol96(arr[18]);
|
||||
}catch (Exception e){
|
||||
entity.setCol96("");
|
||||
}
|
||||
try {
|
||||
entity.setCol97(arr[19]);
|
||||
}catch (Exception e){
|
||||
entity.setCol97("");
|
||||
}
|
||||
try {
|
||||
entity.setCol98(arr[20]);
|
||||
}catch (Exception e){
|
||||
entity.setCol98("");
|
||||
}
|
||||
try {
|
||||
entity.setCol99(arr[21]);
|
||||
}catch (Exception e){
|
||||
entity.setCol99("");
|
||||
}
|
||||
try {
|
||||
entity.setCol100(arr[22]);
|
||||
}catch (Exception e){
|
||||
entity.setCol100("");
|
||||
}
|
||||
try {
|
||||
entity.setCol101(arr[23]);
|
||||
}catch (Exception e){
|
||||
entity.setCol101("");
|
||||
}
|
||||
try {
|
||||
entity.setCol102(arr[24]);
|
||||
}catch (Exception e){
|
||||
entity.setCol102("");
|
||||
}
|
||||
try {
|
||||
entity.setCol103(arr[25]);
|
||||
}catch (Exception e){
|
||||
entity.setCol103("");
|
||||
}
|
||||
try {
|
||||
entity.setCol104(arr[26]);
|
||||
}catch (Exception e){
|
||||
entity.setCol104("");
|
||||
}
|
||||
try {
|
||||
entity.setCol105(arr[27]);
|
||||
}catch (Exception e){
|
||||
entity.setCol105("");
|
||||
}
|
||||
try {
|
||||
entity.setCol106(arr[28]);
|
||||
}catch (Exception e){
|
||||
entity.setCol106("");
|
||||
}
|
||||
try {
|
||||
entity.setCol107(arr[29]);
|
||||
}catch (Exception e){
|
||||
entity.setCol107("");
|
||||
}
|
||||
try {
|
||||
entity.setCol108(arr[30]);
|
||||
}catch (Exception e){
|
||||
entity.setCol108("");
|
||||
}
|
||||
try {
|
||||
entity.setCol109(arr[31]);
|
||||
}catch (Exception e){
|
||||
entity.setCol109("");
|
||||
}
|
||||
try {
|
||||
entity.setCol110(arr[32]);
|
||||
}catch (Exception e){
|
||||
entity.setCol110("");
|
||||
}
|
||||
try {
|
||||
entity.setCol111(arr[33]);
|
||||
}catch (Exception e){
|
||||
entity.setCol111("");
|
||||
}
|
||||
try {
|
||||
entity.setCol112(arr[34]);
|
||||
}catch (Exception e){
|
||||
entity.setCol112("");
|
||||
}
|
||||
try {
|
||||
entity.setCol113(arr[35]);
|
||||
}catch (Exception e){
|
||||
entity.setCol113("");
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
entity.setCol78113(arr[0]);
|
||||
}catch (Exception e){
|
||||
entity.setCol78113("");
|
||||
}
|
||||
kcEvaluationsStatService.save(entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//最后的保存
|
||||
// kcEvaluationsStatService.saveBatch(inslist);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 无参定时任务实现
|
||||
*/
|
||||
public void run(){
|
||||
run(null);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -296,6 +296,152 @@ public class KcEvaluationsStat implements Serializable {
|
|||
private java.lang.String col76;//16.指导建议
|
||||
|
||||
|
||||
/**1.坚持立德树人，秉持共育两代师表理念，积极落实有理想信念、 有道德情操、有扎实学识、有仁爱之心的“ 四有好老师 ”培养目标 要求。*/
|
||||
@Excel(name = "1.坚持立德树人，秉持共育两代师表理念，积极落实有理想信念、 有道德情操、有扎实学识、有仁爱之心的“ 四有好老师 ”培养目标 要求。", width = 15)
|
||||
@ApiModelProperty(value = "1.坚持立德树人，秉持共育两代师表理念，积极落实有理想信念、 有道德情操、有扎实学识、有仁爱之心的“ 四有好老师 ”培养目标 要求。")
|
||||
private java.lang.String col78113;
|
||||
/**2.坚持学术强师理念，全面掌握所教学科必需的专业知识与教学知 识，做学生锤炼品格、学习知识、创新思维、奉献祖国的引路人， 具备对所教课程进行高质量创新性教学设计、实施、评价、反思和 研究的能力。*/
|
||||
@Excel(name = "2.坚持学术强师理念，全面掌握所教学科必需的专业知识与教学知 识，做学生锤炼品格、学习知识、创新思维、奉献祖国的引路人， 具备对所教课程进行高质量创新性教学设计、实施、评价、反思和 研究的能力。", width = 15)
|
||||
@ApiModelProperty(value = "2.坚持学术强师理念，全面掌握所教学科必需的专业知识与教学知 识，做学生锤炼品格、学习知识、创新思维、奉献祖国的引路人， 具备对所教课程进行高质量创新性教学设计、实施、评价、反思和 研究的能力。")
|
||||
private java.lang.String col79;
|
||||
/**3.尊重学生的权利、地位和人格，注重培养学生爱国情怀、创新精 神和健康人格，促进学生全面发展、终身学习。*/
|
||||
@Excel(name = "3.尊重学生的权利、地位和人格，注重培养学生爱国情怀、创新精 神和健康人格，促进学生全面发展、终身学习。", width = 15)
|
||||
@ApiModelProperty(value = "3.尊重学生的权利、地位和人格，注重培养学生爱国情怀、创新精 神和健康人格，促进学生全面发展、终身学习。")
|
||||
private java.lang.String col80;
|
||||
/**4.把握学生身心发展规律和学习特点，了解学生学习基础，激发学 生学习动力，重视引导学生自主发展，为把学生培养成底蕴深厚、 专业扎实、教书育人能力过硬的卓越人才奠定坚实基础。*/
|
||||
@Excel(name = "4.把握学生身心发展规律和学习特点，了解学生学习基础，激发学 生学习动力，重视引导学生自主发展，为把学生培养成底蕴深厚、 专业扎实、教书育人能力过硬的卓越人才奠定坚实基础。", width = 15)
|
||||
@ApiModelProperty(value = "4.把握学生身心发展规律和学习特点，了解学生学习基础，激发学 生学习动力，重视引导学生自主发展，为把学生培养成底蕴深厚、 专业扎实、教书育人能力过硬的卓越人才奠定坚实基础。")
|
||||
private java.lang.String col81;
|
||||
/**5.熟悉所教学科的知识体系、历史脉络、思想方法、科际联系和发 展前沿，认识所教学科在课程体系中的地位及其与培养目标的关 系，并将课程理解有效转化为教学观念、内容和行为。*/
|
||||
@Excel(name = "5.熟悉所教学科的知识体系、历史脉络、思想方法、科际联系和发 展前沿，认识所教学科在课程体系中的地位及其与培养目标的关 系，并将课程理解有效转化为教学观念、内容和行为。", width = 15)
|
||||
@ApiModelProperty(value = "5.熟悉所教学科的知识体系、历史脉络、思想方法、科际联系和发 展前沿，认识所教学科在课程体系中的地位及其与培养目标的关 系，并将课程理解有效转化为教学观念、内容和行为。")
|
||||
private java.lang.String col82;
|
||||
/**6.熟悉所教课程的内容体系、教育价值、发展历程，有效融入中华 优秀文化、渗透课程思政，坚持教书和育人相统一、言传和身教 相统一、潜心问道和关注社会相统一、学术自由和学术规范相统一。*/
|
||||
@Excel(name = "6.熟悉所教课程的内容体系、教育价值、发展历程，有效融入中华 优秀文化、渗透课程思政，坚持教书和育人相统一、言传和身教 相统一、潜心问道和关注社会相统一、学术自由和学术规范相统一。", width = 15)
|
||||
@ApiModelProperty(value = "6.熟悉所教课程的内容体系、教育价值、发展历程，有效融入中华 优秀文化、渗透课程思政，坚持教书和育人相统一、言传和身教 相统一、潜心问道和关注社会相统一、学术自由和学术规范相统一。")
|
||||
private java.lang.String col83;
|
||||
/**7.认识课堂是教书育人、开展教学活动的专业场域，课堂活动对培 养学生理论素养、实践能力、创新精神具有独特价值，能够科学、 灵活、适切地选择和运用课堂组织形式。*/
|
||||
@Excel(name = "7.认识课堂是教书育人、开展教学活动的专业场域，课堂活动对培 养学生理论素养、实践能力、创新精神具有独特价值，能够科学、 灵活、适切地选择和运用课堂组织形式。", width = 15)
|
||||
@ApiModelProperty(value = "7.认识课堂是教书育人、开展教学活动的专业场域，课堂活动对培 养学生理论素养、实践能力、创新精神具有独特价值，能够科学、 灵活、适切地选择和运用课堂组织形式。")
|
||||
private java.lang.String col84;
|
||||
/**8.理解课堂教学是教与学活动的有机统一，了解课堂的构成要素、 组织类型、活动方式和基本特点，掌握所教课程的教学规律、教学 方法和评价手段。*/
|
||||
@Excel(name = "8.理解课堂教学是教与学活动的有机统一，了解课堂的构成要素、 组织类型、活动方式和基本特点，掌握所教课程的教学规律、教学 方法和评价手段。", width = 15)
|
||||
@ApiModelProperty(value = "8.理解课堂教学是教与学活动的有机统一，了解课堂的构成要素、 组织类型、活动方式和基本特点，掌握所教课程的教学规律、教学 方法和评价手段。")
|
||||
private java.lang.String col85;
|
||||
/**9.严慈相济，乐于与学生交流，关心学生身心健康，热心为学生成 长提供专业支持，促进学生自由而全面的发展。*/
|
||||
@Excel(name = "9.严慈相济，乐于与学生交流，关心学生身心健康，热心为学生成 长提供专业支持，促进学生自由而全面的发展。", width = 15)
|
||||
@ApiModelProperty(value = "9.严慈相济，乐于与学生交流，关心学生身心健康，热心为学生成 长提供专业支持，促进学生自由而全面的发展。")
|
||||
private java.lang.String col86;
|
||||
/**10.尊重学生个体差异，了解学生合理学习需求，关注学生思想情 感，善于发现学生的闪光点，对学生发展抱有积极期待。*/
|
||||
@Excel(name = "10.尊重学生个体差异，了解学生合理学习需求，关注学生思想情 感，善于发现学生的闪光点，对学生发展抱有积极期待。", width = 15)
|
||||
@ApiModelProperty(value = "10.尊重学生个体差异，了解学生合理学习需求，关注学生思想情 感，善于发现学生的闪光点，对学生发展抱有积极期待。")
|
||||
private java.lang.String col87;
|
||||
/**11.坚持正确的政治方向与价值导向，为党育人，为国育才，依法 执教，理解教师是学生学习的促进者和成长的引路人，自觉履行立 德树人使命。*/
|
||||
@Excel(name = "11.坚持正确的政治方向与价值导向，为党育人，为国育才，依法 执教，理解教师是学生学习的促进者和成长的引路人，自觉履行立 德树人使命。", width = 15)
|
||||
@ApiModelProperty(value = "11.坚持正确的政治方向与价值导向，为党育人，为国育才，依法 执教，理解教师是学生学习的促进者和成长的引路人，自觉履行立 德树人使命。")
|
||||
private java.lang.String col88;
|
||||
/**12.理解教学是教师的立身之本，教研是教师的强教之基，潜心教 学，发展教学学术，自觉遵守教学纪律，认真践行教学规范，保证 有质量的教学。*/
|
||||
@Excel(name = "12.理解教学是教师的立身之本，教研是教师的强教之基，潜心教 学，发展教学学术，自觉遵守教学纪律，认真践行教学规范，保证 有质量的教学。", width = 15)
|
||||
@ApiModelProperty(value = "12.理解教学是教师的立身之本，教研是教师的强教之基，潜心教 学，发展教学学术，自觉遵守教学纪律，认真践行教学规范，保证 有质量的教学。")
|
||||
private java.lang.String col89;
|
||||
/**13.重视师德师风修养，思想积极向上，热爱教育事业，为人师表， 具有正确的教育观、教师观、学生观。*/
|
||||
@Excel(name = "13.重视师德师风修养，思想积极向上，热爱教育事业，为人师表， 具有正确的教育观、教师观、学生观。", width = 15)
|
||||
@ApiModelProperty(value = "13.重视师德师风修养，思想积极向上，热爱教育事业，为人师表， 具有正确的教育观、教师观、学生观。")
|
||||
private java.lang.String col90;
|
||||
/**14.追求教学艺术境界，教学语言规范准确、富有逻辑性，教态自 然，举止文明，仪表得体，有亲和力，情绪饱满，热忱投入。*/
|
||||
@Excel(name = "14.追求教学艺术境界，教学语言规范准确、富有逻辑性，教态自 然，举止文明，仪表得体，有亲和力，情绪饱满，热忱投入。", width = 15)
|
||||
@ApiModelProperty(value = "14.追求教学艺术境界，教学语言规范准确、富有逻辑性，教态自 然，举止文明，仪表得体，有亲和力，情绪饱满，热忱投入。")
|
||||
private java.lang.String col91;
|
||||
/**15.立足创新人才培养目标，深入研究课程大纲，针对学生已有经 验和基础，确定教学目标、重难点，形成教学方案。*/
|
||||
@Excel(name = "15.立足创新人才培养目标，深入研究课程大纲，针对学生已有经 验和基础，确定教学目标、重难点，形成教学方案。", width = 15)
|
||||
@ApiModelProperty(value = "15.立足创新人才培养目标，深入研究课程大纲，针对学生已有经 验和基础，确定教学目标、重难点，形成教学方案。")
|
||||
private java.lang.String col92;
|
||||
/**16.合理规划教学环节和时间，恰当选择教学方法，积极推动人工 智能、智慧学习环境等新技术与学科课程融合，形成线上与线下教 学有机结合、深度融通的自主、合作、探究学习模式。*/
|
||||
@Excel(name = "16.合理规划教学环节和时间，恰当选择教学方法，积极推动人工 智能、智慧学习环境等新技术与学科课程融合，形成线上与线下教 学有机结合、深度融通的自主、合作、探究学习模式。", width = 15)
|
||||
@ApiModelProperty(value = "16.合理规划教学环节和时间，恰当选择教学方法，积极推动人工 智能、智慧学习环境等新技术与学科课程融合，形成线上与线下教 学有机结合、深度融通的自主、合作、探究学习模式。")
|
||||
private java.lang.String col93;
|
||||
/**17.开发和利用具有交互性、情境化的课程资源和教学案例，创设 良好的教学情境，科学选择学习评价方式，合理安排课后学习任务。*/
|
||||
@Excel(name = "17.开发和利用具有交互性、情境化的课程资源和教学案例，创设 良好的教学情境，科学选择学习评价方式，合理安排课后学习任务。", width = 15)
|
||||
@ApiModelProperty(value = "17.开发和利用具有交互性、情境化的课程资源和教学案例，创设 良好的教学情境，科学选择学习评价方式，合理安排课后学习任务。")
|
||||
private java.lang.String col94;
|
||||
/**18.清晰阐释课程内容，准确把握教学重难点，恰当解读学科本源 性思想和方法，适时融入课程领域发展新成果。*/
|
||||
@Excel(name = "18.清晰阐释课程内容，准确把握教学重难点，恰当解读学科本源 性思想和方法，适时融入课程领域发展新成果。", width = 15)
|
||||
@ApiModelProperty(value = "18.清晰阐释课程内容，准确把握教学重难点，恰当解读学科本源 性思想和方法，适时融入课程领域发展新成果。")
|
||||
private java.lang.String col95;
|
||||
/**19.创造性地生成教学过程，鼓励学生在实践探究中发现问题、提 出问题、解决问题，激发学生的好奇心、想象力与创新思维，培养 学生的创新能力。*/
|
||||
@Excel(name = "19.创造性地生成教学过程，鼓励学生在实践探究中发现问题、提 出问题、解决问题，激发学生的好奇心、想象力与创新思维，培养 学生的创新能力。", width = 15)
|
||||
@ApiModelProperty(value = "19.创造性地生成教学过程，鼓励学生在实践探究中发现问题、提 出问题、解决问题，激发学生的好奇心、想象力与创新思维，培养 学生的创新能力。")
|
||||
private java.lang.String col96;
|
||||
/**20.把握课堂教学节奏和进度，根据课堂情境和学生表现适时调整 教学方式，展现教学机智。*/
|
||||
@Excel(name = "20.把握课堂教学节奏和进度，根据课堂情境和学生表现适时调整 教学方式，展现教学机智。", width = 15)
|
||||
@ApiModelProperty(value = "20.把握课堂教学节奏和进度，根据课堂情境和学生表现适时调整 教学方式，展现教学机智。")
|
||||
private java.lang.String col97;
|
||||
/**21.落实教学评一体化，运用多种评价方式， 了解学生学习状态， 有效评估学生学习效果，及时给予反馈和有针对性的指导。*/
|
||||
@Excel(name = "21.落实教学评一体化，运用多种评价方式， 了解学生学习状态， 有效评估学生学习效果，及时给予反馈和有针对性的指导。", width = 15)
|
||||
@ApiModelProperty(value = "21.落实教学评一体化，运用多种评价方式， 了解学生学习状态， 有效评估学生学习效果，及时给予反馈和有针对性的指导。")
|
||||
private java.lang.String col98;
|
||||
/**22.掌握所学课程的基础知识、基本原理、基本思想等核心内容。*/
|
||||
@Excel(name = "22.掌握所学课程的基础知识、基本原理、基本思想等核心内容。", width = 15)
|
||||
@ApiModelProperty(value = "22.掌握所学课程的基础知识、基本原理、基本思想等核心内容。")
|
||||
private java.lang.String col99;
|
||||
/**23.理解课程的知识结构、思想体系，了解所学知识的发展脉络与 前沿动态，形成学科理解力。*/
|
||||
@Excel(name = "23.理解课程的知识结构、思想体系，了解所学知识的发展脉络与 前沿动态，形成学科理解力。", width = 15)
|
||||
@ApiModelProperty(value = "23.理解课程的知识结构、思想体系，了解所学知识的发展脉络与 前沿动态，形成学科理解力。")
|
||||
private java.lang.String col100;
|
||||
/**24.掌握所学知识的运用情境、策略和方法， 了解所学课程与其它 课程的关联，理解课程知识在当代社会发展中的意义和价值，形成 学科转化力。*/
|
||||
@Excel(name = "24.掌握所学知识的运用情境、策略和方法， 了解所学课程与其它 课程的关联，理解课程知识在当代社会发展中的意义和价值，形成 学科转化力。", width = 15)
|
||||
@ApiModelProperty(value = "24.掌握所学知识的运用情境、策略和方法， 了解所学课程与其它 课程的关联，理解课程知识在当代社会发展中的意义和价值，形成 学科转化力。")
|
||||
private java.lang.String col101;
|
||||
/**25.掌握所学课程的基本专业技能，运用所学知识与方法分析、解 决实际问题，在新情境中发展实践迁移力。*/
|
||||
@Excel(name = "25.掌握所学课程的基本专业技能，运用所学知识与方法分析、解 决实际问题，在新情境中发展实践迁移力。", width = 15)
|
||||
@ApiModelProperty(value = "25.掌握所学课程的基本专业技能，运用所学知识与方法分析、解 决实际问题，在新情境中发展实践迁移力。")
|
||||
private java.lang.String col102;
|
||||
/**26.具有大胆质疑、敢于创新的精神，对课程知识及其应用进行批 判性思考，形成反思研究力。*/
|
||||
@Excel(name = "26.具有大胆质疑、敢于创新的精神，对课程知识及其应用进行批 判性思考，形成反思研究力。", width = 15)
|
||||
@ApiModelProperty(value = "26.具有大胆质疑、敢于创新的精神，对课程知识及其应用进行批 判性思考，形成反思研究力。")
|
||||
private java.lang.String col103;
|
||||
/**27.能在观察和思考中发现学科与实践问题，基于证据和逻辑发表 自己的观点和见解，提出问题解决方案。*/
|
||||
@Excel(name = "27.能在观察和思考中发现学科与实践问题，基于证据和逻辑发表 自己的观点和见解，提出问题解决方案。", width = 15)
|
||||
@ApiModelProperty(value = "27.能在观察和思考中发现学科与实践问题，基于证据和逻辑发表 自己的观点和见解，提出问题解决方案。")
|
||||
private java.lang.String col104;
|
||||
/**28.具有理想信念、责任担当与家国情怀，形成服务国家、奉献社 会的专业品质。*/
|
||||
@Excel(name = "28.具有理想信念、责任担当与家国情怀，形成服务国家、奉献社 会的专业品质。", width = 15)
|
||||
@ApiModelProperty(value = "28.具有理想信念、责任担当与家国情怀，形成服务国家、奉献社 会的专业品质。")
|
||||
private java.lang.String col105;
|
||||
/**29.体会课程学习的挑战与乐趣，珍惜学习机会，规划学习过程， 养成自主学习习惯，达成课程学习的各项预设目标，发展学习力。*/
|
||||
@Excel(name = "29.体会课程学习的挑战与乐趣，珍惜学习机会，规划学习过程， 养成自主学习习惯，达成课程学习的各项预设目标，发展学习力。", width = 15)
|
||||
@ApiModelProperty(value = "29.体会课程学习的挑战与乐趣，珍惜学习机会，规划学习过程， 养成自主学习习惯，达成课程学习的各项预设目标，发展学习力。")
|
||||
private java.lang.String col106;
|
||||
/**30.凸显课程培根铸魂、启智润心的育人价值，培养德智体美劳全 面发展的高素质专业化创新型人才。改革教学方式方法，展现开拓 创新能力，体现教学创造性。*/
|
||||
@Excel(name = "30.凸显课程培根铸魂、启智润心的育人价值，培养德智体美劳全 面发展的高素质专业化创新型人才。改革教学方式方法，展现开拓 创新能力，体现教学创造性。", width = 15)
|
||||
@ApiModelProperty(value = "30.凸显课程培根铸魂、启智润心的育人价值，培养德智体美劳全 面发展的高素质专业化创新型人才。改革教学方式方法，展现开拓 创新能力，体现教学创造性。")
|
||||
private java.lang.String col107;
|
||||
/**31.准确把握学科本质属性，尊重学科学习规律，体现具有中国特 色、中国风格、中国气派的学科体系、学术体系和话语体系。*/
|
||||
@Excel(name = "31.准确把握学科本质属性，尊重学科学习规律，体现具有中国特 色、中国风格、中国气派的学科体系、学术体系和话语体系。", width = 15)
|
||||
@ApiModelProperty(value = "31.准确把握学科本质属性，尊重学科学习规律，体现具有中国特 色、中国风格、中国气派的学科体系、学术体系和话语体系。")
|
||||
private java.lang.String col108;
|
||||
/**32.吸纳学科教研新成果，融入学科相关的新理念、新知识、新技 术，关注学科交叉融合、协同创新的发展趋势。*/
|
||||
@Excel(name = "32.吸纳学科教研新成果，融入学科相关的新理念、新知识、新技 术，关注学科交叉融合、协同创新的发展趋势。", width = 15)
|
||||
@ApiModelProperty(value = "32.吸纳学科教研新成果，融入学科相关的新理念、新知识、新技 术，关注学科交叉融合、协同创新的发展趋势。")
|
||||
private java.lang.String col109;
|
||||
/**33.教学设计和教学实施渗透革新意识，积极探索新时代教育教学。*/
|
||||
@Excel(name = "33.教学设计和教学实施渗透革新意识，积极探索新时代教育教学。", width = 15)
|
||||
@ApiModelProperty(value = "33.教学设计和教学实施渗透革新意识，积极探索新时代教育教学。")
|
||||
private java.lang.String col110;
|
||||
/**34.教学理念、教学方法等呈现个性风貌，善于引导学生传承中华 师道，涵养教育情怀，成为学生为学、为事、为人的示范，体现教 书育人、言传身教相统一的教学艺术性。*/
|
||||
@Excel(name = "34.教学理念、教学方法等呈现个性风貌，善于引导学生传承中华 师道，涵养教育情怀，成为学生为学、为事、为人的示范，体现教 书育人、言传身教相统一的教学艺术性。", width = 15)
|
||||
@ApiModelProperty(value = "34.教学理念、教学方法等呈现个性风貌，善于引导学生传承中华 师道，涵养教育情怀，成为学生为学、为事、为人的示范，体现教 书育人、言传身教相统一的教学艺术性。")
|
||||
private java.lang.String col111;
|
||||
/**总分*/
|
||||
@Excel(name = "总分", width = 15)
|
||||
@ApiModelProperty(value = "总分")
|
||||
private java.lang.String col112;
|
||||
/**优点或建议*/
|
||||
@Excel(name = "优点或建议", width = 15)
|
||||
@ApiModelProperty(value = "优点或建议")
|
||||
private java.lang.String col113;
|
||||
|
||||
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
|
|
|
|||
|
|
@ -37,4 +37,8 @@ public interface KcEvaluationsStatMapper extends BaseMapper<KcEvaluationsStat> {
|
|||
List<KcEvaluationsStat> getSzkcpjbSyncList();
|
||||
|
||||
List<KcEvaluationsStat> getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
|
||||
List<KcEvaluationsStat> getXbthpjbSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
|
||||
List<KcEvaluationsStat> getXbthpjbpcSyncList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,13 @@
|
|||
AND ev.evaluationver = '5'
|
||||
</select>
|
||||
|
||||
<select id="getXbthpjbpcSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||
SELECT DISTINCT ev.id as col00
|
||||
FROM kc_evaluation EV, KC_EVALUATIONS EVS
|
||||
WHERE ev.id = evs.evaluationid
|
||||
AND ev.evaluationver = '6'
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="getYbtkbJxsjSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||
|
|
@ -1469,6 +1476,216 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
|
|||
</select>
|
||||
|
||||
|
||||
<!-- 新版同行评价表-->
|
||||
<select id="getXbthpjbSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||
SELECT SZK.COL00,
|
||||
SZK.COL01,
|
||||
SZK.COL02,
|
||||
SZK.COL03,
|
||||
SZK.COL04,
|
||||
SZK.COL05,
|
||||
SZK.COL06,
|
||||
SZK.COL07,
|
||||
SZK.COL08,
|
||||
SZK.COL09,
|
||||
SZK.COL10,
|
||||
SZK.COL11,
|
||||
SZK.COL12,
|
||||
SZK.COL13,
|
||||
SZK.COL14,
|
||||
SZK.COL15,
|
||||
SZK.COL16,
|
||||
SZK.COL56,
|
||||
SZK.COL57,
|
||||
SZK.COL58,
|
||||
SZK.COL59,
|
||||
SZK.COL60,
|
||||
SZK.COL78113
|
||||
FROM (SELECT EVS.EVALUATIONID AS COL00,
|
||||
XQXN.TITLE AS COL01, -- 思政课(5)
|
||||
KT.KCMC AS COL02,
|
||||
KT.KKDW AS COL03,
|
||||
KT.SKJS AS COL04,
|
||||
KT.JGH AS COL05,
|
||||
KT.SKRQ AS COL06,
|
||||
KT.SKSJ AS COL07,
|
||||
KT.HH AS COL08,
|
||||
KT.SKDD AS COL09,
|
||||
XSKC.DWMC AS COL10,
|
||||
EVS.UPUSERID AS COL11,
|
||||
EVS.UPUSER AS COL12,
|
||||
TKSF.ITEM_TEXT AS COL13,
|
||||
(SELECT CONTENT
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONANS ANS
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND EVS.ANSID = ANS.ID
|
||||
AND EV.evaluationver = '6'
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND EVS.QUEID = '75') AS COL14,
|
||||
CASE EV.EVALUATIONVER
|
||||
WHEN '2' THEN
|
||||
'线上听课表'
|
||||
WHEN '3' THEN
|
||||
'一般听课表'
|
||||
WHEN '4' THEN
|
||||
'同行评价表'
|
||||
WHEN '5' THEN
|
||||
'思政评价表'
|
||||
ELSE
|
||||
'新版同行评价表'
|
||||
END AS COL15,
|
||||
CASE EV.SOURCE
|
||||
WHEN '0' THEN
|
||||
'课程中心'
|
||||
WHEN '1' THEN
|
||||
'老系统'
|
||||
WHEN '2' THEN
|
||||
'服务大厅'
|
||||
WHEN '3' THEN
|
||||
'后台导入'
|
||||
ELSE
|
||||
'未知数据源'
|
||||
END AS COL16,
|
||||
rjzy.rjzy as col56,
|
||||
ev.rjzy as col57,
|
||||
KT.ID AS COL58,
|
||||
CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59,
|
||||
EVS.UP_DATE AS COL60,
|
||||
GROUP_CONCAT(EVS.DETANSWER SEPARATOR '@') AS COL78113
|
||||
|
||||
FROM (SELECT UPUSER,
|
||||
UPUSERID,
|
||||
KETANGBIAOID,
|
||||
QUEID,
|
||||
ANSID,
|
||||
EVALUATIONID,
|
||||
DETANSWER,
|
||||
EVSTMP.UP_DATE
|
||||
FROM (SELECT EVS.UPUSER,
|
||||
EVS.UPUSERID,
|
||||
EV.MINKCID AS KETANGBIAOID,
|
||||
EVS.QUEID,
|
||||
EVS.EVALUATIONID,
|
||||
EVS.ANSID,
|
||||
GROUP_CONCAT(CASE ANS.ORDERNUM
|
||||
WHEN '1' THEN
|
||||
'A'
|
||||
WHEN '2' THEN
|
||||
'B'
|
||||
WHEN '3' THEN
|
||||
'C'
|
||||
WHEN '4' THEN
|
||||
'D'
|
||||
WHEN '5' THEN
|
||||
'E'
|
||||
WHEN '6' THEN
|
||||
'F'
|
||||
WHEN '7' THEN
|
||||
'G'
|
||||
WHEN '8' THEN
|
||||
'H'
|
||||
WHEN '9' THEN
|
||||
'I'
|
||||
WHEN '10' THEN
|
||||
'J'
|
||||
WHEN '11' THEN
|
||||
'K'
|
||||
ELSE
|
||||
''
|
||||
END) AS DETANSWER,
|
||||
EVS.UP_DATE
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONANS ANS,
|
||||
KC_EVALUATIONQUE QUE
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND QUE.ID = ANS.QUEID
|
||||
AND EVS.ANSID = ANS.ID
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND EV.evaluationver = '6'
|
||||
AND QUE.QUETYPE = '2'
|
||||
UNION
|
||||
SELECT EVS.UPUSER,
|
||||
EVS.UPUSERID,
|
||||
EV.MINKCID AS KETANGBIAOID,
|
||||
EVS.QUEID,
|
||||
EVS.EVALUATIONID,
|
||||
EVS.ANSID,
|
||||
CASE ANS.SCORE
|
||||
WHEN '5' THEN
|
||||
'A'
|
||||
WHEN '4' THEN
|
||||
'B'
|
||||
WHEN '3' THEN
|
||||
'C'
|
||||
WHEN '2' THEN
|
||||
'D'
|
||||
WHEN '1' THEN
|
||||
'E'
|
||||
ELSE
|
||||
'F'
|
||||
END AS DETANSWER,
|
||||
EVS.UP_DATE
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONANS ANS,
|
||||
KC_EVALUATIONQUE QUE
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND QUE.ID = ANS.QUEID
|
||||
AND EVS.ANSID = ANS.ID
|
||||
AND EV.evaluationver = '6'
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND QUE.QUETYPE = '1'
|
||||
UNION
|
||||
SELECT EVS.UPUSER,
|
||||
EVS.UPUSERID,
|
||||
EV.MINKCID AS KETANGBIAOID,
|
||||
EVS.QUEID,
|
||||
EVS.EVALUATIONID,
|
||||
EVS.ANSID,
|
||||
EVS.TEXTANSCONTENT AS DETANSWER,
|
||||
EVS.UP_DATE
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONQUE QUE
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND EVS.QUEID = QUE.ID
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND EV.evaluationver = '6'
|
||||
AND QUE.QUETYPE = '3') EVSTMP
|
||||
ORDER BY QUEID) EVS
|
||||
LEFT JOIN (select * from KC_EVALUATION ev left join (select distinct gh,dwmc,xm,sf,zt,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn}) rjzy on ev.upuserid = rjzy.gh) EV
|
||||
ON EVS.EVALUATIONID = EV.ID
|
||||
LEFT JOIN KC_KETANGBIAO KT
|
||||
ON EVS.KETANGBIAOID = KT.ID
|
||||
LEFT JOIN KC_KECHENGBIAO KC
|
||||
ON KT.kechengbiaoid = KC.ID
|
||||
left join (select * from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} and id in (select id from (
|
||||
select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} GROUP BY gh,xqxn)b )) rjzy on kt.jgh = rjzy.gh
|
||||
LEFT JOIN KC_XQXN_HISTORY XQXN
|
||||
ON KT.SKRQ >= XQXN.START_TIME
|
||||
AND KT.SKRQ < XQXN.END_TIME
|
||||
LEFT JOIN XXHBXSKC XSKC
|
||||
ON XSKC.GH = EVS.UPUSERID
|
||||
LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, GROUP_CONCAT(distinct B.ITEM_TEXT) as ITEM_TEXT
|
||||
FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B
|
||||
WHERE A.TKLX = B.ITEM_VALUE
|
||||
AND B.DICT_ID = '1682386362753224705'
|
||||
and a.xqxn = #{xqxn}
|
||||
GROUP BY a.gh) TKSF
|
||||
ON TKSF.GH = EVS.UPUSERID
|
||||
LEFT JOIN KC_EVALUATIONQUE QUE
|
||||
ON EVS.QUEID = QUE.ID) SZK
|
||||
where SZK.COL00 not in (select col00 from kc_evaluations_stat)
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<update id="updateHuanhang">
|
||||
|
|
|
|||
|
|
@ -36,4 +36,8 @@ public interface IKcEvaluationsStatService extends IService<KcEvaluationsStat> {
|
|||
List<KcEvaluationsStat> getSzkcpjbSyncList();
|
||||
|
||||
List<KcEvaluationsStat> getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
|
||||
List<KcEvaluationsStat> getXbthpjbSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
|
||||
List<KcEvaluationsStat> getXbthpjbpcSyncList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,4 +78,14 @@ public class KcEvaluationsStatServiceImpl extends ServiceImpl<KcEvaluationsStatM
|
|||
public List<KcEvaluationsStat> getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat) {
|
||||
return baseMapper.getSzkcJxsjSyncList(kcEvaluationsStat);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KcEvaluationsStat> getXbthpjbSyncList(KcEvaluationsStat kcEvaluationsStat) {
|
||||
return baseMapper.getXbthpjbSyncList(kcEvaluationsStat);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KcEvaluationsStat> getXbthpjbpcSyncList() {
|
||||
return baseMapper.getXbthpjbpcSyncList();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -231,8 +231,13 @@
|
|||
<select id="getStudentRiliKclist" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
||||
select b.rwbh,b.kcmc,GROUP_CONCAT(DISTINCT b.skjs ) as skjs,b.skrq,b.jgh,b.xnxq from xxhbxsxkb a , kc_ketangbiao b
|
||||
where a.KCAPZBBH = b.rwbh and a.xh = #{xh} and b.xnxq = #{xnxq}
|
||||
and b.skrq like concat(DATE_FORMAT(NOW(),'%Y-%m'),'%')
|
||||
GROUP BY b.rwbh,b.kcmc,b.skrq,b.jgh,b.xnxq
|
||||
<if test="skrq!=null and skrq!=''">
|
||||
and b.skrq like concat(#{skrq},'%')
|
||||
</if>
|
||||
<if test="skrq==null">
|
||||
and b.skrq like concat(DATE_FORMAT(NOW(),'%Y-%m'),'%')
|
||||
</if>
|
||||
GROUP BY b.rwbh,b.kcmc,b.skrq,b.xnxq
|
||||
</select>
|
||||
|
||||
<update id="updateSzkc">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,184 @@
|
|||
package org.jeecg.modules.kc.pjxxJszbpjf.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.entity.PjxxJszbpjf;
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.service.IPjxxJszbpjfService;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: pjxx_jszbpjf
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="pjxx_jszbpjf")
|
||||
@RestController
|
||||
@RequestMapping("/pjxxJszbpjf/pjxxJszbpjf")
|
||||
@Slf4j
|
||||
public class PjxxJszbpjfController extends JeecgController<PjxxJszbpjf, IPjxxJszbpjfService> {
|
||||
@Autowired
|
||||
private IPjxxJszbpjfService pjxxJszbpjfService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param pjxxJszbpjf
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "pjxx_jszbpjf-分页列表查询")
|
||||
@ApiOperation(value="pjxx_jszbpjf-分页列表查询", notes="pjxx_jszbpjf-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<PjxxJszbpjf>> queryPageList(PjxxJszbpjf pjxxJszbpjf,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PjxxJszbpjf> queryWrapper = QueryGenerator.initQueryWrapper(pjxxJszbpjf, req.getParameterMap());
|
||||
Page<PjxxJszbpjf> page = new Page<PjxxJszbpjf>(pageNo, pageSize);
|
||||
IPage<PjxxJszbpjf> pageList = pjxxJszbpjfService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value="首页查询教师平均分", notes="首页查询教师平均分")
|
||||
@GetMapping(value = "/listIndex")
|
||||
public Result<IPage<PjxxJszbpjf>> listIndex(PjxxJszbpjf pjxxJszbpjf,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PjxxJszbpjf> queryWrapper = QueryGenerator.initQueryWrapper(pjxxJszbpjf, req.getParameterMap());
|
||||
Page<PjxxJszbpjf> page = new Page<PjxxJszbpjf>(pageNo, 4);
|
||||
IPage<PjxxJszbpjf> pageList = pjxxJszbpjfService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param pjxxJszbpjf
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pjxx_jszbpjf-添加")
|
||||
@ApiOperation(value="pjxx_jszbpjf-添加", notes="pjxx_jszbpjf-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody PjxxJszbpjf pjxxJszbpjf) {
|
||||
pjxxJszbpjfService.save(pjxxJszbpjf);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param pjxxJszbpjf
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pjxx_jszbpjf-编辑")
|
||||
@ApiOperation(value="pjxx_jszbpjf-编辑", notes="pjxx_jszbpjf-编辑")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody PjxxJszbpjf pjxxJszbpjf) {
|
||||
pjxxJszbpjfService.updateById(pjxxJszbpjf);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pjxx_jszbpjf-通过id删除")
|
||||
@ApiOperation(value="pjxx_jszbpjf-通过id删除", notes="pjxx_jszbpjf-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||
pjxxJszbpjfService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pjxx_jszbpjf-批量删除")
|
||||
@ApiOperation(value="pjxx_jszbpjf-批量删除", notes="pjxx_jszbpjf-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.pjxxJszbpjfService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pjxx_jszbpjf-通过id查询", notes="pjxx_jszbpjf-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<PjxxJszbpjf> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
PjxxJszbpjf pjxxJszbpjf = pjxxJszbpjfService.getById(id);
|
||||
if(pjxxJszbpjf==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(pjxxJszbpjf);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param pjxxJszbpjf
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PjxxJszbpjf pjxxJszbpjf) {
|
||||
return super.exportXls(request, pjxxJszbpjf, PjxxJszbpjf.class, "学生评教结果");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PjxxJszbpjf.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
package org.jeecg.modules.kc.pjxxJszbpjf.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: pjxx_jszbpjf
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("pjxx_jszbpjf")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="pjxx_jszbpjf对象", description="pjxx_jszbpjf")
|
||||
public class PjxxJszbpjf implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**createBy*/
|
||||
@ApiModelProperty(value = "createBy")
|
||||
private java.lang.String createBy;
|
||||
/**createTime*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "createTime")
|
||||
private java.util.Date createTime;
|
||||
/**updateBy*/
|
||||
@ApiModelProperty(value = "updateBy")
|
||||
private java.lang.String updateBy;
|
||||
/**updateTime*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "updateTime")
|
||||
private java.util.Date updateTime;
|
||||
/**教师编号*/
|
||||
@Excel(name = "教师编号", width = 15)
|
||||
@ApiModelProperty(value = "教师编号")
|
||||
private java.lang.String jsbh;
|
||||
/**教师姓名*/
|
||||
@Excel(name = "教师姓名", width = 15)
|
||||
@ApiModelProperty(value = "教师姓名")
|
||||
private java.lang.String jsxm;
|
||||
/**教师职称*/
|
||||
@Excel(name = "教师职称", width = 15)
|
||||
@ApiModelProperty(value = "教师职称")
|
||||
private java.lang.String jszc;
|
||||
/**教师院系*/
|
||||
@Excel(name = "教师院系", width = 15)
|
||||
@ApiModelProperty(value = "教师院系")
|
||||
private java.lang.String jsyx;
|
||||
/**开课院系*/
|
||||
@Excel(name = "开课院系", width = 15)
|
||||
@ApiModelProperty(value = "开课院系")
|
||||
private java.lang.String kkyx;
|
||||
/**课程名称*/
|
||||
@Excel(name = "课程名称", width = 15)
|
||||
@ApiModelProperty(value = "课程名称")
|
||||
private java.lang.String kcmc;
|
||||
/**开课编号*/
|
||||
@Excel(name = "开课编号", width = 15)
|
||||
@ApiModelProperty(value = "开课编号")
|
||||
private java.lang.String kkbh;
|
||||
/**参评率*/
|
||||
@Excel(name = "参评率", width = 15)
|
||||
@ApiModelProperty(value = "参评率")
|
||||
private java.lang.String cpl;
|
||||
/**平均分汇总*/
|
||||
@Excel(name = "平均分汇总", width = 15)
|
||||
@ApiModelProperty(value = "平均分汇总")
|
||||
private java.lang.String pjfhz;
|
||||
/**重视学生的成长引领，关心学生的学习需求，乐于与学生交流*/
|
||||
@Excel(name = "重视学生的成长引领，关心学生的学习需求，乐于与学生交流", width = 15)
|
||||
@ApiModelProperty(value = "重视学生的成长引领，关心学生的学习需求，乐于与学生交流")
|
||||
private java.lang.String col1;
|
||||
/**上课准备充分，课堂教学秩序良好。作业布置合理，反馈及时*/
|
||||
@Excel(name = "上课准备充分，课堂教学秩序良好。作业布置合理，反馈及时", width = 15)
|
||||
@ApiModelProperty(value = "上课准备充分，课堂教学秩序良好。作业布置合理，反馈及时")
|
||||
private java.lang.String col2;
|
||||
/**教学目标明确，重点突出，逻辑性强*/
|
||||
@Excel(name = "教学目标明确，重点突出，逻辑性强", width = 15)
|
||||
@ApiModelProperty(value = "教学目标明确，重点突出，逻辑性强")
|
||||
private java.lang.String col3;
|
||||
/**教学内容清晰易懂，体现适当的深度、广度和前沿性*/
|
||||
@Excel(name = "教学内容清晰易懂，体现适当的深度、广度和前沿性", width = 15)
|
||||
@ApiModelProperty(value = "教学内容清晰易懂，体现适当的深度、广度和前沿性")
|
||||
private java.lang.String col4;
|
||||
/**教学方法合理，教学媒体得当，课程资源丰富*/
|
||||
@Excel(name = "教学方法合理，教学媒体得当，课程资源丰富", width = 15)
|
||||
@ApiModelProperty(value = "教学方法合理，教学媒体得当，课程资源丰富")
|
||||
private java.lang.String col5;
|
||||
/**教师知识渊博，教学水平高，教学特色鲜明，教学有吸引力*/
|
||||
@Excel(name = "教师知识渊博，教学水平高，教学特色鲜明，教学有吸引力", width = 15)
|
||||
@ApiModelProperty(value = "教师知识渊博，教学水平高，教学特色鲜明，教学有吸引力")
|
||||
private java.lang.String col6;
|
||||
/**教学语言规范、准确，情绪饱满，热忱投入，为人师表*/
|
||||
@Excel(name = "教学语言规范、准确，情绪饱满，热忱投入，为人师表", width = 15)
|
||||
@ApiModelProperty(value = "教学语言规范、准确，情绪饱满，热忱投入，为人师表")
|
||||
private java.lang.String col7;
|
||||
/**教学中启发学生思考，引导自主学习，激发学习动力，鼓励创新探索*/
|
||||
@Excel(name = "教学中启发学生思考，引导自主学习，激发学习动力，鼓励创新探索", width = 15)
|
||||
@ApiModelProperty(value = "教学中启发学生思考，引导自主学习，激发学习动力，鼓励创新探索")
|
||||
private java.lang.String col8;
|
||||
/**掌握了所学课程的基础知识和基本理论，能用所学知识解决实际问题*/
|
||||
@Excel(name = "掌握了所学课程的基础知识和基本理论，能用所学知识解决实际问题", width = 15)
|
||||
@ApiModelProperty(value = "掌握了所学课程的基础知识和基本理论，能用所学知识解决实际问题")
|
||||
private java.lang.String col9;
|
||||
/**体会到本门课程学习的乐趣和挑战，理解课程内容的意义与价值*/
|
||||
@Excel(name = "体会到本门课程学习的乐趣和挑战，理解课程内容的意义与价值", width = 15)
|
||||
@ApiModelProperty(value = "体会到本门课程学习的乐趣和挑战，理解课程内容的意义与价值")
|
||||
private java.lang.String col10;
|
||||
/**优点或建议*/
|
||||
@Excel(name = "优点或建议", width = 15)
|
||||
@ApiModelProperty(value = "优点或建议")
|
||||
private java.lang.String col11;
|
||||
/**学期学年*/
|
||||
@Excel(name = "学期学年", width = 15)
|
||||
@ApiModelProperty(value = "学期学年")
|
||||
private java.lang.String xqxn;
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package org.jeecg.modules.kc.pjxxJszbpjf.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.entity.PjxxJszbpjf;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: pjxx_jszbpjf
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PjxxJszbpjfMapper extends BaseMapper<PjxxJszbpjf> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.kc.pjxxJszbpjf.mapper.PjxxJszbpjfMapper">
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package org.jeecg.modules.kc.pjxxJszbpjf.service;
|
||||
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.entity.PjxxJszbpjf;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: pjxx_jszbpjf
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPjxxJszbpjfService extends IService<PjxxJszbpjf> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package org.jeecg.modules.kc.pjxxJszbpjf.service.impl;
|
||||
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.entity.PjxxJszbpjf;
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.mapper.PjxxJszbpjfMapper;
|
||||
import org.jeecg.modules.kc.pjxxJszbpjf.service.IPjxxJszbpjfService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: pjxx_jszbpjf
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-01-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PjxxJszbpjfServiceImpl extends ServiceImpl<PjxxJszbpjfMapper, PjxxJszbpjf> implements IPjxxJszbpjfService {
|
||||
|
||||
}
|
||||
|
|
@ -790,8 +790,8 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
System.out.println("filPath:"+zyInfoStudent.getFilePath());
|
||||
System.out.println("docPath:"+docPath);
|
||||
System.out.println("pdfPath:"+pdfPath);
|
||||
PDFUtil.office2PDF(docPath,pdfPath);
|
||||
zyInfoStudent.setPdfPath("contract/"+namePath);
|
||||
// PDFUtil.office2PDF(docPath,pdfPath);
|
||||
// zyInfoStudent.setPdfPath("contract/"+namePath);
|
||||
}else{
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyInfoStudent.getId());
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
<select id="getList2" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||
select
|
||||
ifnull(a.id,c.xh) id,c.xh as create_by,a.create_time,a.update_by,a.update_time,a.main_id,a.file_path,a.wwxsl,
|
||||
a.nwxsl,a.aigcxsl,a.wwsftg,a.nwsftg,a.aigcsftg,a.score,d.xm as student_name,a.pdf_path,a.score_fabu,
|
||||
a.nwxsl,a.aigcxsl,a.wwsftg,a.nwsftg,a.aigcsftg,a.score,ifnull(d.xm,a.student_name) as student_name,a.pdf_path,a.score_fabu,
|
||||
a.cdlx,a.xnxsl,a.xnsftg,a.publish_time,a.hpcs,a.xshpfs,a.jxfs,a.zzdf,a.jxfs2,a.zy_leixing,a.py_content,
|
||||
a.py_file_path,a.sfsckhcl,a.fwq_path,a.khcl_time,
|
||||
round(IFNULL(a.jxfs,'0') + IFNULL(a.jxfs2,'0'),2) as jxzf,b.wwcc,b.nwcc,b.aigccc,b.xncc,b.title as zyname, GREATEST(ifnull(a.wwxsl-0,0),ifnull(a.nwxsl-0,0),ifnull(a.aigcxsl-0,0),ifnull(a.xnxsl-0,0)) as zgccl,b.wwtgl as alltgl
|
||||
from zy_info b
|
||||
join xxhbxsxkb c on c.kcapzbbh = b.rwbh
|
||||
join xxhbbks d on c.xh = d.xh
|
||||
left join xxhbxsxkb c on c.kcapzbbh = b.rwbh
|
||||
left join xxhbbks d on c.xh = d.xh
|
||||
left join zy_info_student a on a.create_by = c.xh and a.main_id = b.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -355,15 +355,18 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
List<ZyInfoStudent> list = baseMapper.selectList(queryWrapper);
|
||||
|
||||
|
||||
List<Map<String, String>> paramsList2 = new ArrayList<>();
|
||||
for (ZyInfoStudent zyInfoStudentPar2 : list) {
|
||||
if (StringUtils.isNotEmpty(zyInfoStudentPar2.getFilePath())) {
|
||||
//上传作业文件
|
||||
Map<String, String> uploadMap = SFTPUtil.upload(sftpConfig, upLoadPath + "/" + zyInfoStudentPar2.getFilePath(), yyyy + "/" + mm + "/" + zyInfo.getRwbh() + "/" + zyInfoStudentPar2.getFilePath().replace("temp/", "/"));
|
||||
if (StringUtils.equals(uploadMap.get("code"), "0")) {
|
||||
zyInfoStudentPar2.setFwqPath(uploadMap.get("data"));
|
||||
}
|
||||
}
|
||||
List<Map<String, String>> paramsList2 =new ArrayList<>();
|
||||
for (ZyInfoStudent zyInfoStudentPar2 : list) {
|
||||
if (StringUtils.isNotEmpty(zyInfoStudentPar2.getFilePath())) {
|
||||
//上传作业文件
|
||||
Map<String, String> uploadMap = SFTPUtil.upload(sftpConfig, upLoadPath + "/" + zyInfoStudentPar2.getFilePath(), yyyy + "/" + mm + "/" + zyInfo.getRwbh() + "/" + zyInfoStudentPar2.getFilePath().replace("temp/", "/"));
|
||||
System.out.println("=======================================");
|
||||
System.out.println("uploadMap:"+uploadMap);
|
||||
System.out.println("=======================================");
|
||||
if (StringUtils.equals(uploadMap.get("code"), "0")) {
|
||||
zyInfoStudentPar2.setFwqPath(uploadMap.get("data"));
|
||||
}
|
||||
}
|
||||
|
||||
if (StringUtils.isNotEmpty(zyInfoStudentPar2.getPyFilePath())) {
|
||||
//上传评阅附件
|
||||
|
|
@ -919,11 +922,14 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
Map<String, String> fileMap = new HashMap<String, String>();
|
||||
fileMap.put("file", fileName);
|
||||
String contentType = "";//image/png
|
||||
log.error("fileMap-------->" + fileMap);
|
||||
String ret = formUpload(url, textMap, fileMap, contentType);
|
||||
log.error("1-------->" + ret);
|
||||
JSONObject object = JSONObject.parseObject(ret);
|
||||
if ("true".equals(object.getString("success"))) {
|
||||
log.error("fileMap-------->"+fileMap);
|
||||
log.error("url-------->"+url);
|
||||
log.error("textMap-------->"+textMap);
|
||||
log.error("contentType-------->"+contentType);
|
||||
String ret = formUpload(url, textMap, fileMap,contentType);
|
||||
log.error("1-------->"+ret);
|
||||
JSONObject object= JSONObject.parseObject(ret);
|
||||
if("true".equals(object.getString("success"))){
|
||||
String listpaper = object.getString("listpaper");
|
||||
JSONArray jsonArray = (JSONArray) JSONArray.parse(listpaper);
|
||||
JSONObject object2 = jsonArray.getJSONObject(0);
|
||||
|
|
|
|||
|
|
@ -360,40 +360,47 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
|||
zyJxdg.setPdfPath(zyJxdg.getFilePath());
|
||||
}else{
|
||||
|
||||
if(StringUtils.equals("local",global.uploadType)) {
|
||||
FileUtil.mkdir(global.getContractDickPath());
|
||||
String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
|
||||
String docPath = upLoadPath + File.separator + zyJxdg.getFilePath();
|
||||
String namePath = dd + ".pdf";
|
||||
String pdfPath = global.getContractDickPath() + namePath;
|
||||
System.out.println("pdfPath-----------》"+pdfPath);
|
||||
PDFUtil.office2PDF(docPath, pdfPath);
|
||||
zyJxdg.setPdfPath("contract/" + namePath);
|
||||
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyJxdg.getId());
|
||||
zykInfo.setBizTable("zy_jxdg");
|
||||
zykInfo.setWjlx(WjlxEnum.JXDG.getType());
|
||||
zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
zykInfo.setFileName(zyJxdg.getFilePath());
|
||||
zykInfo.setPdfName(zyJxdg.getPdfPath());
|
||||
zykService.saveLocal(zykInfo);
|
||||
|
||||
}else if(StringUtils.equals("sftp",global.uploadType)){
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyJxdg.getId());
|
||||
zykInfo.setBizTable("zy_jxdg");
|
||||
zykInfo.setWjlx(WjlxEnum.JXDG.getType());
|
||||
zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
zykInfo.setFileName(zyJxdg.getFilePath());
|
||||
Map<String,String> map = zykService.saveToZykJxdg(zykInfo);
|
||||
String fileName = map.get("data");
|
||||
String pdfName = map.get("pdfData");
|
||||
System.out.println("pdfName------------>"+pdfName);
|
||||
zyJxdg.setFilePath(fileName);
|
||||
zyJxdg.setPdfPath(pdfName);
|
||||
zykService.disConnect();
|
||||
}
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyJxdg.getId());
|
||||
zykInfo.setBizTable("zy_jxdg");
|
||||
zykInfo.setWjlx(WjlxEnum.JXDG.getType());
|
||||
zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
zykInfo.setFileName(zyJxdg.getFilePath());
|
||||
zykService.saveLocal(zykInfo);
|
||||
// if(StringUtils.equals("local",global.uploadType)) {
|
||||
// FileUtil.mkdir(global.getContractDickPath());
|
||||
// String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
|
||||
// String docPath = upLoadPath + File.separator + zyJxdg.getFilePath();
|
||||
// String namePath = dd + ".pdf";
|
||||
// String pdfPath = global.getContractDickPath() + namePath;
|
||||
// System.out.println("pdfPath-----------》"+pdfPath);
|
||||
// PDFUtil.office2PDF(docPath, pdfPath);
|
||||
// zyJxdg.setPdfPath("contract/" + namePath);
|
||||
//
|
||||
// ZykInfo zykInfo = new ZykInfo();
|
||||
// zykInfo.setBizId(zyJxdg.getId());
|
||||
// zykInfo.setBizTable("zy_jxdg");
|
||||
// zykInfo.setWjlx(WjlxEnum.JXDG.getType());
|
||||
// zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
// zykInfo.setFileName(zyJxdg.getFilePath());
|
||||
// zykInfo.setPdfName(zyJxdg.getPdfPath());
|
||||
// zykService.saveLocal(zykInfo);
|
||||
//
|
||||
// }else if(StringUtils.equals("sftp",global.uploadType)){
|
||||
// ZykInfo zykInfo = new ZykInfo();
|
||||
// zykInfo.setBizId(zyJxdg.getId());
|
||||
// zykInfo.setBizTable("zy_jxdg");
|
||||
// zykInfo.setWjlx(WjlxEnum.JXDG.getType());
|
||||
// zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
// zykInfo.setFileName(zyJxdg.getFilePath());
|
||||
// Map<String,String> map = zykService.saveToZykJxdg(zykInfo);
|
||||
// String fileName = map.get("data");
|
||||
// String pdfName = map.get("pdfData");
|
||||
// System.out.println("pdfName------------>"+pdfName);
|
||||
// zyJxdg.setFilePath(fileName);
|
||||
// zyJxdg.setPdfPath(pdfName);
|
||||
// zykService.disConnect();
|
||||
// }
|
||||
}
|
||||
}else{
|
||||
System.out.println("------------8888888888888----------------");
|
||||
|
|
@ -434,41 +441,49 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
|||
if(StringUtils.equals("pdf",nameLast)){
|
||||
zyJxdg.setJxrlPdfPath(zyJxdg.getJxrlFilePath());
|
||||
}else{
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyJxdg.getId());
|
||||
zykInfo.setBizTable("zy_jxdg");
|
||||
zykInfo.setWjlx(WjlxEnum.JXRL.getType());
|
||||
zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
zykInfo.setFileName(zyJxdg.getJxrlFilePath());
|
||||
// zykInfo.setPdfName(zyJxdg.getJxrlPdfPath());
|
||||
zykService.saveLocal(zykInfo);
|
||||
|
||||
if(StringUtils.equals("local",uploadType)) {
|
||||
FileUtil.mkdir(global.getContractDickPath());
|
||||
String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
|
||||
String docPath = upLoadPath + File.separator + zyJxdg.getJxrlFilePath();
|
||||
String namePath = dd + ".pdf";
|
||||
String pdfPath = global.getContractDickPath() + namePath;
|
||||
PDFUtil.office2PDF(docPath, pdfPath);
|
||||
zyJxdg.setJxrlPdfPath("contract/" + namePath);
|
||||
|
||||
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyJxdg.getId());
|
||||
zykInfo.setBizTable("zy_jxdg");
|
||||
zykInfo.setWjlx(WjlxEnum.JXRL.getType());
|
||||
zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
zykInfo.setFileName(zyJxdg.getJxrlFilePath());
|
||||
zykInfo.setPdfName(zyJxdg.getJxrlPdfPath());
|
||||
zykService.saveLocal(zykInfo);
|
||||
|
||||
|
||||
}else if(StringUtils.equals("sftp",uploadType)){
|
||||
ZykInfo zykInfo = new ZykInfo();
|
||||
zykInfo.setBizId(zyJxdg.getId());
|
||||
zykInfo.setBizTable("zy_jxdg");
|
||||
zykInfo.setWjlx(WjlxEnum.JXRL.getType());
|
||||
zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
zykInfo.setFileName(zyJxdg.getJxrlFilePath());
|
||||
Map<String,String> map = zykService.saveToZykJxdg(zykInfo);
|
||||
String fileName = map.get("data");
|
||||
String pdfName = map.get("pdfData");
|
||||
zyJxdg.setJxrlFilePath(fileName);
|
||||
zyJxdg.setJxrlPdfPath(pdfName);
|
||||
zykService.disConnect();
|
||||
}
|
||||
// if(StringUtils.equals("local",uploadType)) {
|
||||
// FileUtil.mkdir(global.getContractDickPath());
|
||||
// String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
|
||||
// String docPath = upLoadPath + File.separator + zyJxdg.getJxrlFilePath();
|
||||
// String namePath = dd + ".pdf";
|
||||
// String pdfPath = global.getContractDickPath() + namePath;
|
||||
// PDFUtil.office2PDF(docPath, pdfPath);
|
||||
// zyJxdg.setJxrlPdfPath("contract/" + namePath);
|
||||
//
|
||||
//
|
||||
// ZykInfo zykInfo = new ZykInfo();
|
||||
// zykInfo.setBizId(zyJxdg.getId());
|
||||
// zykInfo.setBizTable("zy_jxdg");
|
||||
// zykInfo.setWjlx(WjlxEnum.JXRL.getType());
|
||||
// zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
// zykInfo.setFileName(zyJxdg.getJxrlFilePath());
|
||||
// zykInfo.setPdfName(zyJxdg.getJxrlPdfPath());
|
||||
// zykService.saveLocal(zykInfo);
|
||||
//
|
||||
//
|
||||
// }else if(StringUtils.equals("sftp",uploadType)){
|
||||
// ZykInfo zykInfo = new ZykInfo();
|
||||
// zykInfo.setBizId(zyJxdg.getId());
|
||||
// zykInfo.setBizTable("zy_jxdg");
|
||||
// zykInfo.setWjlx(WjlxEnum.JXRL.getType());
|
||||
// zykInfo.setRwbh(zyJxdg.getRwbh());
|
||||
// zykInfo.setFileName(zyJxdg.getJxrlFilePath());
|
||||
// Map<String,String> map = zykService.saveToZykJxdg(zykInfo);
|
||||
// String fileName = map.get("data");
|
||||
// String pdfName = map.get("pdfData");
|
||||
// zyJxdg.setJxrlFilePath(fileName);
|
||||
// zyJxdg.setJxrlPdfPath(pdfName);
|
||||
// zykService.disConnect();
|
||||
// }
|
||||
}
|
||||
}else{
|
||||
zyJxdg.setJxrlPdfPath(null);
|
||||
|
|
|
|||
|
|
@ -133,7 +133,8 @@ spring:
|
|||
strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
|
||||
datasource:
|
||||
master:
|
||||
url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
# url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'
|
||||
# url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: root
|
||||
|
|
@ -366,4 +367,4 @@ sftp:
|
|||
password: sftp
|
||||
timeout: 1000
|
||||
uploadpath: kczx
|
||||
fullpath: /data
|
||||
fullpath: /data
|
||||
|
|
|
|||
|
|
@ -368,8 +368,8 @@ wjx:
|
|||
sftp:
|
||||
hostname: 210.47.29.99
|
||||
port: 22
|
||||
username: sftp
|
||||
password: Nenujwc@99
|
||||
username: root
|
||||
password: hmZ2a*G7fwwj
|
||||
timeout: 1000
|
||||
uploadpath: kczx
|
||||
fullpath: /data
|
||||
|
|
@ -60,7 +60,7 @@ spring:
|
|||
clusterCheckinInterval: 15000
|
||||
threadPool:
|
||||
class: org.quartz.simpl.SimpleThreadPool
|
||||
threadCount: 10
|
||||
threadCount: 100
|
||||
threadPriority: 5
|
||||
threadsInheritContextClassLoaderOfInitializingThread: true
|
||||
#json 时间戳统一转换
|
||||
|
|
@ -133,18 +133,24 @@ spring:
|
|||
master:
|
||||
url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
# password: root
|
||||
password: ABCabc@123
|
||||
# password: root
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
# 多数据源配置
|
||||
# multi-oracle:
|
||||
# url: jdbc:oracle:thin:@202.198.129.24:1521:orcl
|
||||
# username: C##XSKC
|
||||
# password: mAPP2t2ABAfx7
|
||||
# driver-class-name: oracle.jdbc.OracleDriver
|
||||
# multi-oracle:
|
||||
# url: jdbc:oracle:thin:@202.198.129.24:1521:orcl?useUnicode=true&characterEncoding=utf8
|
||||
# username: C##XSKC
|
||||
# password: mAPP2t2ABAfx7
|
||||
# driver-class-name: oracle.jdbc.OracleDriver
|
||||
|
||||
multi-oracle:
|
||||
url: jdbc:oracle:thin:@//202.198.129.24:1521/orcl
|
||||
username: C##XSKC
|
||||
password: mAPP2t2ABAfx7
|
||||
driver-class-name: oracle.jdbc.OracleDriver
|
||||
#redis 配置
|
||||
redis:
|
||||
database: 0
|
||||
database: 1
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password: ''
|
||||
|
|
@ -176,7 +182,7 @@ jeecg:
|
|||
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
|
||||
#local\minio\alioss
|
||||
uploadType: local
|
||||
# uploadType: sftp
|
||||
# uploadType: sftp
|
||||
# 前端访问地址
|
||||
domainUrl:
|
||||
pc: http://210.47.17.166
|
||||
|
|
@ -246,18 +252,11 @@ logging:
|
|||
level:
|
||||
org.jeecg.modules.system.mapper: info
|
||||
#swagger
|
||||
springfox:
|
||||
documentation:
|
||||
# 总开关（同时设置auto-startup=false，否则/v3/api-docs等接口仍能继续访问）
|
||||
enabled: false
|
||||
auto-startup: false
|
||||
swagger-ui:
|
||||
enabled: false
|
||||
knife4j:
|
||||
#开启增强配置
|
||||
enable: true
|
||||
#开启生产环境屏蔽
|
||||
production: true
|
||||
production: false
|
||||
basic:
|
||||
enable: true
|
||||
username: jeecg
|
||||
|
|
@ -319,9 +318,9 @@ jodconverter:
|
|||
# 使用本机作为转换服务器，如果使用其它主机作为转换服务器，则需要配置remote，
|
||||
# 请参考 org.jodconverter.boot.autoconfigure.JodConverterRemoteProperties
|
||||
local:
|
||||
enabled: true
|
||||
enabled: false
|
||||
# 为了避免不必要的兼容问题，需要配置本机的LibreOffice安装目录
|
||||
office-home: E:\BLXC\APPLICATION\libreoffice
|
||||
office-home: C:\Program Files\LibreOffice
|
||||
# 配置LibreOffice的服务端口，以逗号分隔，每个端口为一个独立的进程
|
||||
port-numbers: 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
|
||||
# 配置最大的任务队列
|
||||
|
|
@ -329,7 +328,7 @@ jodconverter:
|
|||
# 媒体处理器
|
||||
ffmpeg:
|
||||
# 根路径
|
||||
path: E:\BLXC\APPLICATION\ffmpg
|
||||
path: D:\ProgramGreeFile\ffmpeg\bin
|
||||
# 执行命令的核心文件
|
||||
executableFile: ${ffmpeg.path}\ffmpeg.exe
|
||||
# 压缩相关
|
||||
|
|
@ -364,12 +363,13 @@ wjx:
|
|||
appid: 1321039
|
||||
appkey: 55328ebd11964fc8b40c10011bcb425d
|
||||
url: https://www.wjx.cn/openapi/default.aspx
|
||||
|
||||
#SFTP
|
||||
sftp:
|
||||
hostname: 210.47.29.99
|
||||
port: 22
|
||||
username: sftp
|
||||
password: Nenujwc@99
|
||||
username: root
|
||||
password: hmZ2a*G7fwwj
|
||||
timeout: 1000
|
||||
uploadpath: kczx
|
||||
fullpath: /home/sftp
|
||||
fullpath: /data
|
||||
Loading…
Reference in New Issue