From 62d002fa3812f7236bea8c0e6b47b7fe29cefa6b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 26 Sep 2024 17:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncEvaluationsSzkcStat.java | 153 ++++ .../tools/ChangeTingKeTongJi.java | 4 +- .../entity/KcEvaluationsStat.java | 37 + .../mapper/KcEvaluationsStatMapper.java | 4 + .../mapper/xml/KcEvaluationsStatMapper.xml | 325 ++++++++ .../service/IKcEvaluationsStatService.java | 4 + .../impl/KcEvaluationsStatServiceImpl.java | 11 + .../controller/KcZzSzkcController.java | 729 ++++++++++++++++++ .../modules/kc/kcZzSzkc/entity/KcZzSzkc.java | 145 ++++ .../kc/kcZzSzkc/mapper/KcZzSzkcMapper.java | 17 + .../kc/kcZzSzkc/mapper/xml/KcZzSzkcMapper.xml | 12 + .../kc/kcZzSzkc/service/IKcZzSzkcService.java | 14 + .../service/impl/KcZzSzkcServiceImpl.java | 19 + .../kc/qa/mapper/xml/KcEvaluationMapper.xml | 5 +- .../kc/tktj/mapper/xml/KcTingkeMapper.xml | 4 +- .../service/impl/WjxDjxxServiceImpl.java | 9 +- .../controller/WjxWjxxTmlbController.java | 22 +- .../service/IWjxWjxxTmlbService.java | 2 + .../service/impl/WjxWjxxTmlbServiceImpl.java | 38 +- .../zyInfo/controller/ZyInfoController.java | 20 +- .../controller/ZyInfoStudentController.java | 2 +- 21 files changed, 1548 insertions(+), 28 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsSzkcStat.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/KcZzSzkcMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/xml/KcZzSzkcMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/IKcZzSzkcService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/impl/KcZzSzkcServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsSzkcStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsSzkcStat.java new file mode 100644 index 00000000..16b43a82 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsSzkcStat.java @@ -0,0 +1,153 @@ +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 SyncEvaluationsSzkcStat 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 param){ + List thpjblist = kcEvaluationsStatService.getSzkcpjbSyncList(); + + + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + + for(KcEvaluationsStat KcEvaluationsStat:thpjblist){ + KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1()); + List entityList = kcEvaluationsStatService.getSzkcJxsjSyncList(KcEvaluationsStat); + if(entityList!=null && entityList.size()>0){ + KcEvaluationsStat entity = entityList.get(0); + String col2745 = entity.getCol6176(); + if(col2745.length()>0){ + System.out.println("thpjb----"+entity.getCol00()); + String arr[] = col2745.split("@"); + try { + entity.setCol62(arr[1]); + }catch (Exception e){ + entity.setCol62(""); + } + try { + entity.setCol63(arr[2]); + }catch (Exception e){ + entity.setCol63(""); + } + try { + entity.setCol64(arr[3]); + }catch (Exception e){ + entity.setCol64(""); + } + try { + entity.setCol65(arr[4]); + }catch (Exception e){ + entity.setCol65(""); + } + try { + entity.setCol66(arr[5]); + }catch (Exception e){ + entity.setCol66(""); + } + try { + entity.setCol67(arr[6]); + }catch (Exception e){ + entity.setCol67(""); + } + try { + entity.setCol68(arr[7]); + }catch (Exception e){ + entity.setCol68(""); + } + try { + entity.setCol69(arr[8]); + }catch (Exception e){ + entity.setCol69(""); + } + try { + entity.setCol70(arr[9]); + }catch (Exception e){ + entity.setCol70(""); + } + try { + entity.setCol71(arr[10]); + }catch (Exception e){ + entity.setCol71(""); + } + try { + entity.setCol72(arr[11]); + }catch (Exception e){ + entity.setCol72(""); + } + try { + entity.setCol73(arr[12]); + }catch (Exception e){ + entity.setCol73(""); + } + try { + entity.setCol74(arr[13]); + }catch (Exception e){ + entity.setCol74(""); + } + try { + entity.setCol75(arr[14]); + }catch (Exception e){ + entity.setCol75(""); + } + try { + entity.setCol76(arr[15]); + }catch (Exception e){ + entity.setCol76(""); + } + + try { + entity.setCol6176(arr[0]); + }catch (Exception e){ + entity.setCol6176(""); + } + kcEvaluationsStatService.save(entity); + } + } + } + + //最后的保存 +// kcEvaluationsStatService.saveBatch(inslist); + + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java index 9344205a..3d18760e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java @@ -130,7 +130,7 @@ public class ChangeTingKeTongJi { // }); QueryWrapper evaQw = new QueryWrapper<>(); - evaQw.select("count(userid) as pkNum,userid"); + evaQw.select("count(userid) as pkNum,userid,tingketime"); evaQw.apply("(tingketime,kechengbiaoid,userid) in ( select max(tingketime) as tingketime,kechengbiaoid,userid from kc_tingke where true "+ "and tingketime >= STR_TO_DATE( '"+ startSj +"', '%Y-%m-%d' ) "+ @@ -145,7 +145,7 @@ public class ChangeTingKeTongJi { // evaQw.apply("tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); // evaQw.apply("tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); //evaQw.isNotNull("kechengbiaoid"); - evaQw.groupBy("userid"); + evaQw.groupBy("userid,tingketime"); evaQw.orderByAsc("tingketime"); List countTjList = kcTingkeService.list(evaQw); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java index d5e11429..6e657dcb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java @@ -260,6 +260,43 @@ public class KcEvaluationsStat implements Serializable { private java.lang.String col59; private java.lang.String col60; + + @Excel(name = "1.仪表整洁、举止得体、精神饱满", width = 15) + private java.lang.String col6176;//1.仪表整洁、举止得体、精神饱满 + @Excel(name = "2.遵守教学纪律，严格课堂管理", width = 15) + private java.lang.String col62;//2.遵守教学纪律，严格课堂管理 + @Excel(name = "3.备课充分，精心设计教学（有课件、教案等教学素材），教学投入", width = 15) + private java.lang.String col63;//3.备课充分，精心设计教学（有课件、教案等教学素材），教学投入 + @Excel(name = "4.坚持马克思主义立场观点方法，具有较为扎实的马克思主义理论功底，教学目标明确", width = 15) + private java.lang.String col64;//4.坚持马克思主义立场观点方法，具有较为扎实的马克思主义理论功底，教学目标明确 + @Excel(name = "5.有效使用统编教材配套课件、参考讲义、辅导用书，教学内容科学完整，基本理论阐释清楚，基本事实讲述准确，重点、难点比较突出", width = 15) + private java.lang.String col65;//5.有效使用统编教材配套课件、参考讲义、辅导用书，教学内容科学完整，基本理论阐释清楚，基本事实讲述准确，重点、难点比较突出 + @Excel(name = "6.理论联系实际，熟悉党史、新中国史、改革开放史、社会主义发展史、中华民族发展史，注重史论结合，教学素材多样，案例鲜活生动，及时将新时代中国特色社会主义的生动实践转化为课堂教学资源", width = 15) + private java.lang.String col66;//6.理论联系实际，熟悉党史、新中国史、改革开放史、社会主义发展史、中华民族发展史，注重史论结合，教学素材多样，案例鲜活生动，及时将新时代中国特色社会主义的生动实践转化为课堂教学资源 + @Excel(name = "7.贴近学生实际，善于发掘身边人身边事蕴含的育人元素，有效回应学生关心问题和思想困惑", width = 15) + private java.lang.String col67;//7.贴近学生实际，善于发掘身边人身边事蕴含的育人元素，有效回应学生关心问题和思想困惑 + @Excel(name = "8.熟悉教学法基本原理，注重教学逻辑与学术逻辑的辩证统一，教学设计符合学生认知规律、关注学生差异性", width = 15) + private java.lang.String col68;//8.熟悉教学法基本原理，注重教学逻辑与学术逻辑的辩证统一，教学设计符合学生认知规律、关注学生差异性 + @Excel(name = "9.熟练运用启发式、案例式等教学法，注重课堂互动，不照本宣科，善于调动学生积极性，启发学生思考", width = 15) + private java.lang.String col69;//9.熟练运用启发式、案例式等教学法，注重课堂互动，不照本宣科，善于调动学生积极性，启发学生思考 + @Excel(name = "10.综合运用现代信息技术手段，增强课堂教学的生动性、吸引力，帮助学生理解领会教学内容", width = 15) + private java.lang.String col70;//10.综合运用现代信息技术手段，增强课堂教学的生动性、吸引力，帮助学生理解领会教学内容 + @Excel(name = "11.注重思想性和理论性，具有亲和力和感染力，能够把道理讲深、讲透、讲活，学生学习积极性高，愿意与教师交流反馈", width = 15) + private java.lang.String col71;//11.注重思想性和理论性，具有亲和力和感染力，能够把道理讲深、讲透、讲活，学生学习积极性高，愿意与教师交流反馈 + @Excel(name = "12.注重价值引领，增进对党的创新理论的政治认同、思想认同、理论认同、情感认同，坚定“四个自信”", width = 15) + private java.lang.String col72;//12.注重价值引领，增进对党的创新理论的政治认同、思想认同、理论认同、情感认同，坚定“四个自信” + @Excel(name = "13.完成教学计划，课堂秩序良好", width = 15) + private java.lang.String col73;//13.完成教学计划，课堂秩序良好 + @Excel(name = "14.总体评价", width = 15) + private java.lang.String col74;//14.总体评价 + @Excel(name = "15.课堂诊断", width = 15) + private java.lang.String col75;//15.课堂诊断 + @Excel(name = "16.指导建议", width = 15) + private java.lang.String col76;//16.指导建议 + + + + @TableField(exist = false) private java.lang.String xqxn; @TableField(exist = false) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/KcEvaluationsStatMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/KcEvaluationsStatMapper.java index 4d392aae..4fbbdc44 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/KcEvaluationsStatMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/KcEvaluationsStatMapper.java @@ -33,4 +33,8 @@ public interface KcEvaluationsStatMapper extends BaseMapper { List getLbpjbJxsjSyncList(KcEvaluationsStat kcEvaluationsStat); List getYbtkbTwoSyncList(); + + List getSzkcpjbSyncList(); + + List getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index 8c110a7f..b0194a33 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -49,6 +49,14 @@ + + + + + + + + update kc_evaluations set textanscontent = REPLACE(textanscontent, '\n', ' ') diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/IKcEvaluationsStatService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/IKcEvaluationsStatService.java index d5829a67..40f59c77 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/IKcEvaluationsStatService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/IKcEvaluationsStatService.java @@ -32,4 +32,8 @@ public interface IKcEvaluationsStatService extends IService { List getLbpjbJxsjSyncList(KcEvaluationsStat kcEvaluationsStat); List getYbtkbTwoSyncList(); + + List getSzkcpjbSyncList(); + + List getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/impl/KcEvaluationsStatServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/impl/KcEvaluationsStatServiceImpl.java index 6bbcdd0c..3ddb01ae 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/impl/KcEvaluationsStatServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/service/impl/KcEvaluationsStatServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Collections; import java.util.List; /** @@ -67,4 +68,14 @@ public class KcEvaluationsStatServiceImpl extends ServiceImpl getYbtkbTwoSyncList() { return baseMapper.getYbtkbTwoSyncList(); } + + @Override + public List getSzkcpjbSyncList() { + return baseMapper.getSzkcpjbSyncList(); + } + + @Override + public List getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat) { + return baseMapper.getSzkcJxsjSyncList(kcEvaluationsStat); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java new file mode 100644 index 00000000..b1d56fae --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/controller/KcZzSzkcController.java @@ -0,0 +1,729 @@ +package org.jeecg.modules.kc.kcZzSzkc.controller; + +import java.util.*; +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 cn.hutool.core.date.DateUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser; +import org.jeecg.modules.kc.kcAssessuser.service.IKcAssessuserService; +import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc; +import org.jeecg.modules.kc.kcZzSzkc.service.IKcZzSzkcService; + +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.jeecg.modules.kc.ktgl.entity.KcKetangbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; +import org.jeecg.modules.kc.qa.entity.KcEvaluation; +import org.jeecg.modules.kc.qa.entity.KcEvaluationans; +import org.jeecg.modules.kc.qa.entity.KcEvaluations; +import org.jeecg.modules.kc.qa.service.IKcEvaluationService; +import org.jeecg.modules.kc.qa.service.IKcEvaluationansService; +import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; +import org.jeecg.modules.kc.tktj.entity.KcTingke; +import org.jeecg.modules.kc.tktj.service.IKcTingkeService; +import org.jeecg.modules.system.service.impl.SysBaseApiImpl; +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: 思政课程评价记录 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +@Api(tags="思政课程评价记录") +@RestController +@RequestMapping("/kcZzSzkc/kcZzSzkc") +@Slf4j +public class KcZzSzkcController extends JeecgController { + @Autowired + private IKcZzSzkcService kcZzSzkcService; + @Autowired + private IKcKetangbiaoService kcKetangbiaoService; + @Autowired + private IKcEvaluationService kcEvaluationService; + @Autowired + private IKcEvaluationsService kcEvaluationsService; + @Autowired + private IKcEvaluationansService kcEvaluationansService; + @Autowired + private ChangeTingKeTongJi changeTingKeTongJi; + @Autowired + private IKcAssessuserService kcAssessuserService; + @Autowired + private IKcTingkeService kcTingkeService; + @Autowired + private SysBaseApiImpl sysBaseApi; + + /** + * 分页列表查询 + * + * @param kcZzSzkc + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "思政课程评价记录-分页列表查询") + @ApiOperation(value="思政课程评价记录-分页列表查询", notes="思政课程评价记录-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcZzSzkc kcZzSzkc, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcZzSzkc, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(kcZzSzkc.getXqxn()),"b.title",kcZzSzkc.getXqxn()); + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); + String adminRole = "1";//0 admin + for(String role :roleList){ + if(StringUtils.equals("admin",role)){ + adminRole = "0"; + break; + } + } + if(StringUtils.equals("1",adminRole)){ + queryWrapper.eq("a.create_by",sysUser.getUsername()); + } + //-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理--------------------------- + +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcZzSzkc, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcZzSzkcService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcZzSzkc + * @return + */ + @AutoLog(value = "思政课程评价记录-添加") + @ApiOperation(value="思政课程评价记录-添加", notes="思政课程评价记录-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody KcZzSzkc kcZzSzkc) { + + + KcZzSzkc KcZzSzkcPar =kcZzSzkc; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc()); + queryWrapper.eq("skjs",KcZzSzkcPar.getSkjs()); + queryWrapper.eq("skdd",KcZzSzkcPar.getSkdd()); + queryWrapper.eq("skrq",KcZzSzkcPar.getSkrq()); + queryWrapper.eq("tkjsbh",KcZzSzkcPar.getTkjsbh()); + queryWrapper.eq("tkjsxm",KcZzSzkcPar.getTkjsxm()); + queryWrapper.like("pksj", DateUtil.format(KcZzSzkcPar.getPksj(),"yyyy-MM-dd")); + List listPar = kcZzSzkcService.list(queryWrapper); + if(listPar!=null&&listPar.size()>0){ + return Result.error("数据重复了，已经有评价数据"); + }else{ + QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); + kcKetangbiaoQueryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc()); + kcKetangbiaoQueryWrapper.eq("skdd",KcZzSzkcPar.getSkdd()); + kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd")); + kcKetangbiaoQueryWrapper.eq("skjs",KcZzSzkcPar.getSkjs()); + List kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); + if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ + KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); + KcZzSzkcPar.setKcbh(KcKetangbiao.getKcbh()); + + KcTingke kcTingke = new KcTingke(); + kcTingke.setTingketime(DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd")); + kcTingke.setKechengbiaoid(KcKetangbiao.getId()); + kcTingke.setUserid(KcZzSzkcPar.getTkjsbh()); + kcTingke.setUsername(KcZzSzkcPar.getTkjsxm()); + kcTingkeService.save(kcTingke); + + String ans1 = KcZzSzkcPar.getAns1();//25 + String ans2 = KcZzSzkcPar.getAns2();//26 + String ans3 = KcZzSzkcPar.getAns3();//27 + String ans4 = KcZzSzkcPar.getAns4();//23 + String ans5 = KcZzSzkcPar.getAns5();//24 + String ans6 = KcZzSzkcPar.getAns6();//28 + String ans7 = KcZzSzkcPar.getAns7();//29 + String ans8 = KcZzSzkcPar.getAns8();// + String ans9 = KcZzSzkcPar.getAns9();// + String ans10 = KcZzSzkcPar.getAns10();// + String ans11 = KcZzSzkcPar.getAns11();// + String ans12 = KcZzSzkcPar.getAns12();// + String ans13 = KcZzSzkcPar.getAns13();// + String ans14 = KcZzSzkcPar.getAns14();// + String ans15 = KcZzSzkcPar.getAns15();// + String ans16 = KcZzSzkcPar.getAns16();// + int upuserid = 0; + if(StringUtils.isNotBlank(KcZzSzkcPar.getTkjsbh())){ + upuserid = Integer.parseInt(KcZzSzkcPar.getTkjsbh()); + } + String upuser = KcZzSzkcPar.getTkjsxm(); + Date tkrq = KcZzSzkcPar.getPksj(); + int evaluationver = 5; + String kcid = KcKetangbiao.getId(); + KcEvaluation kcEvaluation = new KcEvaluation(); + kcEvaluation.setUpuserid(upuserid); + kcEvaluation.setUpuser(upuser); + kcEvaluation.setEvaluationver(evaluationver); + kcEvaluation.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss")); + kcEvaluation.setMinkcid(kcid); + kcEvaluation.setUpDate(tkrq); + kcEvaluation.setSource(3); + kcEvaluationService.save(kcEvaluation); + + KcEvaluations kcEvaluations = new KcEvaluations(); + kcEvaluations.setKetangbiaoid(kcid+""); + kcEvaluations.setUpuser(upuser); + kcEvaluations.setUpuserid(upuserid+""); + kcEvaluations.setEvaluationid(kcEvaluation.getId()); + kcEvaluations.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss")); + kcEvaluations.setUpDate(tkrq); + + QueryWrapper kcEvaluationansQueryWrapper1 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper1.eq("queid","61"); + kcEvaluationansQueryWrapper1.eq("ordernum",ans1); + List kcEvaluationansList1 = kcEvaluationansService.list(kcEvaluationansQueryWrapper1); + if(kcEvaluationansList1!=null && kcEvaluationansList1.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList1.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList1.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper2 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper2.eq("queid","62"); + kcEvaluationansQueryWrapper2.eq("ordernum",ans2); + List kcEvaluationansList2 = kcEvaluationansService.list(kcEvaluationansQueryWrapper2); + if(kcEvaluationansList2!=null && kcEvaluationansList2.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList2.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList2.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + + QueryWrapper kcEvaluationansQueryWrapper3 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper3.eq("queid","63"); + kcEvaluationansQueryWrapper3.eq("ordernum",ans3); + List kcEvaluationansList3 = kcEvaluationansService.list(kcEvaluationansQueryWrapper3); + if(kcEvaluationansList3!=null && kcEvaluationansList3.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList3.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList3.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper4 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper4.eq("queid","64"); + kcEvaluationansQueryWrapper4.eq("ordernum",ans4); + List kcEvaluationansList4 = kcEvaluationansService.list(kcEvaluationansQueryWrapper4); + if(kcEvaluationansList4!=null && kcEvaluationansList4.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList4.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList4.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper5 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper5.eq("queid","65"); + kcEvaluationansQueryWrapper5.eq("ordernum",ans5); + List kcEvaluationansList5 = kcEvaluationansService.list(kcEvaluationansQueryWrapper5); + if(kcEvaluationansList5!=null && kcEvaluationansList5.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList5.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList5.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper6 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper6.eq("queid","66"); + kcEvaluationansQueryWrapper6.eq("ordernum",ans6); + List kcEvaluationansList6 = kcEvaluationansService.list(kcEvaluationansQueryWrapper6); + if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper7 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper7.eq("queid","67"); + kcEvaluationansQueryWrapper7.eq("ordernum",ans7); + List kcEvaluationansList7 = kcEvaluationansService.list(kcEvaluationansQueryWrapper7); + if(kcEvaluationansList7!=null && kcEvaluationansList7.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList7.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList7.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper8 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper8.eq("queid","68"); + kcEvaluationansQueryWrapper8.eq("ordernum",ans8); + List kcEvaluationansList8 = kcEvaluationansService.list(kcEvaluationansQueryWrapper8); + if(kcEvaluationansList8!=null && kcEvaluationansList8.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList8.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList8.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper9 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper9.eq("queid","69"); + kcEvaluationansQueryWrapper9.eq("ordernum",ans9); + List kcEvaluationansList9 = kcEvaluationansService.list(kcEvaluationansQueryWrapper9); + if(kcEvaluationansList9!=null && kcEvaluationansList9.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList9.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList9.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper10 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper10.eq("queid","70"); + kcEvaluationansQueryWrapper10.eq("ordernum",ans10); + List kcEvaluationansList10 = kcEvaluationansService.list(kcEvaluationansQueryWrapper10); + if(kcEvaluationansList10!=null && kcEvaluationansList10.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList10.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList10.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper11 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper11.eq("queid","71"); + kcEvaluationansQueryWrapper11.eq("ordernum",ans11); + List kcEvaluationansList11 = kcEvaluationansService.list(kcEvaluationansQueryWrapper11); + if(kcEvaluationansList11!=null && kcEvaluationansList11.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList11.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList11.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper12 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper12.eq("queid","72"); + kcEvaluationansQueryWrapper12.eq("ordernum",ans12); + List kcEvaluationansList12 = kcEvaluationansService.list(kcEvaluationansQueryWrapper12); + if(kcEvaluationansList12!=null && kcEvaluationansList12.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList12.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList12.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper13 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper13.eq("queid","73"); + kcEvaluationansQueryWrapper13.eq("ordernum",ans13); + List kcEvaluationansList13 = kcEvaluationansService.list(kcEvaluationansQueryWrapper13); + if(kcEvaluationansList13!=null && kcEvaluationansList13.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList13.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList13.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + if(StringUtils.isNotBlank(ans14)){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(74); + kcEvaluations.setAnsid(0); + kcEvaluations.setTextanscontent(ans14); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper15 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper15.eq("queid","75"); + kcEvaluationansQueryWrapper15.eq("ordernum",ans15); + List kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper15); + if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + if(StringUtils.isNotBlank(ans16)){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(76); + kcEvaluations.setAnsid(0); + kcEvaluations.setTextanscontent(ans16); + kcEvaluationsService.save(kcEvaluations); + } + kcZzSzkcService.save(kcZzSzkc); + }else{ + return Result.error("课堂表数据错误，未查出对应数据"); + } + } + + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcZzSzkc + * @return + */ + @AutoLog(value = "思政课程评价记录-编辑") + @ApiOperation(value="思政课程评价记录-编辑", notes="思政课程评价记录-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcZzSzkc kcZzSzkc) { + kcZzSzkcService.updateById(kcZzSzkc); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "思政课程评价记录-通过id删除") + @ApiOperation(value="思政课程评价记录-通过id删除", notes="思政课程评价记录-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcZzSzkcService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "思政课程评价记录-批量删除") + @ApiOperation(value="思政课程评价记录-批量删除", notes="思政课程评价记录-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcZzSzkcService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "思政课程评价记录-通过id查询") + @ApiOperation(value="思政课程评价记录-通过id查询", notes="思政课程评价记录-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcZzSzkc kcZzSzkc = kcZzSzkcService.getById(id); + if(kcZzSzkc==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcZzSzkc); + } + + /** + * 导出excel + * + * @param request + * @param kcZzSzkc + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcZzSzkc kcZzSzkc) { + return super.exportXls(request, kcZzSzkc, KcZzSzkc.class, "思政课程评价记录"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + // 获取上传文件对象 + MultipartFile file = entity.getValue(); + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzSzkc.class, params); + String rest = ""; + String errorRest = ""; + for(KcZzSzkc KcZzSzkcPar : list){ + if(StringUtils.isBlank(KcZzSzkcPar.getTkjsbh())){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + String upuser = KcZzSzkcPar.getTkjsxm(); + queryWrapper1.eq("username",upuser); + queryWrapper1.last("limit 1"); + KcAssessuser KcCasusers = kcAssessuserService.getOne(queryWrapper1); + if(KcCasusers!=null){ + KcZzSzkcPar.setTkjsbh(KcCasusers.getUsercode()+""); + } + } + + } + List newList = new ArrayList<>(); + int errNum = 0; + for(int i=0;i queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("kcbh",KcZzSzkcPar.getKcbh()); + queryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc()); + queryWrapper.eq("skjs",KcZzSzkcPar.getSkjs()); + queryWrapper.eq("skdd",KcZzSzkcPar.getSkdd()); + queryWrapper.eq("skrq",KcZzSzkcPar.getSkrq()); + queryWrapper.eq("tkjsbh",KcZzSzkcPar.getTkjsbh()); + queryWrapper.eq("tkjsxm",KcZzSzkcPar.getTkjsxm()); + queryWrapper.like("pksj",DateUtil.format(KcZzSzkcPar.getPksj(),"yyyy-MM-dd")); + List listPar = kcZzSzkcService.list(queryWrapper); + if(listPar!=null&&listPar.size()>0){ + errNum++; + errorRest += "已经导入（重复数据）："+KcZzSzkcPar.getKcmc()+"-"+KcZzSzkcPar.getSkjs()+"-"+KcZzSzkcPar.getSkdd()+"-"+KcZzSzkcPar.getTkjsbh()+"-"+KcZzSzkcPar.getTkjsxm()+"
"; + }else{ + QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); +// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzSzkcPar.getKcbh()); + kcKetangbiaoQueryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc()); + kcKetangbiaoQueryWrapper.eq("skdd",KcZzSzkcPar.getSkdd()); + kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd")); + kcKetangbiaoQueryWrapper.eq("skjs",KcZzSzkcPar.getSkjs()); + List kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); + if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ + KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); + KcZzSzkcPar.setKcbh(KcKetangbiao.getKcbh()); + newList.add(KcZzSzkcPar); + + KcTingke kcTingke = new KcTingke(); + kcTingke.setTingketime(DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd")); + kcTingke.setKechengbiaoid(KcKetangbiao.getId()); + kcTingke.setUserid(KcZzSzkcPar.getTkjsbh()); + kcTingke.setUsername(KcZzSzkcPar.getTkjsxm()); + kcTingkeService.save(kcTingke); + + String ans1 = KcZzSzkcPar.getAns1();//25 授课有启发性，能给予学生思考、联想、创造的启迪 + String ans2 = KcZzSzkcPar.getAns2();//26 能有效利用各种教学媒体，课件或板书使用效果好 + String ans3 = KcZzSzkcPar.getAns3();//27 仪表得体，按时上下课，严格要求学生 + String ans4 = KcZzSzkcPar.getAns4();//23 讲课有热情，精神饱满，能调动学生情绪，课堂气氛活跃 + String ans5 = KcZzSzkcPar.getAns5();//24 教学目标明确，内容丰富，重点突出，语言表达清楚 + String ans6 = KcZzSzkcPar.getAns6();//28 无迟到、早退、旷课现象 + String ans7 = KcZzSzkcPar.getAns7();//29 课堂教学秩序好，无喧闹、打瞌睡、发短信、玩手机等现象 + int upuserid = 0; + if(StringUtils.isNotBlank(KcZzSzkcPar.getTkjsbh())){ + upuserid = Integer.parseInt(KcZzSzkcPar.getTkjsbh()); + } + String upuser = KcZzSzkcPar.getTkjsxm(); + Date tkrq = KcZzSzkcPar.getPksj(); + int evaluationver = 5; + String kcid = KcKetangbiao.getId(); + KcEvaluation kcEvaluation = new KcEvaluation(); + kcEvaluation.setUpuserid(upuserid); + kcEvaluation.setUpuser(upuser); + kcEvaluation.setEvaluationver(evaluationver); + kcEvaluation.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss")); + kcEvaluation.setMinkcid(kcid); + kcEvaluation.setUpDate(tkrq); + kcEvaluation.setSource(3); + kcEvaluationService.save(kcEvaluation); + + KcEvaluations kcEvaluations = new KcEvaluations(); + kcEvaluations.setKetangbiaoid(kcid+""); + kcEvaluations.setUpuser(upuser); + kcEvaluations.setUpuserid(upuserid+""); + kcEvaluations.setEvaluationid(kcEvaluation.getId()); + kcEvaluations.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss")); + kcEvaluations.setUpDate(tkrq); + + + if("A".equals(ans1)){ans1 = "5";} + else if("B".equals(ans1)){ans1 = "4";} + else if("C".equals(ans1)){ans1 = "3";} + else if("D".equals(ans1)){ans1 = "2";} + else if("E".equals(ans1)){ans1 = "1";} + + if("A".equals(ans2)){ans2 = "5";} + else if("B".equals(ans2)){ans2 = "4";} + else if("C".equals(ans2)){ans2 = "3";} + else if("D".equals(ans2)){ans2 = "2";} + else if("E".equals(ans2)){ans2 = "1";} + + if("A".equals(ans3)){ans3 = "5";} + else if("B".equals(ans3)){ans3 = "4";} + else if("C".equals(ans3)){ans3 = "3";} + else if("D".equals(ans3)){ans3 = "2";} + else if("E".equals(ans3)){ans3 = "1";} + + if("A".equals(ans4)){ans4 = "5";} + else if("B".equals(ans4)){ans4 = "4";} + else if("C".equals(ans4)){ans4 = "3";} + else if("D".equals(ans4)){ans4 = "2";} + else if("E".equals(ans4)){ans4 = "1";} + + if("A".equals(ans5)){ans5 = "5";} + else if("B".equals(ans5)){ans5 = "4";} + else if("C".equals(ans5)){ans5 = "3";} + else if("D".equals(ans5)){ans5 = "2";} + else if("E".equals(ans5)){ans5 = "1";} + + if("A".equals(ans6)){ans6 = "5";} + else if("B".equals(ans6)){ans6 = "4";} + else if("C".equals(ans6)){ans6 = "3";} + else if("D".equals(ans6)){ans6 = "2";} + else if("E".equals(ans6)){ans6 = "1";} + + if("A".equals(ans7)){ans7 = "5";} + else if("B".equals(ans7)){ans7 = "4";} + else if("C".equals(ans7)){ans7 = "3";} + else if("D".equals(ans7)){ans7 = "2";} + else if("E".equals(ans7)){ans7 = "1";} + + + + QueryWrapper kcEvaluationansQueryWrapper1 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper1.eq("queid","61"); + kcEvaluationansQueryWrapper1.eq("ordernum",ans1); + List kcEvaluationansList1 = kcEvaluationansService.list(kcEvaluationansQueryWrapper1); + if(kcEvaluationansList1!=null && kcEvaluationansList1.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList1.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList1.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper2 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper2.eq("queid","62"); + kcEvaluationansQueryWrapper2.eq("ordernum",ans2); + List kcEvaluationansList2 = kcEvaluationansService.list(kcEvaluationansQueryWrapper2); + if(kcEvaluationansList2!=null && kcEvaluationansList2.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList2.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList2.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + + QueryWrapper kcEvaluationansQueryWrapper3 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper3.eq("queid","63"); + kcEvaluationansQueryWrapper3.eq("ordernum",ans3); + List kcEvaluationansList3 = kcEvaluationansService.list(kcEvaluationansQueryWrapper3); + if(kcEvaluationansList3!=null && kcEvaluationansList3.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList3.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList3.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper4 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper4.eq("queid","64"); + kcEvaluationansQueryWrapper4.eq("ordernum",ans4); + List kcEvaluationansList4 = kcEvaluationansService.list(kcEvaluationansQueryWrapper4); + if(kcEvaluationansList4!=null && kcEvaluationansList4.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList4.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList4.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + if(StringUtils.isNotBlank(ans5)){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(65); + kcEvaluations.setAnsid(0); + kcEvaluations.setTextanscontent(ans5); + kcEvaluationsService.save(kcEvaluations); + } + + QueryWrapper kcEvaluationansQueryWrapper6 = new QueryWrapper<>(); + kcEvaluationansQueryWrapper6.eq("queid","66"); + kcEvaluationansQueryWrapper6.eq("ordernum",ans6); + List kcEvaluationansList6 = kcEvaluationansService.list(kcEvaluationansQueryWrapper6); + if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid()); + kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId()); + kcEvaluationsService.save(kcEvaluations); + } + + if(StringUtils.isNotBlank(ans7)){ + kcEvaluations.setId(null); + kcEvaluations.setQueid(67); + kcEvaluations.setAnsid(0); + kcEvaluations.setTextanscontent(ans7); + kcEvaluationsService.save(kcEvaluations); + } + + + }else{ + errNum++; + newList.remove(KcZzSzkcPar); + errorRest += "未查到匹配课堂："+KcZzSzkcPar.getKcmc()+"-"+KcZzSzkcPar.getSkjs()+"-"+KcZzSzkcPar.getSkdd()+"-"+KcZzSzkcPar.getTkjsbh()+"-"+KcZzSzkcPar.getTkjsxm()+"
"; + } + } + } + //update-begin-author:taoyan date:20190528 for:批量插入数据 + long start = System.currentTimeMillis(); + service.saveBatch(newList); + //400条 saveBatch消耗时间1592毫秒 循环插入消耗时间1947毫秒 + //1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒 + log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); + //update-end-author:taoyan date:20190528 for:批量插入数据 +// rest = "文件导入成功！数据行数：" + newList.size(); + if(newList.size()>0){ + rest = "文件导入成功!数据行数：" + newList.size(); + } + if(StringUtils.isNotBlank(errorRest)){ + errorRest = "
共错误："+errNum+"行；错误数据如下：
"+errorRest; + } + //刷新统计 + changeTingKeTongJi.changeTingKeTongji(); + return Result.ok(rest+errorRest); + } catch (Exception e) { + //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示 + String msg = e.getMessage(); + log.error(msg, e); + if(msg!=null && msg.indexOf("Duplicate entry")>=0){ + return Result.error("文件导入失败:有重复数据！"); + }else{ + return Result.error("文件导入失败:" + e.getMessage()); + } + //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示 + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.error("文件导入失败！"); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java new file mode 100644 index 00000000..4b41949f --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/entity/KcZzSzkc.java @@ -0,0 +1,145 @@ +package org.jeecg.modules.kc.kcZzSzkc.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +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: 思政课程评价记录 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +@Data +@TableName("kc_zz_szkc") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_zz_szkc对象", description="思政课程评价记录") +public class KcZzSzkc implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**课程编号*/ + @Excel(name = "课程编号", width = 15) + @ApiModelProperty(value = "课程编号") + private java.lang.String kcbh; + /**课程名称*/ + @Excel(name = "课程名称", width = 15) + @ApiModelProperty(value = "课程名称") + private java.lang.String kcmc; + /**授课教师*/ + @Excel(name = "授课教师", width = 15) + @ApiModelProperty(value = "授课教师") + private java.lang.String skjs; + /**授课时间*/ + @Excel(name = "授课时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "授课时间") + private java.util.Date skrq; + /**上课地点*/ + @Excel(name = "上课地点", width = 15) + @ApiModelProperty(value = "上课地点") + private java.lang.String skdd; + /**听课教师编号*/ + @Excel(name = "听课教师编号", width = 15) + @ApiModelProperty(value = "听课教师编号") + private java.lang.String tkjsbh; + /**听课教师姓名*/ + @Excel(name = "听课教师姓名", width = 15) + @ApiModelProperty(value = "听课教师姓名") + private java.lang.String tkjsxm; + /**评课时间*/ + @Excel(name = "评课时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "评课时间") + private java.util.Date pksj; + /**教学态度*/ + @Excel(name = "教学态度", width = 15) + @ApiModelProperty(value = "教学态度") + @Dict(dicCode = "five_dict") + private java.lang.String ans1; + /**教学内容*/ + @Excel(name = "教学内容", width = 15) + @ApiModelProperty(value = "教学内容") + @Dict(dicCode = "five_dict") + private java.lang.String ans2; + /**教学方法*/ + @Excel(name = "教学方法", width = 15) + @ApiModelProperty(value = "教学方法") + @Dict(dicCode = "five_dict") + private java.lang.String ans3; + /**教学效果*/ + @Excel(name = "教学效果", width = 15) + @ApiModelProperty(value = "教学效果") + @Dict(dicCode = "five_dict") + private java.lang.String ans4; + /**课堂诊断*/ + @Excel(name = "课堂诊断", width = 15) + @ApiModelProperty(value = "课堂诊断") + @Dict(dicCode = "five_dict") + private java.lang.String ans5; + /**总体评价*/ + @Excel(name = "总体评价", width = 15) + @ApiModelProperty(value = "总体评价") + @Dict(dicCode = "five_dict") + private java.lang.String ans6; + /**指导建议*/ + @Excel(name = "指导建议", width = 15) + @ApiModelProperty(value = "指导建议") + @Dict(dicCode = "five_dict") + private java.lang.String ans7; + @Dict(dicCode = "five_dict") + private java.lang.String ans8; + @Dict(dicCode = "five_dict") + private java.lang.String ans9; + @Dict(dicCode = "five_dict") + private java.lang.String ans10; + @Dict(dicCode = "five_dict") + private java.lang.String ans11; + @Dict(dicCode = "five_dict") + private java.lang.String ans12; + @Dict(dicCode = "five_dict") + private java.lang.String ans13; + private java.lang.String ans14; + private java.lang.String ans15; + private java.lang.String ans16; + + @TableField(exist = false) + private String xqxn; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/KcZzSzkcMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/KcZzSzkcMapper.java new file mode 100644 index 00000000..60aedb4b --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/KcZzSzkcMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.kcZzSzkc.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 思政课程评价记录 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +public interface KcZzSzkcMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/xml/KcZzSzkcMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/xml/KcZzSzkcMapper.xml new file mode 100644 index 00000000..a6670f64 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/mapper/xml/KcZzSzkcMapper.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/IKcZzSzkcService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/IKcZzSzkcService.java new file mode 100644 index 00000000..a1d19fba --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/IKcZzSzkcService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcZzSzkc.service; + +import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 思政课程评价记录 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +public interface IKcZzSzkcService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/impl/KcZzSzkcServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/impl/KcZzSzkcServiceImpl.java new file mode 100644 index 00000000..795e97ed --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzSzkc/service/impl/KcZzSzkcServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.kcZzSzkc.service.impl; + +import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc; +import org.jeecg.modules.kc.kcZzSzkc.mapper.KcZzSzkcMapper; +import org.jeecg.modules.kc.kcZzSzkc.service.IKcZzSzkcService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 思政课程评价记录 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +@Service +public class KcZzSzkcServiceImpl extends ServiceImpl implements IKcZzSzkcService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index b9bec493..780caac9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -34,14 +34,15 @@ and (cu.xm like concat('%',#{kcEvaluation.username},'%') or cu.gh like concat('%',#{kcEvaluation.username},'%')) - GROUP BY ev.upuserid, cu.dwh + GROUP BY ev.upuserid, cu.dwh, + cu.xm,kt.skrq ,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 , tklx AS tklx 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 + GROUP BY gh,xm,a.tklx ) au on tk.upuserid = au.usercode 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 55e67528..bb0ec9ac 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 @@ -499,12 +499,12 @@ left join ( SELECT id, user_id, ketangbiao_id, notes - FROM ( SELECT distinct id, user_id, ketangbiao_id, notes, create_time FROM kc_ketang_suibi WHERE + FROM ( SELECT id, user_id, ketangbiao_id, notes FROM kc_ketang_suibi WHERE user_id = #{userid} ORDER BY create_time DESC ) a - GROUP BY user_id, ketangbiao_id + GROUP BY id, user_id, ketangbiao_id, notes ) suibi on suibi.ketangbiao_id = tk.ketangbiaoid LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcbh = tkpj.kbbh diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index f9a1bc4e..0cbf119c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -112,7 +112,14 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl Map map = new HashMap<>(); map.put("vid",Integer.valueOf(vid)); - map.put("inputcosttime",ChronoUnit.SECONDS.between(openTime.toInstant(),date.toInstant())); + Long djys = ChronoUnit.SECONDS.between(wds.getOpenTime().toInstant(),wds.getCommitTime().toInstant()); + if(djys<3){ + djys = 10L; + } + System.out.println("--------------------------------------------------"); + System.out.println("---------------djys--"+djys+"---------------------------"); + System.out.println("--------------------------------------------------"); + map.put("inputcosttime", djys); map.put("submitdata",submitData); map.put("sojumpparm",user.getUsername());//自定义链接参数，用来透传用户ID //调用接口,提交 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index 6e441862..d5f8ed00 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -128,12 +128,13 @@ public class WjxWjxxTmlbController extends JeecgController add(@RequestBody List list) { if(list.size()>0){ String mainId = list.get(0).getMainId(); - - QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper(); - wjxWjxxTmlbQueryWrapper.eq("main_id",mainId); - List list2 = wjxWjxxTmlbService.list(wjxWjxxTmlbQueryWrapper); - for(WjxWjxxTmlb WjxWjxxTmlb:list2){ - wjxWjxxTmlbService.removeByMainId(WjxWjxxTmlb.getId()); + if(StringUtils.isNotBlank(mainId)){ + QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper(); + wjxWjxxTmlbQueryWrapper.eq("main_id",mainId); + List list2 = wjxWjxxTmlbService.list(wjxWjxxTmlbQueryWrapper); + for(WjxWjxxTmlb WjxWjxxTmlb:list2){ + wjxWjxxTmlbService.removeByMainId(WjxWjxxTmlb.getId()); + } } for(WjxWjxxTmlbPage wjxWjxxTmlbPage:list){ @@ -408,4 +409,13 @@ public class WjxWjxxTmlbController extends JeecgController> getTmxxByTmlbid(@RequestParam(name="id",required=true) String id) { + List WjxWjxxTmlbList = wjxWjxxTmlbService.getTmxxByTmlbid(id); + return Result.OK(WjxWjxxTmlbList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java index 2b071276..a823938d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java @@ -57,4 +57,6 @@ public interface IWjxWjxxTmlbService extends IService { IPage distinctList(Page page, QueryWrapper queryWrapper); List getTmxxPeop(String id); + + List getTmxxByTmlbid(String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java index b132ec2e..8feb9cd3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java @@ -53,14 +53,14 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl getTmxxByTmlbid(String id) { + QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper(); + wjxWjxxTmlbQueryWrapper.eq("id",id); + List list = wjxWjxxTmlbMapper.selectList(wjxWjxxTmlbQueryWrapper); + for(WjxWjxxTmlb WjxWjxxTmlb:list){ + List list2= wjxWjxxTmxxMapper.selectByMainId(WjxWjxxTmlb.getId()); + String itemSelected = ""; + for(WjxWjxxTmxx WjxWjxxTmxx:list2){ + if(StringUtils.equals(WjxWjxxTmxx.getItemSelected(),"true")){ + itemSelected = itemSelected+WjxWjxxTmxx.getItemIndex()+","; + } + } + if(StringUtils.isNotBlank(itemSelected)){ + itemSelected = itemSelected.substring(0, itemSelected.length()-1); + } + WjxWjxxTmlb.setItemSelected(itemSelected); + WjxWjxxTmlb.setWjxWjxxTmxxList(list2); + } + return list; + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index 196191ad..cad2706a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -175,12 +175,20 @@ public class ZyInfoController extends JeecgController { queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); queryWrapper.orderByAsc("a.sort - 0"); IPage pageList = zyInfoService.page(page, queryWrapper); - pageList.getRecords().forEach(zyInfo1 -> { - String xkrs = kcKechengbiao.getXkrs(); - zyInfo1.setXkxs(xkrs); - int wtj = Integer.parseInt(xkrs)-Integer.parseInt(zyInfo1.getDpynum())-Integer.parseInt(zyInfo1.getYpynum()); - zyInfo1.setWtjnum(wtj+""); - }); + try{ + if(kcKechengbiao!=null&&StringUtils.isNotBlank(kcKechengbiao.getXkrs())){ + pageList.getRecords().forEach(zyInfo1 -> { + String xkrs = kcKechengbiao.getXkrs(); + zyInfo1.setXkxs(xkrs); + int wtj = Integer.parseInt(xkrs)-Integer.parseInt(zyInfo1.getDpynum())-Integer.parseInt(zyInfo1.getYpynum()); + zyInfo1.setWtjnum(wtj+""); + }); + } + + }catch (Exception e){ + e.printStackTrace(); + } + return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index ef3f48e7..c7e4adb5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -233,7 +233,7 @@ public class ZyInfoStudentController extends JeecgController pageList = zyInfoStudentService.getList2(page, queryWrapper); for(ZyInfoStudent ZyInfoStudentPar:pageList.getRecords()){ List list = zyInfoStudentService.getCcjg(ZyInfoStudentPar);