From 6d7501e7b85b0d2c1ad81926f9b533c999fbcef6 Mon Sep 17 00:00:00 2001 From: "@t2652009480" <2652009480@qq.com> Date: Mon, 5 Aug 2024 14:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E7=94=9F=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8F=AD=E7=BA=A7=E3=80=81=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=81=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tch/TchTeachingManagementController.java | 89 +++++++- .../trade/entity/TchStartCourseNameList.java | 11 + .../entity/TchStartCourseNameListExample.java | 70 ++++++ .../trade/entity/dto/tch/TchAddStuDTO.java | 12 + .../dto/tch/TchStartCourseNameListDTO.java | 2 + .../sztzjy/trade/mapper/StuUserMapper.java | 20 ++ .../mapper/TchStartCourseNameListMapper.java | 4 + .../service/TchTeachingManagementService.java | 13 +- .../TchTeachingManagementServiceImpl.java | 206 +++++++++++++++++- src/main/resources/application-dev.yml | 4 +- src/main/resources/mappers/StuUserMapper.xml | 9 + .../mappers/TchStartCourseNameListMapper.xml | 36 ++- 12 files changed, 457 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/sztzjy/trade/entity/dto/tch/TchAddStuDTO.java diff --git a/src/main/java/com/sztzjy/trade/controller/tch/TchTeachingManagementController.java b/src/main/java/com/sztzjy/trade/controller/tch/TchTeachingManagementController.java index 4fa5725..4b2c735 100644 --- a/src/main/java/com/sztzjy/trade/controller/tch/TchTeachingManagementController.java +++ b/src/main/java/com/sztzjy/trade/controller/tch/TchTeachingManagementController.java @@ -3,19 +3,25 @@ package com.sztzjy.trade.controller.tch; import cn.hutool.core.date.DateTime; import com.sztzjy.trade.annotation.AnonymousAccess; import com.sztzjy.trade.entity.TchStartCourseManage; +import com.sztzjy.trade.entity.dto.tch.TchAddStuDTO; import com.sztzjy.trade.entity.dto.tch.TchStartCourseDTO; +import com.sztzjy.trade.entity.dto.tch.TchStartCourseNameListDTO; import com.sztzjy.trade.service.TchTeachingManagementService; import com.sztzjy.trade.util.ResultEntity; +import com.sztzjy.trade.util.file.IFileUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.FileInputStream; +import java.io.OutputStream; import java.util.List; /** @@ -29,6 +35,12 @@ public class TchTeachingManagementController { @Resource TchTeachingManagementService teachingManagementService; + @Value("${file.path}") + private String filePath; + + @Resource + private IFileUtil IFileUtil; + @ApiOperation("开课班级展示") @PostMapping("/getStartCourseList") @AnonymousAccess @@ -72,4 +84,73 @@ public class TchTeachingManagementController { return new ResultEntity<>(HttpStatus.OK,"成功",teachingManagementService.getStartCourseNameList(startCourseId,index,size)); } + + @ApiOperation("开课学生名单--添加学生--回显") + @PostMapping("/addStuEcho") + @AnonymousAccess + public ResultEntity addStuEcho(@ApiParam("开课ID") String startCourseId, + @ApiParam("学校ID") String schoolId, + @ApiParam("当前页") Integer index, + @ApiParam("每页条数") Integer size) { + + return new ResultEntity<>(HttpStatus.OK,"成功",teachingManagementService.addStuEcho(startCourseId,schoolId,index,size)); + + } + + + @ApiOperation("开课学生名单--添加学生") + @PostMapping("/addStu") + @AnonymousAccess + public ResultEntity addStu(@RequestBody TchAddStuDTO dto) { + + Integer result=teachingManagementService.addStu(dto); + + if(result>0){ + return new ResultEntity<>(HttpStatus.OK,"添加成功"); + }else { + return new ResultEntity<>(HttpStatus.ACCEPTED,"添加失败，请联系管理处理"); + } + + } + + + @ApiOperation("开课学生名单--添加班级") + @PostMapping("/addClass") + @AnonymousAccess + public ResultEntity addClass(List className,String schoolId,String startCourseId) { + + Integer result=teachingManagementService.addClass(className,schoolId,startCourseId); + + if(result>0){ + return new ResultEntity<>(HttpStatus.OK,"添加成功"); + }else { + return new ResultEntity<>(HttpStatus.ACCEPTED,"添加失败，请联系管理处理"); + } + + } + + @ApiOperation("开课学生名单--批量导入") + @PostMapping("/batchImport") + @AnonymousAccess + public ResultEntity batchImport(@RequestPart MultipartFile file, + @ApiParam("开课ID")String startCourseId) { + + //验证文件类型 + if (!file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")).equals(".xls") && !file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")).equals(".xlsx")) { + return new ResultEntity<>(HttpStatus.ACCEPTED, "文件类型有误！请上传Excel文件"); + } + + return new ResultEntity<>(HttpStatus.OK,"成功",teachingManagementService.batchImport(file,startCourseId)); + + } + + + @ApiOperation("Excel表格下载") + @GetMapping("/excelDownload") + @AnonymousAccess + public void excelDownload(HttpServletResponse response) { + + String path=filePath; + IFileUtil.download(response,path); + } } diff --git a/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameList.java b/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameList.java index 929d463..e45a741 100644 --- a/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameList.java +++ b/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameList.java @@ -31,6 +31,9 @@ public class TchStartCourseNameList { private Date updateTime; + @ApiModelProperty("用户ID") + private String userId; + public String getId() { return id; } @@ -94,4 +97,12 @@ public class TchStartCourseNameList { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId == null ? null : userId.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameListExample.java b/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameListExample.java index 80ce171..887107f 100644 --- a/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameListExample.java +++ b/src/main/java/com/sztzjy/trade/entity/TchStartCourseNameListExample.java @@ -644,6 +644,76 @@ public class TchStartCourseNameListExample { addCriterion("update_time not between", value1, value2, "updateTime"); return (Criteria) this; } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(String value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(String value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(String value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(String value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(String value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(String value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLike(String value) { + addCriterion("user_id like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotLike(String value) { + addCriterion("user_id not like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(String value1, String value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(String value1, String value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/trade/entity/dto/tch/TchAddStuDTO.java b/src/main/java/com/sztzjy/trade/entity/dto/tch/TchAddStuDTO.java new file mode 100644 index 0000000..390f87b --- /dev/null +++ b/src/main/java/com/sztzjy/trade/entity/dto/tch/TchAddStuDTO.java @@ -0,0 +1,12 @@ +package com.sztzjy.trade.entity.dto.tch; + +import lombok.Data; + +/** + * @author tz + * @date 2024/8/2 10:47 + */ +@Data +public class TchAddStuDTO extends TchStartCourseNameListDTO{ + private String startCourseId; +} diff --git a/src/main/java/com/sztzjy/trade/entity/dto/tch/TchStartCourseNameListDTO.java b/src/main/java/com/sztzjy/trade/entity/dto/tch/TchStartCourseNameListDTO.java index 91aee53..03d0f18 100644 --- a/src/main/java/com/sztzjy/trade/entity/dto/tch/TchStartCourseNameListDTO.java +++ b/src/main/java/com/sztzjy/trade/entity/dto/tch/TchStartCourseNameListDTO.java @@ -17,4 +17,6 @@ public class TchStartCourseNameListDTO { private String className; @ApiModelProperty("专业") private String major; + @ApiModelProperty("用户ID") + private String userId; } diff --git a/src/main/java/com/sztzjy/trade/mapper/StuUserMapper.java b/src/main/java/com/sztzjy/trade/mapper/StuUserMapper.java index e168fca..f5fec8f 100644 --- a/src/main/java/com/sztzjy/trade/mapper/StuUserMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/StuUserMapper.java @@ -34,7 +34,27 @@ public interface StuUserMapper { List selectByCourseName(String startCourseName); + /** + * 查询学校所有班级名称 + * @param schoolId 学校ID学校ID + * @return 班级名称集合 + */ List selectByClassName(String schoolId); + + /** + * 根据班级名称查询所有不在班级集合中的学生信息 + * @param strings 班级名称集合 + * @param schoolId 学校ID + * @return 学生信息 + */ List selectByNoClassName(@Param("strings") List strings,String schoolId); + + /** + * 根据班级名称查询学生信息 + * @param lists 班级名称集合 + * @param schoolId 学校ID + * @return 学生信息 + */ + List selectStuList(@Param("lists") List lists, String schoolId); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/trade/mapper/TchStartCourseNameListMapper.java b/src/main/java/com/sztzjy/trade/mapper/TchStartCourseNameListMapper.java index 0f6b3a5..97b1e9a 100644 --- a/src/main/java/com/sztzjy/trade/mapper/TchStartCourseNameListMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/TchStartCourseNameListMapper.java @@ -30,6 +30,10 @@ public interface TchStartCourseNameListMapper { int updateByPrimaryKey(TchStartCourseNameList record); + /** + * 开课学生名单批量添加 + * @param courseNameLists 学生信息 + */ int addList(@Param("courseNameLists")List courseNameLists); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/trade/service/TchTeachingManagementService.java b/src/main/java/com/sztzjy/trade/service/TchTeachingManagementService.java index 3417cc7..187c117 100644 --- a/src/main/java/com/sztzjy/trade/service/TchTeachingManagementService.java +++ b/src/main/java/com/sztzjy/trade/service/TchTeachingManagementService.java @@ -2,8 +2,11 @@ package com.sztzjy.trade.service; import com.github.pagehelper.PageInfo; import com.sztzjy.trade.entity.TchStartCourseManage; +import com.sztzjy.trade.entity.TchStartCourseNameList; +import com.sztzjy.trade.entity.dto.tch.TchAddStuDTO; import com.sztzjy.trade.entity.dto.tch.TchStartCourseDTO; import com.sztzjy.trade.entity.dto.tch.TchStartCourseNameListDTO; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -16,7 +19,15 @@ public interface TchTeachingManagementService { Integer addStartCourse(TchStartCourseDTO dto); - PageInfo getStartCourseNameList(String startCourseId, Integer index, Integer size); + PageInfo getStartCourseNameList(String startCourseId, Integer index, Integer size); List getSelect(String userId,String schoolId); + + PageInfo addStuEcho(String startCourseId, String schoolId, Integer index, Integer size); + + Integer addStu(TchAddStuDTO dto); + + Integer addClass(List className,String schoolId,String startCourseId); + + Integer batchImport(MultipartFile file,String startCourseId); } diff --git a/src/main/java/com/sztzjy/trade/service/impl/TchTeachingManagementServiceImpl.java b/src/main/java/com/sztzjy/trade/service/impl/TchTeachingManagementServiceImpl.java index a54a630..6ed2199 100644 --- a/src/main/java/com/sztzjy/trade/service/impl/TchTeachingManagementServiceImpl.java +++ b/src/main/java/com/sztzjy/trade/service/impl/TchTeachingManagementServiceImpl.java @@ -1,7 +1,9 @@ package com.sztzjy.trade.service.impl; import com.github.pagehelper.PageInfo; +import com.sztzjy.trade.config.exception.handler.ServiceException; import com.sztzjy.trade.entity.*; +import com.sztzjy.trade.entity.dto.tch.TchAddStuDTO; import com.sztzjy.trade.entity.dto.tch.TchStartCourseDTO; import com.sztzjy.trade.entity.dto.tch.TchStartCourseNameListDTO; import com.sztzjy.trade.mapper.StuUserMapper; @@ -9,12 +11,19 @@ import com.sztzjy.trade.mapper.TchClassAndStuMapper; import com.sztzjy.trade.mapper.TchStartCourseManageMapper; import com.sztzjy.trade.mapper.TchStartCourseNameListMapper; import com.sztzjy.trade.service.TchTeachingManagementService; +import com.sztzjy.trade.util.BigDecimalUtils; import com.sztzjy.trade.util.ConvertUtil; import com.sztzjy.trade.util.PageUtil; +import com.sztzjy.trade.util.excel.ImportExcelUtil; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; +import java.math.BigDecimal; import java.sql.Date; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -41,6 +50,9 @@ public class TchTeachingManagementServiceImpl implements TchTeachingManagementSe @Resource TchStartCourseNameListMapper courseNameListMapper; + @Resource + BigDecimalUtils bigDecimalUtils; + /** * 开课班级展示 */ @@ -78,9 +90,19 @@ public class TchTeachingManagementServiceImpl implements TchTeachingManagementSe //查询班级人数 List stuUsers=stuUserMapper.selectByCourseName(startCourseName); - //添加到开课学生名单中 + //1、添加到开课学生名单中 List courseNameLists=new ArrayList<>(); for (StuUser stu : stuUsers) { + + //2、判断该学生是否被单独添加到开课名单，是则不做添加 + TchStartCourseNameListExample courseNameListExample=new TchStartCourseNameListExample(); + courseNameListExample.createCriteria().andUserIdEqualTo(stu.getUserId()); + List tchStartCourseNameLists = courseNameListMapper.selectByExample(courseNameListExample); + + if(!tchStartCourseNameLists.isEmpty()){ + continue; //跳出本次循环 + } + TchStartCourseNameList courseNameList=new TchStartCourseNameList(); courseNameList.setId(UUID.randomUUID().toString()); courseNameList.setName(stu.getName()); @@ -89,6 +111,7 @@ public class TchTeachingManagementServiceImpl implements TchTeachingManagementSe courseNameList.setMajor(stu.getMajor()); courseNameList.setStartCourseId(string); courseNameList.setCreateTime(new java.util.Date()); + courseNameList.setUserId(stu.getUserId()); courseNameLists.add(courseNameList); } @@ -150,6 +173,9 @@ public class TchTeachingManagementServiceImpl implements TchTeachingManagementSe } + /** + * 新增开课班级--下拉框查看 + */ @Override public List getSelect(String userId,String schoolId) { TchStartCourseManageExample courseManageExample=new TchStartCourseManageExample(); @@ -172,11 +198,185 @@ public class TchTeachingManagementServiceImpl implements TchTeachingManagementSe } //再用动态sql查询出本次开课未添加的班级名称 - List list = stuUserMapper.selectByNoClassName(strings,schoolId); - return list; + return stuUserMapper.selectByNoClassName(strings,schoolId); + + } + + } + + /** + * 开课学生名单--添加学生--回显 + */ + @Override + public PageInfo addStuEcho(String startCourseId, String schoolId, Integer index, Integer size) { + //查询出本次开课已添加了的班级，排除这些班级的学生 + TchStartCourseManage startCourseManage = startCourseManageMapper.selectByPrimaryKey(startCourseId); + + //取得班级名称,去掉逗号得出班级名称集合 + String[] split = startCourseManage.getStartCourseClassName().split(","); + List list = new ArrayList<>(Arrays.asList(split)); + + List stuUsers=stuUserMapper.selectStuList(list,schoolId); + + List tchStartCourseNameListDTOS = convertUtil.entityToDTOList(stuUsers, TchStartCourseNameListDTO.class); + + return PageUtil.pageHelper(tchStartCourseNameListDTOS, index, size); + } + + /** + * 开课学生名单--添加学生 + */ + @Override + public Integer addStu(TchAddStuDTO dto) { + //查询该学生是否已添加过本次开课 + TchStartCourseManageExample courseManageExample=new TchStartCourseManageExample(); + courseManageExample.createCriteria().andUserIdEqualTo(dto.getUserId()); + List startCourseManages = startCourseManageMapper.selectByExample(courseManageExample); + + if(startCourseManages.isEmpty()){ + + //赋值 + TchStartCourseNameList startCourseNameList=new TchStartCourseNameList(); + startCourseNameList.setId(UUID.randomUUID().toString()); + startCourseNameList.setName(dto.getName()); + startCourseNameList.setStudentId(dto.getStudentId()); + startCourseNameList.setClassName(dto.getClassName()); + startCourseNameList.setMajor(dto.getMajor()); + startCourseNameList.setStartCourseId(dto.getStartCourseId()); + startCourseNameList.setUserId(dto.getUserId()); + startCourseNameList.setCreateTime(new java.util.Date()); + + return courseNameListMapper.insert(startCourseNameList); + }else { + throw new ServiceException(HttpStatus.ACCEPTED,"该学生已存在本次开课"); + } + } + + @Override + public Integer addClass(List className,String schoolId,String startCourseId) { + + //根据班级名称集合查询出所有学生信息 + List stuUsers=stuUserMapper.selectStuList(className,schoolId); + + //查询本次开课信息 + TchStartCourseManage startCourseManage = startCourseManageMapper.selectByPrimaryKey(startCourseId); + //取出班级名称 + String startCourseClassName = startCourseManage.getStartCourseClassName(); + + // TODO: 2024/8/2 更新本次开课信息 + //1、将开课班级累加到开课班级后，逗号隔开 + for (int i = 0; i < className.size(); i++) { + if(i==className.size()-1){ + startCourseClassName=startCourseClassName+className.get(i); + }else { + startCourseClassName=startCourseClassName+className.get(i)+","; + } + } + //2、将开课总人数累加 + BigDecimal add = bigDecimalUtils.add(String.valueOf(startCourseManage.getStartCoursePeoples()), String.valueOf(stuUsers.size())); + startCourseManage.setStartCoursePeoples(Integer.valueOf(add.toString())); + + startCourseManage.setUpdateTime(new java.util.Date()); + + //更新开课信息 + startCourseManageMapper.updateByPrimaryKey(startCourseManage); + + // TODO: 2024/8/2 将所查询的班级学生信息添加到开课学生名单中 + + //1、添加到开课学生名单中 + List courseNameLists=new ArrayList<>(); + for (StuUser stu : stuUsers) { + + //2、判断该学生是否被单独添加到开课名单，是则不做添加 + TchStartCourseNameListExample courseNameListExample=new TchStartCourseNameListExample(); + courseNameListExample.createCriteria().andUserIdEqualTo(stu.getUserId()); + List tchStartCourseNameLists = courseNameListMapper.selectByExample(courseNameListExample); + + if(!tchStartCourseNameLists.isEmpty()){ + continue; //跳出本次循环 + } + + TchStartCourseNameList courseNameList=new TchStartCourseNameList(); + courseNameList.setId(UUID.randomUUID().toString()); + courseNameList.setName(stu.getName()); + courseNameList.setStudentId(stu.getStudentId()); + courseNameList.setClassName(stu.getClassName()); + courseNameList.setMajor(stu.getMajor()); + courseNameList.setStartCourseId(startCourseId); + courseNameList.setCreateTime(new java.util.Date()); + courseNameList.setUserId(stu.getUserId()); + + courseNameLists.add(courseNameList); + } + + courseNameListMapper.addList(courseNameLists); + + return null; + } + + + /** + * 批量导入 + * @param file 导入文件 + */ + @Override + public Integer batchImport(MultipartFile file,String startCourseId) { + + try { + List startCourseNameLists=new ArrayList<>(); + + //获取数据 + List> listByExcel = ImportExcelUtil.getListByExcel(file.getInputStream(), file.getOriginalFilename()); + //封装数据 + for (int i = 0; i < listByExcel.size(); i++) { + List list = listByExcel.get(i); + if (list.get(0) == "" || ("序号").equals(list.get(0))) { + continue; + } + + //判断该学是否在学生列表里 + StuUser stuUser = stuUserMapper.selectByPrimaryKey(String.valueOf(list.get(0))); + if(stuUser==null){ + continue; + } + + //判断该学生是否已单独添加到开课名单 + TchStartCourseNameListExample courseNameListExample=new TchStartCourseNameListExample(); + courseNameListExample.createCriteria().andUserIdEqualTo(String.valueOf(list.get(0))); + + List tchStartCourseNameLists = courseNameListMapper.selectByExample(courseNameListExample); + if(!tchStartCourseNameLists.isEmpty()){ + continue; + } + + TchStartCourseNameList tchStartCourseNameList=new TchStartCourseNameList(); + tchStartCourseNameList.setId(UUID.randomUUID().toString()); + tchStartCourseNameList.setUserId(String.valueOf(list.get(0))); + tchStartCourseNameList.setName(String.valueOf(list.get(1))); + tchStartCourseNameList.setStudentId(String.valueOf(list.get(2))); + tchStartCourseNameList.setClassName(String.valueOf(list.get(3))); + tchStartCourseNameList.setMajor(String.valueOf(list.get(4))); + tchStartCourseNameList.setStartCourseId(startCourseId); + tchStartCourseNameList.setUpdateTime(new java.util.Date()); + + + startCourseNameLists.add(tchStartCourseNameList); + } + + return courseNameListMapper.addList(startCourseNameLists); + + } catch (Exception e) { + e.printStackTrace(); + }finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + throw new RuntimeException(e); + } } + return 0; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 24fa5fa..d8c95ce 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -11,8 +11,8 @@ spring: # 文件存储 file: type: local -# path: D:\home\trade - path: D:\home + path: D:\home\trade +# path: D:\home # path: /usr/local/tianzeProject/blockFinance/uploadFile diff --git a/src/main/resources/mappers/StuUserMapper.xml b/src/main/resources/mappers/StuUserMapper.xml index 890decf..2192583 100644 --- a/src/main/resources/mappers/StuUserMapper.xml +++ b/src/main/resources/mappers/StuUserMapper.xml @@ -634,4 +634,13 @@ + \ No newline at end of file diff --git a/src/main/resources/mappers/TchStartCourseNameListMapper.xml b/src/main/resources/mappers/TchStartCourseNameListMapper.xml index 4c78499..92fed60 100644 --- a/src/main/resources/mappers/TchStartCourseNameListMapper.xml +++ b/src/main/resources/mappers/TchStartCourseNameListMapper.xml @@ -10,6 +10,7 @@ + @@ -70,7 +71,8 @@ - id, name, student_id, class_name, major, start_course_id, create_time, update_time + id, name, student_id, class_name, major, start_course_id, create_time, update_time, + user_id +