diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/controller/KcXsktjxmydcpController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/controller/KcXsktjxmydcpController.java new file mode 100644 index 00000000..cbf3f401 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/controller/KcXsktjxmydcpController.java @@ -0,0 +1,185 @@ +package org.jeecg.modules.kc.kcXsktjxmydcp.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.kcXsktjxmydcp.entity.KcXsktjxmydcp; +import org.jeecg.modules.kc.kcXsktjxmydcp.service.IKcXsktjxmydcpService; + +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: 学生课堂教学满意度测评 + * @Author: jeecg-boot + * @Date: 2024-05-08 + * @Version: V1.0 + */ +@Api(tags="学生课堂教学满意度测评") +@RestController +@RequestMapping("/kcXsktjxmydcp/kcXsktjxmydcp") +@Slf4j +public class KcXsktjxmydcpController extends JeecgController { + @Autowired + private IKcXsktjxmydcpService kcXsktjxmydcpService; + + /** + * 分页列表查询 + * + * @param kcXsktjxmydcp + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "学生课堂教学满意度测评-分页列表查询") + @ApiOperation(value="学生课堂教学满意度测评-分页列表查询", notes="学生课堂教学满意度测评-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcXsktjxmydcp kcXsktjxmydcp, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcXsktjxmydcp, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcXsktjxmydcpService.page(page, queryWrapper); + return Result.OK(pageList); + } + + @ApiOperation(value="学生课堂教学满意度测评-分页列表查询", notes="学生课堂教学满意度测评-分页列表查询") + @GetMapping(value = "/groupByList") + public Result> groupByList(KcXsktjxmydcp kcXsktjxmydcp, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcXsktjxmydcp, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcXsktjxmydcpService.groupByList(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcXsktjxmydcp + * @return + */ + @AutoLog(value = "学生课堂教学满意度测评-添加") + @ApiOperation(value="学生课堂教学满意度测评-添加", notes="学生课堂教学满意度测评-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody KcXsktjxmydcp kcXsktjxmydcp) { + kcXsktjxmydcpService.save(kcXsktjxmydcp); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcXsktjxmydcp + * @return + */ + @AutoLog(value = "学生课堂教学满意度测评-编辑") + @ApiOperation(value="学生课堂教学满意度测评-编辑", notes="学生课堂教学满意度测评-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcXsktjxmydcp kcXsktjxmydcp) { + kcXsktjxmydcpService.updateById(kcXsktjxmydcp); + 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) { + kcXsktjxmydcpService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "学生课堂教学满意度测评-批量删除") + @ApiOperation(value="学生课堂教学满意度测评-批量删除", notes="学生课堂教学满意度测评-批量删除") + @RequiresPermissions("kcXsktjxmydcp:kc_xsktjxmydcp:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcXsktjxmydcpService.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) { + KcXsktjxmydcp kcXsktjxmydcp = kcXsktjxmydcpService.getById(id); + if(kcXsktjxmydcp==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcXsktjxmydcp); + } + + /** + * 导出excel + * + * @param request + * @param kcXsktjxmydcp + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcXsktjxmydcp kcXsktjxmydcp) { + return super.exportXls(request, kcXsktjxmydcp, KcXsktjxmydcp.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, KcXsktjxmydcp.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/entity/KcXsktjxmydcp.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/entity/KcXsktjxmydcp.java new file mode 100644 index 00000000..11a4c804 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/entity/KcXsktjxmydcp.java @@ -0,0 +1,159 @@ +package org.jeecg.modules.kc.kcXsktjxmydcp.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: 学生课堂教学满意度测评 + * @Author: jeecg-boot + * @Date: 2024-05-08 + * @Version: V1.0 + */ +@Data +@TableName("kc_xsktjxmydcp") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_xsktjxmydcp对象", description="学生课堂教学满意度测评") +public class KcXsktjxmydcp 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 kktzdh; + /**课程编号*/ + @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 jgh; + /**授课教师*/ + @Excel(name = "授课教师", width = 15) + @ApiModelProperty(value = "授课教师") + private java.lang.String skjs; + /**开课单位*/ + @Excel(name = "开课单位", width = 15) + @ApiModelProperty(value = "开课单位") + private java.lang.String kkdw; + /**实验学时*/ + @Excel(name = "实验学时", width = 15) + @ApiModelProperty(value = "实验学时") + private java.lang.String sxxs; + /**实践学时*/ + @Excel(name = "实践学时", width = 15) + @ApiModelProperty(value = "实践学时") + private java.lang.String sjxs; + /**讲座学时*/ + @Excel(name = "讲座学时", width = 15) + @ApiModelProperty(value = "讲座学时") + private java.lang.String jzxs; + /**讲课学时*/ + @Excel(name = "讲课学时", width = 15) + @ApiModelProperty(value = "讲课学时") + private java.lang.String jkxs; + /**学生人数*/ + @Excel(name = "学生人数", width = 15) + @ApiModelProperty(value = "学生人数") + private java.lang.String xsrs; + /**样本总数*/ + @Excel(name = "样本总数", width = 15) + @ApiModelProperty(value = "样本总数") + private java.lang.String ybzs; + /**参评率（%）*/ + @Excel(name = "参评率（%）", width = 15) + @ApiModelProperty(value = "参评率（%）") + private java.lang.String cpl; + /**有效数*/ + @Excel(name = "有效数", width = 15) + @ApiModelProperty(value = "有效数") + private java.lang.String yxs; + /**综合评价*/ + @Excel(name = "综合评价", width = 15) + @ApiModelProperty(value = "综合评价") + private java.lang.String zhpj; + /**重视学生的成长引领，关心学生的学习需求，乐于与学生交流。*/ + @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 xnxq; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/mapper/KcXsktjxmydcpMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/mapper/KcXsktjxmydcpMapper.java new file mode 100644 index 00000000..0cd7b8ab --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/mapper/KcXsktjxmydcpMapper.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.kc.kcXsktjxmydcp.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.kcXsktjxmydcp.entity.KcXsktjxmydcp; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学生课堂教学满意度测评 + * @Author: jeecg-boot + * @Date: 2024-05-08 + * @Version: V1.0 + */ +public interface KcXsktjxmydcpMapper extends BaseMapper { + + IPage groupByList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/mapper/xml/KcXsktjxmydcpMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/mapper/xml/KcXsktjxmydcpMapper.xml new file mode 100644 index 00000000..e3451a59 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/mapper/xml/KcXsktjxmydcpMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/service/IKcXsktjxmydcpService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/service/IKcXsktjxmydcpService.java new file mode 100644 index 00000000..b93865ab --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/service/IKcXsktjxmydcpService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.kc.kcXsktjxmydcp.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.kc.kcXsktjxmydcp.entity.KcXsktjxmydcp; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学生课堂教学满意度测评 + * @Author: jeecg-boot + * @Date: 2024-05-08 + * @Version: V1.0 + */ +public interface IKcXsktjxmydcpService extends IService { + + IPage groupByList(Page page, QueryWrapper queryWrapper); +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/service/impl/KcXsktjxmydcpServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/service/impl/KcXsktjxmydcpServiceImpl.java new file mode 100644 index 00000000..a995d11c --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXsktjxmydcp/service/impl/KcXsktjxmydcpServiceImpl.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.kc.kcXsktjxmydcp.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.kc.kcXsktjxmydcp.entity.KcXsktjxmydcp; +import org.jeecg.modules.kc.kcXsktjxmydcp.mapper.KcXsktjxmydcpMapper; +import org.jeecg.modules.kc.kcXsktjxmydcp.service.IKcXsktjxmydcpService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学生课堂教学满意度测评 + * @Author: jeecg-boot + * @Date: 2024-05-08 + * @Version: V1.0 + */ +@Service +public class KcXsktjxmydcpServiceImpl extends ServiceImpl implements IKcXsktjxmydcpService { + + @Override + public IPage groupByList(Page page, QueryWrapper queryWrapper) { + return baseMapper.groupByList(page, queryWrapper); + } +} 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 84456379..01f5771d 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 @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.zyInfo.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,13 +10,18 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService; +import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import org.jeecg.modules.kc.zyInfo.service.IZyInfoService; @@ -57,6 +63,8 @@ public class ZyInfoController extends JeecgController { @Autowired private IKcSysConfigService kcSysConfigService; + @Autowired + private IKcKechengbiaoService kcKechengbiaoService; /** * 分页列表查询 * @@ -74,6 +82,14 @@ public class ZyInfoController extends JeecgController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyInfo, req.getParameterMap()); + if(StringUtils.isNotEmpty(zyInfo.getSflssj())){ + String date = DateUtils.formatDate(new Date(),"yyyy-MM-dd"); + if(StringUtils.equals("0",zyInfo.getSflssj())){//不是历史 + queryWrapper.ge("end_time",date); + }else{//历史作业 + queryWrapper.lt("end_time",date); + } + } Page page = new Page(pageNo, pageSize); IPage pageList = zyInfoService.page(page, queryWrapper); return Result.OK(pageList); @@ -90,8 +106,14 @@ public class ZyInfoController extends JeecgController { @PostMapping(value = "/add") public Result add(@RequestBody ZyInfo zyInfo) { KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); - zyInfo.setXnxq( kcSysConfig.getFlag1()); + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + kcKechengbiaoQueryWrapper.last("limit 1"); + KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); + zyInfo.setXnxq(kcSysConfig.getFlag1()); zyInfo.setZyStatus("0"); + zyInfo.setXkxs(kcKechengbiao.getXkrs()); zyInfoService.save(zyInfo); return Result.OK("添加成功！"); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java index 130ac8ef..f0eda264 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java @@ -4,10 +4,8 @@ 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 com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -115,5 +113,10 @@ public class ZyInfo implements Serializable { private java.lang.Double aigctgl; private java.lang.String rwbh; + private java.lang.String filePath; + private java.lang.String xkxs;//选课学生 + + @TableField(exist = false) + private String sflssj;//是否历史数据 } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java index 01c594b9..3f66edcf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java @@ -210,8 +210,8 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl fileMap = new HashMap();