Skip to content

D
dd_school
Commit 5034f015 by baochunxin
Options

#G：电子教师档案工作量，老师考核

parent f23b67bc
Showing with 2018 additions and 96 deletions
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
......@@ -287,6 +287,14 @@ public class ExcelUtil<T>
return importExcel(is, 0);
}
public List<T> importExceltoRow(InputStream is,int rownum) throws Exception
{
return importExceltoRow(StringUtils.EMPTY,is, 0,rownum);
}
/**
* 对excel表单默认第一个索引名转换成list
*
......@@ -298,6 +306,8 @@ public class ExcelUtil<T>
return importExcelNdkh(is, 0);
}
/**
* 对excel表单默认第一个索引名转换成list
*
......@@ -322,6 +332,188 @@ public class ExcelUtil<T>
return importExcelNdkh(StringUtils.EMPTY, is, titleNum);
}
/**
* 对excel表单指定表格索引名转换成list
*
* @param sheetName 表格索引名
* @param titleNum 标题占用行数
* @param is 输入流
* @return 转换后集合
*/
public List<T> importExceltoRow(String sheetName, InputStream is, int titleNum,int rownum) throws Exception
{
this.type = Type.IMPORT;
this.wb = WorkbookFactory.create(is);
List<T> list = new ArrayList<T>();
// 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
if (sheet == null)
{
throw new IOException("文件sheet不存在");
}
boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
Map<String, PictureData> pictures;
if (isXSSFWorkbook)
{
pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
}
else
{
pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
}
// 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
int rows = sheet.getLastRowNum();
if (rows > 0)
{
// 定义一个map用于存放excel列的序号和field.
Map<String, Integer> cellMap = new HashMap<String, Integer>();
// 获取表头
Row heard = sheet.getRow(titleNum);
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
{
Cell cell = heard.getCell(i);
if (StringUtils.isNotNull(cell))
{
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
}
else
{
cellMap.put(null, i);
}
}
// 有数据时才处理 得到类的所有field.
List<Object[]> fields = this.getFields();
Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
for (Object[] objects : fields)
{
Excel attr = (Excel) objects[1];
Integer column = cellMap.get(attr.name());
if (column != null)
{
fieldsMap.put(column, objects);
}
}
for (int i = titleNum + 1+rownum; i <= rows; i++)
{
// 从第2行开始取数据,默认第一行是表头.
Row row = sheet.getRow(i);
// 判断当前行是否是空行
if (isRowEmpty(row))
{
continue;
}
T entity = null;
for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet())
{
Object val = this.getCellValue(row, entry.getKey());
// 如果不存在实例则新建.
entity = (entity == null ? clazz.newInstance() : entity);
// 从map中得到对应列的field.
Field field = (Field) entry.getValue()[0];
Excel attr = (Excel) entry.getValue()[1];
// 取得类型,并根据对象类型设置值.
Class<?> fieldType = field.getType();
if (String.class == fieldType)
{
String s = Convert.toStr(val);
if (StringUtils.endsWith(s, ".0"))
{
val = StringUtils.substringBefore(s, ".0");
}
else
{
String dateFormat = field.getAnnotation(Excel.class).dateFormat();
if (StringUtils.isNotEmpty(dateFormat))
{
val = parseDateToStr(dateFormat, val);
}
else
{
val = Convert.toStr(val);
}
}
}
else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
{
val = Convert.toInt(val);
}
else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
{
val = Convert.toLong(val);
}
else if (Double.TYPE == fieldType || Double.class == fieldType)
{
val = Convert.toDouble(val);
}
else if (Float.TYPE == fieldType || Float.class == fieldType)
{
val = Convert.toFloat(val);
}
else if (BigDecimal.class == fieldType)
{
val = Convert.toBigDecimal(val);
}
else if (Date.class == fieldType)
{
if (val instanceof String)
{
val = DateUtils.parseDate(val);
}
else if (val instanceof Double)
{
val = DateUtil.getJavaDate((Double) val);
}
}
else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
{
val = Convert.toBool(val, false);
}
if (StringUtils.isNotNull(fieldType))
{
String propertyName = field.getName();
if (StringUtils.isNotEmpty(attr.targetAttr()))
{
propertyName = field.getName() + "." + attr.targetAttr();
}
else if (StringUtils.isNotEmpty(attr.readConverterExp()))
{
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
}
else if (StringUtils.isNotEmpty(attr.dictType()))
{
val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
}
else if (!attr.handler().equals(ExcelHandlerAdapter.class))
{
val = dataFormatHandlerAdapter(val, attr);
}
else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
{
PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
if (image == null)
{
val = "";
}
else
{
byte[] data = image.getData();
val = FileUtils.writeImportBytes(data);
}
}
ReflectUtils.invokeSetter(entity, propertyName, val);
}
}
list.add(entity);
}
}
return list;
}
/**
* 对excel表单指定表格索引名转换成list
*
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java
......@@ -5,22 +5,15 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport;
import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasiclnExport;
import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java 0 → 100644
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
import javax.servlet.http.HttpServletResponse;
/**
* 班主任考核Controller
*
* @author ruoyi
* @date 2023-12-12
*/
@RestController
@RequestMapping("/assessment")
public class SchoolAclassTeacherAssessmentController extends BaseController
{
@Autowired
private ISchoolAclassTeacherAssessmentService schoolAclassTeacherAssessmentService;
private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
/**
* 查询班主任考核列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolAclassTeacherAssessmentReq req)
{
startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list);
}
/**
* 获取班主任考核详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentById(id));
}
/**
* 新增班主任考核
*/
@Log(title = "班主任考核", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
{
return toAjax(schoolAclassTeacherAssessmentService.insertSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment));
}
/**
* 修改班主任考核
*/
@Log(title = "班主任考核", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
{
return toAjax(schoolAclassTeacherAssessmentService.updateSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment));
}
/**
* 删除班主任考核
*/
@Log(title = "班主任考核", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolAclassTeacherAssessmentService.deleteSchoolAclassTeacherAssessmentByIds(ids));
}
/**
* 末班下载
* @param response
* @throws Exception
*/
@PostMapping(value = "/download")
public void downloadFile(HttpServletResponse response) throws Exception {
// 以流的形式下载文件。
try {
//读取文件
InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("file/班主任任职导入模板.xlsx");
InputStream fis = new BufferedInputStream(resourceAsStream);
byte[] buffer = new byte[fis.available()];
fis.read(buffer);
fis.close();
// 清空response
response.reset();
// 设置response的Header
response.setHeader("Content-Disposition", "attachment;filename="+java.net.URLEncoder.encode("班主任导入模板.xlsx", "utf-8"));
//response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
response.addHeader("Content-Length", "" + buffer.length);
OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
response.setContentType("application/octet-stream");
toClient.write(buffer);
toClient.flush();
toClient.close();
} catch (IOException e) {
log.info(e.getMessage());
}
}
/**
* 导入
* @param file
* @return
* @throws Exception
*/
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
List<SchoolAclassTeacherAssessment> list = new ArrayList<>();
ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<SchoolAclassTeacherAssessment>(SchoolAclassTeacherAssessment.class);
List<SchoolAclassTeacherAssessment> detailList = util.importExceltoRow(file.getInputStream(),1);
//1.导入
boolean b = schoolAclassTeacherAssessmentService.saveBatch(detailList);
return AjaxResult.success();
}
/**
* 导出
* @param
* @return
*/
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolAclassTeacherAssessmentReq req ) throws Exception{
List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<>(SchoolAclassTeacherAssessment.class);
util.exportExcel(response, schoolAclassTeacherAssessmentVos, "老师考核");
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java 0 → 100644
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
/**
* 工作量信息Controller
*
* @author ruoyi
* @date 2023-12-11
*/
@RestController
@RequestMapping("/aworkload")
public class SchoolAworkloadController extends BaseController
{
@Autowired
private ISchoolAworkloadService schoolAworkloadService;
private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
/**
* 查询工作量信息列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolAworkload schoolAworkload)
{
startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
return getDataTable(list);
}
/**
* 获取工作量信息详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(schoolAworkloadService.selectSchoolAworkloadById(id));
}
/**
* 新增工作量信息
*/
@Log(title = "工作量信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolAworkload schoolAworkload)
{
return toAjax(schoolAworkloadService.insertSchoolAworkload(schoolAworkload));
}
/**
* 修改工作量信息
*/
@Log(title = "工作量信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolAworkload schoolAworkload)
{
return toAjax(schoolAworkloadService.updateSchoolAworkload(schoolAworkload));
}
/**
* 删除工作量信息
*/
@Log(title = "工作量信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolAworkloadService.deleteSchoolAworkloadByIds(ids));
}
@PostMapping(value = "/download")
public void downloadFile(HttpServletResponse response) throws Exception {
// 以流的形式下载文件。
try {
//读取文件
InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("file/工作量信息导入模板.xlsx");
InputStream fis = new BufferedInputStream(resourceAsStream);
byte[] buffer = new byte[fis.available()];
fis.read(buffer);
fis.close();
// 清空response
response.reset();
// 设置response的Header
response.setHeader("Content-Disposition", "attachment;filename="+java.net.URLEncoder.encode("工作量信息导入模板.xlsx", "utf-8"));
//response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
response.addHeader("Content-Length", "" + buffer.length);
OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
response.setContentType("application/octet-stream");
toClient.write(buffer);
toClient.flush();
toClient.close();
} catch (IOException e) {
log.info(e.getMessage());
}
}
/**
* 导入
* @param file
* @return
* @throws Exception
*/
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
List<SchoolAworkload> list = new ArrayList<>();
ExcelUtil<SchoolAworkloadExport> util = new ExcelUtil<SchoolAworkloadExport>(SchoolAworkloadExport.class);
List<SchoolAworkloadExport> detailList = util.importExceltoRow(file.getInputStream(),1);
//1.导入
for (SchoolAworkloadExport date :detailList){
SchoolAworkload schoolAworkload = new SchoolAworkload();
BeanUtils.copyProperties(date,schoolAworkload);
list.add(schoolAworkload);
}
boolean b = schoolAworkloadService.saveBatch(list);
return AjaxResult.success(b);
}
/**
* 导出
* @param
* @return
*/
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolAworkload schoolAworkload ) throws Exception{
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkload);
ExcelUtil<SchoolAworkloadExport> util = new ExcelUtil<>(SchoolAworkloadExport.class);
util.exportExcel(response, schoolAworkloadVos, "工作量内容");
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/SchoolTeacherBasiclnformationController.java → smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
package yangtz.cs.liu.campus.controller.teacherFiles;
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.controller.BaseController;
......@@ -14,16 +13,12 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
import yangtz.cs.liu.campus.domain.student.SchoolStudentEvaluate;
import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasiclnExport;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasiclnExport;
import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
import yangtz.cs.liu.campus.service.teacherFiles.SchoolTeacherBasichlnformationService;
import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassDrVo;
import yangtz.cs.liu.wechat.controller.api.WxApiController;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
......@@ -48,9 +43,9 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
* @return
*/
@GetMapping("/list")
public TableDataInfo list(SchoolTeacherBasicInformation information) throws Exception{
public TableDataInfo list(SchoolTeacherBasicInformationVo information) throws Exception{
startPage();
List<SchoolTeacherBasicInformation> list = basichlnformationService.list(information);
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list);
}
......@@ -59,7 +54,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
*/
@GetMapping("/{id}")
public AjaxResult getById(@PathVariable("id") Long id ) throws Exception{
return AjaxResult.success(basichlnformationService.getById(id));
return AjaxResult.success(basichlnformationService.getByIds(id));
}
/**
......@@ -87,6 +82,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
*/
@PutMapping("/update")
public AjaxResult update(@RequestBody SchoolTeacherBasicInformation information){
return AjaxResult.success(basichlnformationService.updateById(information));
}
......@@ -160,8 +156,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
* @param
* @return
*/
@PostMapping("/export")
public void export(HttpServletResponse response,@RequestBody SchoolTeacherBasiclnExport export ) throws Exception{
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolTeacherBasiclnExport export ) throws Exception{
List<SchoolTeacherBasicInformation> list = new ArrayList<>();
List<SchoolTeacherBasiclnExport> exportList = new ArrayList<>();
ExcelUtil<SchoolTeacherBasiclnExport> util = new ExcelUtil<>(SchoolTeacherBasiclnExport.class);
......@@ -217,6 +213,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
.or()
.like(SchoolTeacherBasicInformation::getLastDegree,export.getFirstDegree()));
}
wrapper.eq(SchoolTeacherBasicInformation::getDelFlag,"0");
//查询出来结果复制
List<SchoolTeacherBasicInformation> list1 = basichlnformationService.list(wrapper);
list1.forEach(date->{
......@@ -227,4 +224,14 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
util.exportExcel(response, exportList, "教师基本信息");
}
}
/*
* 批量导入老师照片
* */
@PostMapping("/importTeacherPicture")
public AjaxResult importTeacherPicture(MultipartFile file){
return AjaxResult.success(basichlnformationService.importTeacherPicture(file));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/curricula/CurriclaStudentVo.java
......@@ -40,7 +40,6 @@ public class CurriclaStudentVo {
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 是否超过选课时间： true超过选课时间，false没有
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessment.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 班主任考核对象 school_aclass_teacher_assessment
*
* @author ruoyi
* @date 2023-12-12
*/
@Data
public class SchoolAclassTeacherAssessment extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/** 学期(下拉框) */
@Excel(name = "学期",dictType = "semester_jsdzda")
private String semester;
/** 届别(下拉框) */
@Excel(name = "届别",dictType = "rankda")
private String year;
/** 学年(下拉框) */
@Excel(name = "学年",dictType = "yearda")
private String schoolYear;
/** 年级(下拉框) */
@Excel(name = "年级",dictType = "grade_da")
private String grade;
/** 班级(下拉框) */
@Excel(name = "班级",readConverterExp="1=1,2=2,3=3,4=4,5=5,6=6,7=7,8=8,9=9,10=10,11=11,12=12,13=13,14=14,15=15,16=16,17=17,18=18,19=19,20=20,21=21,22=22,23=23,24=24,25=25,26=26,27=27,28=28,29=29,30=30,31=31,32=32,33=33,34=34,35=35,36=36,37=37,38=38,39=39,40=40")
private String className;
/** 教师姓名 */
@Excel(name = "教师姓名")
private String teacherName;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 德育考核成绩 */
@Excel(name = "德育考核成绩")
private BigDecimal moralEduCheckAchievement;
/** 智育考核成绩 */
@Excel(name = "智育考核成绩")
private BigDecimal intellEduCheckAchievement;
/** 总考核成绩 */
@Excel(name = "总考核成绩")
private BigDecimal totalCheckAchievement;
/** 班级类型(下拉框) */
@Excel(name = "班级类型",dictType = "class_type")
private String classType;
/** 学科(下拉框) */
@Excel(name = "学科",dictType = "teaching_subjects")
private String sub;
/** 备注*/
@Excel(name = "备注")
private String remark;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentReq.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/**
* 请求对象
*
* @author ruoyi
* @date 2023-12-12
*/
@Data
public class SchoolAclassTeacherAssessmentReq extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 教师姓名 */
private String teacherName;
/** 学年(下拉框) */
private String schoolYear;
/** 届别(下拉框) */
private String year;
/** 学期(下拉框) */
private String semester;
/** 年级(下拉框) */
private String grade;
/** 学科(下拉框) */
private String sub;
/** 班级(下拉框) */
private String className;
/** 班级类型(下拉框) */
private String classType;
/** 德育考核成绩 =*/
private String moralEduCheckAchievement;
//大于
private BigDecimal moralEduCheckAchievementgt;
//大于等于
private BigDecimal moralEduCheckAchievementgtd;
//小于
private BigDecimal moralEduCheckAchievementlt;
//小于等于
private BigDecimal moralEduCheckAchievementltd;
/** 智育考核成绩= */
private String intellEduCheckAchievement;
//大于
private BigDecimal intellEduCheckAchievementgt;
//大于等于
private BigDecimal intellEduCheckAchievementgtd;
//小于
private BigDecimal intellEduCheckAchievementlt;
//小于等于
private BigDecimal intellEduCheckAchievementltd;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentVo.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/**
* 班主任考核对象 school_aclass_teacher_assessment
*
* @author ruoyi
* @date 2023-12-12
*/
@Data
public class SchoolAclassTeacherAssessmentVo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/** 学期(下拉框) */
private String semester;
/** 届别(下拉框) */
private String year;
/** 学年(下拉框) */
private String schoolYear;
/** 年级(下拉框) */
private String grade;
/** 班级(下拉框) */
@Excel(name = "班级",readConverterExp="1=1,2=2,3=3,4=4,5=5,6=6,7=7,8=8,9=9,10=10,11=11,12=12,13=13,14=14,15=15,16=16,17=17,18=18,19=19,20=20,21=21,22=22,23=23,24=24,25=25,26=26,27=27,28=28,29=29,30=30,31=31,32=32,33=33,34=34,35=35,36=36,37=37,38=38,39=39,40=40")
private String className;
/** 班级类型(下拉框) */
private String classType;
/** 教师姓名 */
private String teacherName;
/** 学科(下拉框) */
private String sub;
/** 德育考核成绩 */
private BigDecimal moralEduCheckAchievement;
/** 智育考核成绩 */
private BigDecimal intellEduCheckAchievement;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 工作量信息对象 school_aworkload
*
* @author ruoyi
* @date 2023-12-11
*/
@Data
public class SchoolAworkload extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/** 学年(下拉框) */
private String schoolYear;
/** 学期(下拉框) */
private String semester;
/** 届别(下拉框) */
private String year;
/** 年级(下拉框) */
private String grade;
/** 姓名 */
private String name;
/** 学科(下拉框) */
private String sub;
/** 身份证号 */
private String idCard;
/** 聘任岗位(下拉框) */
private String appointmentPost;
/** 聘任职务 */
private String appointmentPosition;
/** 聘任情况(下拉框) */
private String appointmentSituation;
/** 班级 */
private String className;
/** 班级类型 */
private String classType;
/** 早读 */
private Long earlyReading;
/** 正课 */
private Long requiredCourses;
/** 晚自习 */
private Long eveningSelfStudy;
/** 证明人id */
private Long userId;
/** 证明人 */
private String userName;
/** 删除状态 */
private String delFlag;
/**合计*/
private Long amountTo;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadExport.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 工作量信息对象 school_aworkload
*
* @author ruoyi
* @date 2023-12-11
*/
@Data
public class SchoolAworkloadExport extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 学年(下拉框) */
@Excel(name = "学年",dictType="yearda")
private String schoolYear;
/** 学期(下拉框) */
@Excel(name = "学期",dictType="semester_jsdzda")
private String semester;
/** 届别(下拉框) */
@Excel(name = "届别",dictType = "rankda")
private String year;
/** 年级(下拉框) */
@Excel(name = "年级",dictType="grade_da")
private String grade;
/** 姓名 */
@Excel(name = "姓名")
private String name;
/** 学科(下拉框) */
@Excel(name = "学科",dictType = "teaching_subjects")
private String sub;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 聘任岗位(下拉框) */
@Excel(name = "聘任岗位",dictType = "appointment_positions")
private String appointmentPost;
/** 聘任职务 */
@Excel(name = "聘任职务")
private String appointmentPosition;
/** 聘任情况(下拉框) */
@Excel(name = "聘任情况",dictType = "appointment_situation")
private String appointmentSituation;
/** 班级 */
@Excel(name = "班级",prompt="多个，中间用英文“,”间隔")
private String className;
/** 班级类型 */
@Excel(name = "班级类型")
private String classType;
/** 早读 */
@Excel(name = "早读")
private Long earlyReading;
/** 正课 */
@Excel(name = "正课")
private Long requiredCourses;
/** 晚自习 */
@Excel(name = "晚自习")
private Long eveningSelfStudy;
/**合计*/
@Excel(name = "合计")
private Long amountTo;
/** 证明人id */
private Long userId;
/** 证明人 */
@Excel(name = "证明人")
private String userName;
@Excel(name = "备注")
private String remark;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 工作量信息对象 school_aworkload
*
* @author ruoyi
* @date 2023-12-11
*/
@Data
public class SchoolAworkloadVo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 学年(下拉框) */
private String schoolYear;
/** 学期(下拉框) */
private String semester;
/** 届别(下拉框) */
private String year;
/** 年级(下拉框) */
private String grade;
/** 姓名 */
private String name;
/** 学科(下拉框) */
private String sub;
/** 聘任岗位(下拉框) */
private String appointmentPost;
/** 聘任职务 */
private String appointmentPosition;
/** 聘任情况(下拉框) */
private String appointmentSituation;
/** 班级 */
private String className;
/** 班级类型 */
private String classType;
/** 早读 */
private Long earlyReading;
/** 正课 */
private Long requiredCourses;
/** 晚自习 */
private Long eveningSelfStudy;
/**合计*/
private Long amountTo;
/** 证明人id */
private Long userId;
/** 证明人 */
private String userName;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.NonNull;
import java.util.Date;
/**
* 教师电子档案 老师基础信息
*/
@Data
public class SchoolTeacherBasicInformation extends BaseEntity {
// @Excel(name = "年级",combo = {"一年级","二年级","三年级"},readConverterExp = "1=一年级,2=二年级,3=三年级")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 姓名
*/
private String name;
/**
* 身份证号
*/
private String idCard;
/**
* 年龄 。动态查询
*/
// private Integer age;
/**
* 性别
*/
private String sex;
/**
* 档案出生日期 (年月)
*/
@JsonFormat(pattern = "yyyy-MM")
private Date fileBirthDate;
/**
* 档案年龄
*/
// private Integer fileAge;
/**
* 出生年月
*/
private String birthDate;
/**
* 籍贯
*/
private String hometown;
/**
* 民族
*/
private String nation;
/**
* 政治面貌(1中共党员、2共青团员、3群众、4民主党派成员、5无党派人士)
*/
private String politicalLandscape;
/**
* 入党时间（年月）
*/
@JsonFormat(pattern = "yyyy-MM")
private Date partyMembershipTime;
/**
* 任教学科(1语文、2数学、3英语、4物理、5化学、6生物、7政治、8历史、9地理、10音乐、11体育、12美术、13技术、14心理、15书法)
*/
private String teachingSubject;
/**
* 现职称(1无、2初级、3中级、4副高、5正高)
*/
private String currentProfessionalTitle;
/**
* 现职称取得资格时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date currentProfessionalTitleTime;
/**
* 现聘职称(1无、2初级、3中级、4副高、5正高)
*/
private String currentHiringProfessionalTitle;
/**
* 现职称聘任时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime;
/**
* 现聘岗位(1专业技术岗、2管理岗、3工勤岗)
*/
private String currentPosition;
/**
* 现岗位等级(见习（三个现聘岗位都有见习这个等级 下拉框联动）、专业技术三级-专业技术十三级、
* 管理五级-管理九级、技术工二级-技术工五级)
*/
private String currentJobLevel;
/**
* 现岗位等级聘任时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date currentJobLevelAppointmentTime;
/**
* 职务
*/
private String duties;
/**
* 教师资格种类
*/
private String teacherQualificationType;
/**
* 教师资格证号码
*/
private String teacherQualificationCertificateNum;
/**
* 参加工作时间
*/
private String workingHours;
/**
* 到二中工作时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date toSecondMiddleSchoolTime;
/**
* 二中工作年龄 动态查询
*/
// private Integer toSecondAge;
/**
* 教龄起算时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date lengthOfTeacherTime;
/**
* 工龄起算时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date lengthOfServiceTime;
/**
* 工龄年限
*/
// private Integer seniority;
/**
* 在岗情况(1教学岗位、2教辅岗、3后勤岗、4管理岗、5其他岗、6退休、7行政、8内退岗、9待退岗)
*/
private String onDutySituation;
/**
* 在编情况 1在编 2合同制
*/
private String currentSituation;
/**
* 毕业院校1
*/
private String graduationInstitution1;
/**
* 专业1
*/
private String major1;
/**
* 毕业时间1 年月
*/
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime1;
/**
* 毕业院校2
*/
private String graduationInstitution2;
/**
* 专业2
*/
private String major2;
/**
* 毕业时间2年月
*/
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime2;
/**
* 毕业院校3
*/
private String graduationInstitution3;
/**
* 专业3
*/
private String major3;
/**
* 毕业时间3 年月
*/
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime3;
/**
* 第一学历
*/
private String firstDegree;
/**
* 最后学历
*/
private String lastDegree;
/**
* 学位
*/
private String degree;
/**
* 工作经历
*/
private String workExperience;
/**
* 照片名称
*/
private String photoName;
/**
* 照片地址
*/
private String photoUrl;
/**
* 钉钉手机号
*/
private String ddPhone;
//
// /**
// * 出生日期临时查询参数
// */
// private String birthDategt;
// private String birthDategtd;
// private String birthDatelt;
// private String birthDateltd;
//
// /**
// * 参加工作临时查询参数
// */
// private String workingHoursgt;
// private String workingHoursgtd;
// private String workingHourslt;
// private String workingHoursltd;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/SchoolTeacherBasicInformation.java → smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
package yangtz.cs.liu.campus.domain.teacherFiles;
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.NonNull;
import java.util.Date;
......@@ -15,7 +12,7 @@ import java.util.Date;
* 教师电子档案 老师基础信息
*/
@Data
public class SchoolTeacherBasicInformation extends BaseEntity {
public class SchoolTeacherBasicInformationVo extends BaseEntity {
// @Excel(name = "年级",combo = {"一年级","二年级","三年级"},readConverterExp = "1=一年级,2=二年级,3=三年级")
@TableId(value = "id", type = IdType.AUTO)
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/SchoolTeacherBasiclnExport.java → smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasiclnExport.java
package yangtz.cs.liu.campus.domain.teacherFiles;
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.java 0 → 100644
package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
import java.util.List;
/**
* 班主任考核Mapper接口
*
* @author ruoyi
* @date 2023-12-12
*/
public interface SchoolAclassTeacherAssessmentMapper extends BaseMapper<SchoolAclassTeacherAssessment>
{
/**
* 查询班主任考核
*
* @param id 班主任考核主键
* @return 班主任考核
*/
public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id);
/**
* 查询班主任考核列表
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 班主任考核集合
*/
public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req);
public List<SchoolAclassTeacherAssessment> selectSchoolList(SchoolAclassTeacherAssessmentReq req);
/**
* 新增班主任考核
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 结果
*/
public int insertSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment);
/**
* 修改班主任考核
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 结果
*/
public int updateSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment);
/**
* 删除班主任考核
*
* @param id 班主任考核主键
* @return 结果
*/
public int deleteSchoolAclassTeacherAssessmentById(Long id);
/**
* 批量删除班主任考核
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSchoolAclassTeacherAssessmentByIds(Long[] ids);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.java 0 → 100644
package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
import java.util.List;
/**
* 工作量信息Mapper接口
*
* @author ruoyi
* @date 2023-12-11
*/
public interface SchoolAworkloadMapper extends BaseMapper<SchoolAworkload>
{
/**
* 查询工作量信息
*
* @param id 工作量信息主键
* @return 工作量信息
*/
public SchoolAworkload selectSchoolAworkloadById(Long id);
/**
* 查询工作量信息列表
*
* @param schoolAworkload 工作量信息
* @return 工作量信息集合
*/
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
/**
* 新增工作量信息
*
* @param schoolAworkload 工作量信息
* @return 结果
*/
public int insertSchoolAworkload(SchoolAworkload schoolAworkload);
/**
* 修改工作量信息
*
* @param schoolAworkload 工作量信息
* @return 结果
*/
public int updateSchoolAworkload(SchoolAworkload schoolAworkload);
/**
* 删除工作量信息
*
* @param id 工作量信息主键
* @return 结果
*/
public int deleteSchoolAworkloadById(Long id);
/**
* 批量删除工作量信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSchoolAworkloadByIds(Long[] ids);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationMapper.java 0 → 100644
package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
import java.util.List;
public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolTeacherBasicInformation> {
List<SchoolTeacherBasicInformationVo> list(SchoolTeacherBasicInformationVo information);
SchoolTeacherBasicInformationVo selectById(Long id);
int updateInformationById(SchoolTeacherBasicInformation information);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/SchoolTeacherBasichlnformationMapper.java deleted 100644 → 0
package yangtz.cs.liu.campus.mapper.teacherFiles;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation;
import java.util.List;
public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolTeacherBasicInformation> {
List<SchoolTeacherBasicInformation> list(SchoolTeacherBasicInformation information);
SchoolTeacherBasicInformation selectById(Long id);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java
package yangtz.cs.liu.campus.service.impl.schoolAnnualAssessment;
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.exception.ServiceException;
......@@ -12,15 +11,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.controller.teacherFiles.SchoolTeacherBasiclnformationController;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper;
import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
import java.util.List;
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java 0 → 100644
package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
/**
* 班主任考核Service业务层处理
*
* @author ruoyi
* @date 2023-12-12
*/
@Service
public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<SchoolAclassTeacherAssessmentMapper, SchoolAclassTeacherAssessment> implements ISchoolAclassTeacherAssessmentService
{
@Autowired
private SchoolAclassTeacherAssessmentMapper schoolAclassTeacherAssessmentMapper;
/**
* 查询班主任考核
*
* @param id 班主任考核主键
* @return 班主任考核
*/
@Override
public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id)
{
return schoolAclassTeacherAssessmentMapper.selectSchoolAclassTeacherAssessmentById(id);
}
/**
* 查询班主任考核列表
*
* @param
* @return 班主任考核
*/
@Override
public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req)
{
//查询条件状
// 智育考核成绩
String intellEduCheckAchievement = req.getIntellEduCheckAchievement();
if (StringUtils.isNotEmpty(intellEduCheckAchievement)){
this.symbolConversion(req);
}
//德育考核成绩
String moralEduCheckAchievement = req.getMoralEduCheckAchievement();
if (StringUtils.isNotEmpty(moralEduCheckAchievement)){
this.wordDateConversion(req);
}
return schoolAclassTeacherAssessmentMapper.selectSchoolAclassTeacherAssessmentList(req);
}
@Override
public List<SchoolAclassTeacherAssessment> selectSchoolList(SchoolAclassTeacherAssessmentReq req)
{
//查询条件状
// 智育考核成绩
String intellEduCheckAchievement = req.getIntellEduCheckAchievement();
if (StringUtils.isNotEmpty(intellEduCheckAchievement)){
this.symbolConversion(req);
}
//德育考核成绩
String moralEduCheckAchievement = req.getMoralEduCheckAchievement();
if (StringUtils.isNotEmpty(moralEduCheckAchievement)){
this.wordDateConversion(req);
}
return schoolAclassTeacherAssessmentMapper.selectSchoolList(req);
}
/**
* 新增班主任考核
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 结果
*/
@Override
public int insertSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
{
schoolAclassTeacherAssessment.setCreateTime(DateUtils.getNowDate());
return schoolAclassTeacherAssessmentMapper.insertSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment);
}
/**
* 修改班主任考核
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 结果
*/
@Override
public int updateSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
{
schoolAclassTeacherAssessment.setUpdateTime(DateUtils.getNowDate());
return schoolAclassTeacherAssessmentMapper.updateSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment);
}
/**
* 批量删除班主任考核
*
* @param ids 需要删除的班主任考核主键
* @return 结果
*/
@Override
public int deleteSchoolAclassTeacherAssessmentByIds(Long[] ids)
{
return schoolAclassTeacherAssessmentMapper.deleteSchoolAclassTeacherAssessmentByIds(ids);
}
/**
* 删除班主任考核信息
*
* @param id 班主任考核主键
* @return 结果
*/
@Override
public int deleteSchoolAclassTeacherAssessmentById(Long id)
{
return schoolAclassTeacherAssessmentMapper.deleteSchoolAclassTeacherAssessmentById(id);
}
/**
* 智育考核成绩
* @param
*/
private void symbolConversion(SchoolAclassTeacherAssessmentReq req){
//智育考核成绩
String intellEduCheckAchievement = req.getIntellEduCheckAchievement();
if (intellEduCheckAchievement.contains(">=")) {
String substring = intellEduCheckAchievement.substring(2, intellEduCheckAchievement.length());
req.setIntellEduCheckAchievementgtd(new BigDecimal(substring));
req.setIntellEduCheckAchievement(null);
} else if (intellEduCheckAchievement.contains("<=")) {
String substring = intellEduCheckAchievement.substring(2, intellEduCheckAchievement.length());
req.setIntellEduCheckAchievementltd(new BigDecimal(substring));
req.setIntellEduCheckAchievement(null);
} else if (intellEduCheckAchievement.contains("<")) {
String substring = intellEduCheckAchievement.substring(1, intellEduCheckAchievement.length());
req.setIntellEduCheckAchievementlt(new BigDecimal(substring));
req.setIntellEduCheckAchievement(null);
} else if (intellEduCheckAchievement.contains(">")) {
String substring = intellEduCheckAchievement.substring(1, intellEduCheckAchievement.length());
req.setIntellEduCheckAchievementgt(new BigDecimal(substring));
req.setIntellEduCheckAchievement(null);
} else if (intellEduCheckAchievement.contains("=")) {
String substring = intellEduCheckAchievement.substring(1, intellEduCheckAchievement.length());
req.setIntellEduCheckAchievement(substring);
}
}
/**
* 参加工作调整
*/
private void wordDateConversion(SchoolAclassTeacherAssessmentReq req) {
String moralEduCheckAchievement = req.getMoralEduCheckAchievement();
if (moralEduCheckAchievement.contains(">=")) {
String substring = moralEduCheckAchievement.substring(2, moralEduCheckAchievement.length());
req.setMoralEduCheckAchievementgtd(new BigDecimal(substring));
req.setMoralEduCheckAchievement(null);
} else if (moralEduCheckAchievement.contains("<=")) {
String substring = moralEduCheckAchievement.substring(2, moralEduCheckAchievement.length());
req.setMoralEduCheckAchievementltd(new BigDecimal(substring));
req.setMoralEduCheckAchievement(null);
} else if (moralEduCheckAchievement.contains("<")) {
String substring = moralEduCheckAchievement.substring(1, moralEduCheckAchievement.length());
req.setMoralEduCheckAchievementlt(new BigDecimal(substring));
req.setMoralEduCheckAchievement(null);
} else if (moralEduCheckAchievement.contains(">")) {
String substring = moralEduCheckAchievement.substring(1, moralEduCheckAchievement.length());
req.setMoralEduCheckAchievementgt(new BigDecimal(substring));
req.setMoralEduCheckAchievement(null);
} else if (moralEduCheckAchievement.contains("=")) {
String substring = moralEduCheckAchievement.substring(1, moralEduCheckAchievement.length());
req.setMoralEduCheckAchievement(substring);
}
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java 0 → 100644
package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAworkloadMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
/**
* 工作量信息Service业务层处理
*
* @author ruoyi
* @date 2023-12-11
*/
@Service
public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapper, SchoolAworkload> implements ISchoolAworkloadService
{
@Autowired
private SchoolAworkloadMapper schoolAworkloadMapper;
/**
* 查询工作量信息
*
* @param id 工作量信息主键
* @return 工作量信息
*/
@Override
public SchoolAworkload selectSchoolAworkloadById(Long id)
{
SchoolAworkload date = schoolAworkloadMapper.selectSchoolAworkloadById(id);
date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy());
return date;
}
/**
* 查询工作量信息列表
*
* @param schoolAworkload 工作量信息
* @return 工作量信息
*/
@Override
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload)
{
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkload);
//计算合计
for (SchoolAworkloadVo date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy());
}
return schoolAworkloadVos;
}
@Override
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload)
{
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkload);
//计算合计
for (SchoolAworkloadExport date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy());
}
return schoolAworkloadVos;
}
/**
* 新增工作量信息
*
* @param schoolAworkload 工作量信息
* @return 结果
*/
@Override
public int insertSchoolAworkload(SchoolAworkload schoolAworkload)
{
schoolAworkload.setCreateTime(DateUtils.getNowDate());
return schoolAworkloadMapper.insertSchoolAworkload(schoolAworkload);
}
/**
* 修改工作量信息
*
* @param schoolAworkload 工作量信息
* @return 结果
*/
@Override
public int updateSchoolAworkload(SchoolAworkload schoolAworkload)
{
schoolAworkload.setUpdateTime(DateUtils.getNowDate());
return schoolAworkloadMapper.updateSchoolAworkload(schoolAworkload);
}
/**
* 批量删除工作量信息
*
* @param ids 需要删除的工作量信息主键
* @return 结果
*/
@Override
public int deleteSchoolAworkloadByIds(Long[] ids)
{
return schoolAworkloadMapper.deleteSchoolAworkloadByIds(ids);
}
/**
* 删除工作量信息信息
*
* @param id 工作量信息主键
* @return 结果
*/
@Override
public int deleteSchoolAworkloadById(Long id)
{
return schoolAworkloadMapper.deleteSchoolAworkloadById(id);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAclassTeacherAssessmentService.java 0 → 100644
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
import java.util.List;
/**
* 班主任考核Service接口
*
* @author ruoyi
* @date 2023-12-12
*/
public interface ISchoolAclassTeacherAssessmentService extends IService<SchoolAclassTeacherAssessment>
{
/**
* 查询班主任考核
*
* @param id 班主任考核主键
* @return 班主任考核
*/
public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id);
/**
* 查询班主任考核列表
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 班主任考核集合
*/
public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req);
public List<SchoolAclassTeacherAssessment> selectSchoolList(SchoolAclassTeacherAssessmentReq req);
/**
* 新增班主任考核
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 结果
*/
public int insertSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment);
/**
* 修改班主任考核
*
* @param schoolAclassTeacherAssessment 班主任考核
* @return 结果
*/
public int updateSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment);
/**
* 批量删除班主任考核
*
* @param ids 需要删除的班主任考核主键集合
* @return 结果
*/
public int deleteSchoolAclassTeacherAssessmentByIds(Long[] ids);
/**
* 删除班主任考核信息
*
* @param id 班主任考核主键
* @return 结果
*/
public int deleteSchoolAclassTeacherAssessmentById(Long id);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAworkloadService.java 0 → 100644
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
import java.util.List;
/**
* 工作量信息Service接口
*
* @author ruoyi
* @date 2023-12-11
*/
public interface ISchoolAworkloadService extends IService<SchoolAworkload>
{
/**
* 查询工作量信息
*
* @param id 工作量信息主键
* @return 工作量信息
*/
public SchoolAworkload selectSchoolAworkloadById(Long id);
/**
* 查询工作量信息列表
*
* @param schoolAworkload 工作量信息
* @return 工作量信息集合
*/
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
//导出列表
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
/**
* 新增工作量信息
*
* @param schoolAworkload 工作量信息
* @return 结果
*/
public int insertSchoolAworkload(SchoolAworkload schoolAworkload);
/**
* 修改工作量信息
*
* @param schoolAworkload 工作量信息
* @return 结果
*/
public int updateSchoolAworkload(SchoolAworkload schoolAworkload);
/**
* 批量删除工作量信息
*
* @param ids 需要删除的工作量信息主键集合
* @return 结果
*/
public int deleteSchoolAworkloadByIds(Long[] ids);
/**
* 删除工作量信息信息
*
* @param id 工作量信息主键
* @return 结果
*/
public int deleteSchoolAworkloadById(Long id);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/SchoolTeacherBasichlnformationService.java → smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationService.java
package yangtz.cs.liu.campus.service.teacherFiles;
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.util.List;
public interface SchoolTeacherBasichlnformationService extends IService<SchoolTeacherBasicInformation> {
List<SchoolTeacherBasicInformation> list(SchoolTeacherBasicInformation information) throws Exception;
List<SchoolTeacherBasicInformationVo> list(SchoolTeacherBasicInformationVo information) throws Exception;
SchoolTeacherBasicInformation getById(Long id) throws ParseException;
SchoolTeacherBasicInformationVo getByIds(Long id) throws ParseException;
int updateInformationById(SchoolTeacherBasicInformation information);
/*
* 批量导入学生照片
* */
String importTeacherPicture(MultipartFile file);
List<SchoolTeacherBasicInformation> importExcel(MultipartFile inputStream) throws IOException;
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/courseSelection/WxCouresSelection.java
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.wechat.controller.courseSelection;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.AjaxResult;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......@@ -38,69 +40,76 @@ public class WxCouresSelection {
ICurriculaVariableService iCurriculaVariableService;
/**
* 学生选号信息查询
* 学生选课信息查询
*/
@GetMapping("/getCourseInfo/{studentId}/{id}")
private AjaxResult getCourseInfo(@PathVariable("studentId") Long studentId,@PathVariable("id") Long id) {
@GetMapping("/getCourseInfo/{studentId}")
private AjaxResult getCourseInfo(@PathVariable("studentId") Long studentId) {
List<CurriclaStudentVo> CurriclaStudentVoList = new ArrayList<>();
//查询学生个人选课信息
LambdaQueryWrapper<CurriculaStudent> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CurriculaStudent::getStudentId, studentId);
wrapper.eq(CurriculaStudent::getDelFlag, "0");
wrapper.eq(CurriculaStudent::getCurriculaId, id);
//查询出学生任务信息
CurriculaStudent one = iCurriculaStudentService.getOne(wrapper);
List<CurriculaStudent> list = iCurriculaStudentService.list(wrapper);
//判断当前学生是否可以选课
Boolean flag = false;
Boolean stats = false;
CurriculaVariable byId = null;
//1.是否有选课任务
if (null == one) {
if (list.isEmpty()) {
flag = true;
}
//是否在选课时间内
if (null != one) {
byId = iCurriculaVariableService.getById(one.getCurriculaId());
//查询选课信息
if (null == byId) {
return AjaxResult.error("选课主题丢失，请联系管理员");
}
//设置当前时间
Calendar date = Calendar.getInstance();
date.setTime(new Date());
//开始时间
Calendar startDade = Calendar.getInstance();
startDade.setTime(byId.getStartTime());
//结束时间
Calendar endDade = Calendar.getInstance();
endDade.setTime(byId.getEndTime());
//处于开始时间之后，和结束时间之前的判断
if ((date.after(startDade) && date.before(endDade))) {
flag = false;
} else {
flag = true;
}
//判断当前否结束选课
if (date.after(endDade)){
flag=false;
stats = true;
}
}
if (flag) {
return new AjaxResult(2000, "当前没有选课任务");
}
if (!list.isEmpty()) {
for (CurriculaStudent dates :list){
byId = iCurriculaVariableService.getById(dates.getCurriculaId());
//查询选课信息
if (null == byId) {
return AjaxResult.error("选课主题丢失，请联系管理员");
}
//设置当前时间
Calendar date = Calendar.getInstance();
date.setTime(new Date());
//开始时间
Calendar startDade = Calendar.getInstance();
startDade.setTime(byId.getStartTime());
//结束时间
Calendar endDade = Calendar.getInstance();
endDade.setTime(byId.getEndTime());
//处于开始时间之后，和结束时间之前的判断
if ((date.after(startDade) && date.before(endDade))) {
flag = false;
} else {
flag = true;
}
//判断当前否结束选课
if (date.after(endDade)){
flag=true;
}
//判断当时时间是否选课之后
CurriclaStudentVo data = new CurriclaStudentVo();
//拼接返回对象
BeanUtils.copyProperties(one, data);
BeanUtils.copyProperties(dates, data);
BeanUtils.copyProperties(byId, data);
data.setId(one.getId());
data.setFlag(stats);
return AjaxResult.success(data);
data.setId(dates.getId());
data.setFlag(flag);
CurriclaStudentVoList.add(data);
}
}
return AjaxResult.success(CurriclaStudentVoList);
}
/**
* 学生选课信息查询
*/
@GetMapping("/getStudenCoures/{id}")
public AjaxResult getStudenCoures(@PathVariable("id") Long id){
return AjaxResult.success(iCurriculaStudentService.getById(id));
}
/**
* 学生选课课程展示
*/
@GetMapping("/getCurriculaSub/{id}")
......
smart-campus/src/main/resources/mapper/teacherFiles/SchoolTeacherBasiclnformationMapper.xml → smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
......@@ -2,12 +2,12 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.teacherFiles.SchoolTeacherBasichlnformationMapper">
<mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationMapper">
<sql id="selectSchoolTeacherBasicInformationVo">
select id, name, id_card, sex, file_birth_date, birth_date, hometown, nation, political_landscape, party_membership_time, teaching_subject, current_professional_title, current_professional_title_time, current_hiring_professional_title, current_hiring_professional_title_time, current_position, current_job_level, current_job_level_appointment_time, duties, teacher_qualification_type, teacher_qualification_certificate_num, working_hours, to_second_middle_school_time, length_of_teacher_time, length_of_service_time, on_duty_situation, current_situation, graduation_institution1, major1, graduation_time1, graduation_institution2, major2, graduation_time2, graduation_institution3, major3, graduation_time3, first_degree, last_degree, degree, work_experience, remark, photo_name, photo_url, dd_phone, del_flag from school_teacher_basic_information
</sql>
<select id="list" resultType="yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation" parameterType="yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation">
<select id="list" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo">
SELECT id,name,sex,id_card,file_birth_date,political_landscape,to_second_middle_school_time,current_professional_title,last_degree,on_duty_situation FROM school_teacher_basic_information where del_flag = 0
<if test="teachingSubject != null "> and teaching_subject = #{teachingSubject}</if>
<if test="name != null ">
......@@ -38,10 +38,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectById" resultType="yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation" parameterType="Long">
<select id="selectById" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo" parameterType="Long">
<include refid="selectSchoolTeacherBasicInformationVo"/>
where id =#{id}
where id =#{id} and del_flag = 0
</select>
<update id="updateInformationById" parameterType="SchoolTeacherBasicInformation">
update school_teacher_basic_information
<trim prefix="SET" suffixOverrides=",">
<if test="name != null and name != ''">name = #{name},</if>
<if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="fileBirthDate != null">file_birth_date = #{fileBirthDate},</if>
<if test="birthDate != null">birth_date = #{birthDate},</if>
<if test="hometown != null">hometown = #{hometown},</if>
<if test="nation != null">nation = #{nation},</if>
<if test="politicalLandscape != null">political_landscape = #{politicalLandscape},</if>
<if test="partyMembershipTime != null">party_membership_time = #{partyMembershipTime},</if>
<if test="teachingSubject != null and teachingSubject != ''">teaching_subject = #{teachingSubject},</if>
<if test="currentProfessionalTitle != null">current_professional_title = #{currentProfessionalTitle},</if>
<if test="currentProfessionalTitleTime != null">current_professional_title_time = #{currentProfessionalTitleTime},</if>
<if test="currentHiringProfessionalTitle != null">current_hiring_professional_title = #{currentHiringProfessionalTitle},</if>
<if test="currentHiringProfessionalTitleTime != null">current_hiring_professional_title_time = #{currentHiringProfessionalTitleTime},</if>
<if test="currentPosition != null">current_position = #{currentPosition},</if>
<if test="currentJobLevel != null">current_job_level = #{currentJobLevel},</if>
<if test="currentJobLevelAppointmentTime != null">current_job_level_appointment_time = #{currentJobLevelAppointmentTime},</if>
<if test="duties != null">duties = #{duties},</if>
<if test="teacherQualificationType != null">teacher_qualification_type = #{teacherQualificationType},</if>
<if test="teacherQualificationCertificateNum != null">teacher_qualification_certificate_num = #{teacherQualificationCertificateNum},</if>
<if test="workingHours != null">working_hours = #{workingHours},</if>
<if test="toSecondMiddleSchoolTime != null">to_second_middle_school_time = #{toSecondMiddleSchoolTime},</if>
<if test="lengthOfTeacherTime != null">length_of_teacher_time = #{lengthOfTeacherTime},</if>
<if test="lengthOfServiceTime != null">length_of_service_time = #{lengthOfServiceTime},</if>
<if test="onDutySituation != null">on_duty_situation = #{onDutySituation},</if>
<if test="currentSituation != null">current_situation = #{currentSituation},</if>
<if test="graduationInstitution1 != null">graduation_institution1 = #{graduationInstitution1},</if>
<if test="major1 != null">major1 = #{major1},</if>
<if test="graduationTime1 != null">graduation_time1 = #{graduationTime1},</if>
<if test="graduationInstitution2 != null">graduation_institution2 = #{graduationInstitution2},</if>
<if test="major2 != null">major2 = #{major2},</if>
<if test="graduationTime2 != null">graduation_time2 = #{graduationTime2},</if>
<if test="graduationInstitution3 != null">graduation_institution3 = #{graduationInstitution3},</if>
<if test="major3 != null">major3 = #{major3},</if>
<if test="graduationTime3 != null">graduation_time3 = #{graduationTime3},</if>
<if test="firstDegree != null">first_degree = #{firstDegree},</if>
<if test="lastDegree != null">last_degree = #{lastDegree},</if>
<if test="degree != null">degree = #{degree},</if>
<if test="workExperience != null">work_experience = #{workExperience},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="photoName != null">photo_name = #{photoName},</if>
<if test="photoUrl != null">photo_url = #{photoUrl},</if>
<if test="ddPhone != null">dd_phone = #{ddPhone},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment