Skip to content

D
dd_school
Commit 9f38a94d by baochunxin
Options

#G：电子教师综合查询接口编写，格式化无效引用

parent a7bfa0b9
Showing with 898 additions and 440 deletions
ruoyi-common/pom.xml
...@@ -165,6 +165,31 @@ ...@@ -165,6 +165,31 @@
<version>16.02-2.01</version> <version>16.02-2.01</version>
</dependency> </dependency>
<!--PDF导出-->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.2</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<!-- pdf 加权限 添加以下包不然会报错-->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.47</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15on</artifactId>
<version>1.47</version>
</dependency>
<!-- 解压zip --> <!-- 解压zip -->
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
......
ruoyi-common/src/main/java/com/ruoyi/common/utils/pdf/PDFUtil.java 0 → 100644
package com.ruoyi.common.utils.pdf;
import com.itextpdf.text.*;
import com.itextpdf.text.pdf.BaseFont;
import com.itextpdf.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfWriter;
import javafx.scene.paint.Color;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Objects;
/**
* @title: PDFUtil
* @description: PDF工具类
* @date 2023/4/28 11:22
*/
public class PDFUtil {
/**
* 中文编码格式
*/
public static final String BASE_FONT_CHINESE_ENCODING = "UniGB-UCS2-H";
/**
* 宋体
*/
public static final String FONT_SONG = "STSong-Light";
/**
* @MethodName createDocument
* @Description 获取Document实体
* @date: 2023/4/28 11:24
* @return: Document
*/
public static Document createDocument() {
return new Document();
}
/**
* @MethodName getOutStream
* @Description 获取输出流，并且将Document放入流中
* @date: 2023/4/28 11:25
* @param: document
* @return: ByteArrayOutputStream
*/
public static ByteArrayOutputStream getOutStream(Document document) throws DocumentException {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PdfWriter.getInstance(document, outputStream);
return outputStream;
}
/**
* @MethodName getBaseFont
* @Description 获取基础字体设置BaseFont
* @date: 2023/4/28 14:27
* @param: name 字体名称
* @param: encoding 编码格式（中文默认设置为：UniGB-UCS2-H，不支持UTF-8）
* @param: isEmbedded
* @return: BaseFont
*/
public static BaseFont getBaseFont(String name, String encoding, Boolean isEmbedded) throws DocumentException, IOException {
return BaseFont.createFont(name, encoding, isEmbedded);
}
/**
* @MethodName getFont
* @Description 获取字体
* @date: 2023/4/28 14:32
* @param: baseFont 字体基础设置
* @param: fontSize 字体大小
* @param: style 字体样式（参考Font类）
* @return: Font
*/
public static Font getFont(BaseFont baseFont, float fontSize, Integer style) {
return new Font(baseFont, fontSize, style);
}
/**
* @MethodName getChunk
* @Description 获取标题或者需指定样式的内容
* @date: 2023/4/28 14:38
* @param: content 内容
* @param: font 字体
* @return: Chunk
*/
public static Chunk getChunk(String content, Font font) {
return new Chunk(content, font);
}
/**
* @MethodName getParagraph
* @Description 获取段落
* @date: 2023/4/28 14:40
* @param: alignment 对齐方式（参考Element类）
* @param: spacingAfter 段落之前间距
* @param: spacingBefore 段落之后间距
* @return: Paragraph
*/
public static Paragraph getParagraph(Integer alignment, Integer spacingAfter, Integer spacingBefore) {
Paragraph paragraph = new Paragraph();
if (Objects.nonNull(alignment)) paragraph.setAlignment(alignment);
if (Objects.nonNull(spacingAfter)) paragraph.setSpacingAfter(spacingAfter);
if (Objects.nonNull(spacingBefore)) paragraph.setSpacingBefore(spacingBefore);
return paragraph;
}
/**
* @MethodName getParagraph
* @Description 获取带有内容的段落
* @date: 2023/4/28 14:43
* @param: chunk 内容对象
* @param: alignment 对齐方式（参考Element类）
* @param: spacingAfter 段落之前间距
* @param: spacingBefore 段落之后间距
* @return: Paragraph
*/
public static Paragraph getParagraph(Chunk chunk, Integer alignment, Integer spacingAfter, Integer spacingBefore) {
Paragraph paragraph = new Paragraph(chunk);
paragraph.setLeading(35);
if (Objects.nonNull(alignment)) paragraph.setAlignment(alignment);
if (Objects.nonNull(spacingAfter)) paragraph.setSpacingAfter(spacingAfter);
if (Objects.nonNull(spacingBefore)) paragraph.setSpacingBefore(spacingBefore);
return paragraph;
}
/**
* @MethodName getPdfPTable
* @Description 获取表格
* @date: 2023/4/28 14:57
* @param: numColumns 表格列数，无需设置行数，会根据填充的值生成
* @param: widthPercentage 表格占用页面百分比
* @param: totalWidth 表格宽度
* @return: PdfPTable
*/
public static PdfPTable getPdfPTable(Integer numColumns, float widthPercentage, float totalWidth) {
PdfPTable table = new PdfPTable(numColumns);
if (Objects.nonNull(widthPercentage)) table.setWidthPercentage(widthPercentage);
if (Objects.nonNull(totalWidth)) table.setTotalWidth(totalWidth);
return table;
}
/**
* @MethodName getPdfCell
* @Description 获取单元格对象
* @date: 2023/4/28 16:19
* @param: phrase 单元内容
* @param: horizontalAlignment 垂直样式（例如：垂直居中，具体参数参考 Element 类）
* @param: verticalAlignment 水平样式（例如：水平居中，具体参数参考 Element 类）
* @param: fixedHeight 固定高度
* @param: isSetBorder 是否设置框线（此方法设置为单框线）
* @return: PdfPCell
*/
public static PdfPCell getPdfCell(Phrase phrase, Integer horizontalAlignment,
Integer verticalAlignment, Integer fixedHeight, Boolean isSetBorder) {
PdfPCell pdfPCell = new PdfPCell(phrase);
if (Objects.nonNull(horizontalAlignment)) pdfPCell.setHorizontalAlignment(horizontalAlignment);
if (Objects.nonNull(verticalAlignment)) pdfPCell.setVerticalAlignment(verticalAlignment);
if (Objects.nonNull(fixedHeight)) pdfPCell.setFixedHeight(fixedHeight);
if (isSetBorder) pdfPCell.setBorder(PdfPCell.LEFT | PdfPCell.RIGHT | PdfPCell.BOTTOM | PdfPCell.TOP);
return pdfPCell;
}
/**
* @MethodName getColSpanPdfCell
* @Description 获取合并单元格
* @date: 2023/4/28 16:34
* @param: phrase 单元内容
* @param: horizontalAlignment 垂直样式（例如：垂直居中，具体参数参考 Element 类）
* @param: verticalAlignment 水平样式（例如：水平居中，具体参数参考 Element 类）
* @param: fixedHeight 固定高度
* @param: isSetBorder 是否设置框线（此方法设置为单框线）
* @param: colspan 合并单元格数量
* @return: PdfPCell
*/
public static PdfPCell getColSpanPdfCell(Phrase phrase, Integer horizontalAlignment,
Integer verticalAlignment, Integer fixedHeight,
Boolean isSetBorder, Integer colspan,Integer rowsSpan) {
PdfPCell pdfPCell = new PdfPCell(phrase);
if (Objects.nonNull(horizontalAlignment)) pdfPCell.setHorizontalAlignment(horizontalAlignment);
if (Objects.nonNull(verticalAlignment)) pdfPCell.setVerticalAlignment(verticalAlignment);
if (Objects.nonNull(fixedHeight)) pdfPCell.setFixedHeight(fixedHeight);
if (isSetBorder) pdfPCell.setBorder(PdfPCell.LEFT | PdfPCell.RIGHT | PdfPCell.BOTTOM | PdfPCell.TOP);
pdfPCell.setColspan(colspan);
pdfPCell.setRowspan(rowsSpan);
return pdfPCell;
}
/**
* @MethodName getPhrase
* @Description 获取单元内容
* @date: 2023/4/28 16:23
* @param: content 单元格内容
* @param: font 字体
* @return: Phrase
*/
public static Phrase getPhrase(String content, Font font) {
return new Phrase(content, font);
}
/**
* @MethodName addPdfPCell
* @Description 将内容添加至单元格对象中，并且添加至表格中
* @date: 2023/4/28 16:27
* @param: content 内容
* @param: font 字体样式
* @param: pdfPCell 单元格
* @param: pdfPTable 表格
* @param: fixedHeight 固定高度
* @return: void
*/
public static void addPdfPCell(String content, Font font, PdfPCell pdfPCell,PdfPTable pdfPTable,Integer fixedHeight) {
pdfPCell.setPhrase(new Phrase(content, font));
pdfPCell.setBackgroundColor(null);
if (Objects.nonNull(fixedHeight)) pdfPCell.setFixedHeight(fixedHeight);
pdfPTable.addCell(pdfPCell);
}
/**
* 表头
* @param content
* @param font
* @param pdfPCell
* @param pdfPTable
* @param fixedHeight
*/
public static void addPdfPTitleCell(String content, Font font, PdfPCell pdfPCell,PdfPTable pdfPTable,Integer fixedHeight) {
pdfPCell.setPhrase(new Phrase(content, font));
pdfPCell.setBackgroundColor(new BaseColor(239, 248, 252));
if (Objects.nonNull(fixedHeight)) pdfPCell.setFixedHeight(fixedHeight);
pdfPTable.addCell(pdfPCell);
}
/**
* @MethodName exportPDF
* @Description 导出PDF
* @date: 2023/4/28 16:37
* @param: document
* @param: response
* @param: outputStream
* @return: void
*/
public static void exportPDF(Document document, HttpServletResponse response, ByteArrayOutputStream outputStream) throws IOException {
try {
if (Objects.isNull(document)) return;
response.reset();
document.close();
response.setCharacterEncoding("UTF-8");
response.setContentType("application/pdf");
response.setHeader("Content-disposition", "attachment;filename=table.pdf");
response.setContentLength(outputStream.size());
outputStream.writeTo(response.getOutputStream());
outputStream.flush();
} finally {
try {
outputStream.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
}
\ No newline at end of file
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
...@@ -116,6 +116,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -116,6 +116,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/dd/user/login").permitAll() .antMatchers("/dd/user/login").permitAll()
.antMatchers( "/common/**").permitAll() .antMatchers( "/common/**").permitAll()
.antMatchers( "/dd/school/**").permitAll() .antMatchers( "/dd/school/**").permitAll()
.antMatchers( "/teacher/basiclnformation/**","/aworkload/**","/wx/course/**","/assessment/**","/achievement/**","/school/award/**").permitAll()
//打印下载接口放行 //打印下载接口放行
.antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll() .antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll()
......
smart-campus/pom.xml
...@@ -114,5 +114,17 @@ ...@@ -114,5 +114,17 @@
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
</dependency> </dependency>
<!--PDF-->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.3</version>
</dependency>
<!--PDF中文支持-->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/EquipmentLedgerController.java
package yangtz.cs.liu.campus.controller.SchoolEquipment; package yangtz.cs.liu.campus.controller.SchoolEquipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -14,10 +13,8 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,10 +13,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger; import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService; import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
import yangtz.cs.liu.campus.vo.curricula.CurriculaStudentVo;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerDcVo; import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerDcVo;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo; import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
import yangtz.cs.liu.campus.vo.student.SchoolStudentScoreVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolStudentIntegral/SchoolStudentIntegralController.java
package yangtz.cs.liu.campus.controller.SchoolStudentIntegral; package yangtz.cs.liu.campus.controller.SchoolStudentIntegral;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
...@@ -16,16 +15,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,16 +15,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.SchoolStudentIntegral.SchoolStudentIntegral; import yangtz.cs.liu.campus.domain.SchoolStudentIntegral.SchoolStudentIntegral;
import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.service.ISchoolStudentIntegra.ISchoolStudentIntegralService; import yangtz.cs.liu.campus.service.ISchoolStudentIntegra.ISchoolStudentIntegralService;
import yangtz.cs.liu.campus.service.impl.student.SchoolStudentServiceImpl; import yangtz.cs.liu.campus.service.impl.student.SchoolStudentServiceImpl;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Scanner;
/** /**
* 学生积分Controller * 学生积分Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/auditorium/SchoolAuditoriumController.java
package yangtz.cs.liu.campus.controller.auditorium; package yangtz.cs.liu.campus.controller.auditorium;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request; import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -31,27 +25,18 @@ import com.ruoyi.common.annotation.Log; ...@@ -31,27 +25,18 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.activiti.domain.HistoricActivity;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium; import yangtz.cs.liu.campus.domain.auditorium.SchoolAuditorium;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave;
import yangtz.cs.liu.campus.domain.temp.AuditoriumTemplate;
import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
import yangtz.cs.liu.campus.domain.temp.TeacherLeaveTemplate;
import yangtz.cs.liu.campus.service.auditorium.ISchoolAuditoriumService; import yangtz.cs.liu.campus.service.auditorium.ISchoolAuditoriumService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo; import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
import yangtz.cs.liu.dingding.utils.DingMessageUtils; import yangtz.cs.liu.dingding.utils.DingMessageUtils;
import yangtz.cs.liu.dingding.vo.DingMessageVo; import yangtz.cs.liu.dingding.vo.DingMessageVo;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import static com.core.constant.ProcessDefinition.*; import static com.core.constant.ProcessDefinition.*;
import static yangtz.cs.liu.campus.constant.ProcessState.*;
import static yangtz.cs.liu.campus.constant.ProcessState.ZHUYAO;
/** /**
* 学校礼堂预约Controller * 学校礼堂预约Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/conference/SchoolConferenceController.java
...@@ -19,7 +19,6 @@ import yangtz.cs.liu.campus.service.conference.ISchoolConferenceService; ...@@ -19,7 +19,6 @@ import yangtz.cs.liu.campus.service.conference.ISchoolConferenceService;
import yangtz.cs.liu.campus.vo.conference.SchoolConferenceVO; import yangtz.cs.liu.campus.vo.conference.SchoolConferenceVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.ruoyi.common.utils.StringUtils.isNotNull; import static com.ruoyi.common.utils.StringUtils.isNotNull;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/course/SchoolCourseController.java
...@@ -11,9 +11,6 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -11,9 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.course.SchoolCourse; import yangtz.cs.liu.campus.domain.course.SchoolCourse;
import yangtz.cs.liu.campus.domain.device.SchoolDevice;
import yangtz.cs.liu.campus.domain.student.SchoolEducation;
import yangtz.cs.liu.campus.domain.student.SchoolStudentEvaluate;
import yangtz.cs.liu.campus.service.course.ISchoolCourseSerivice; import yangtz.cs.liu.campus.service.course.ISchoolCourseSerivice;
import yangtz.cs.liu.campus.vo.Course.SchoolCourseVO; import yangtz.cs.liu.campus.vo.Course.SchoolCourseVO;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/curricula/StudentScoreController.java
...@@ -12,8 +12,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -12,8 +12,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.student.SchoolStudentScore; import yangtz.cs.liu.campus.domain.student.SchoolStudentScore;
import yangtz.cs.liu.campus.service.curricula.IStudentScoreService; import yangtz.cs.liu.campus.service.curricula.IStudentScoreService;
import yangtz.cs.liu.campus.vo.curricula.CurriculaStudentVo;
import yangtz.cs.liu.campus.vo.curricula.CurriculaStudentYtVo;
import yangtz.cs.liu.campus.vo.curricula.StudentScoreVo; import yangtz.cs.liu.campus.vo.curricula.StudentScoreVo;
import yangtz.cs.liu.campus.vo.student.SchoolStudentScoreVo; import yangtz.cs.liu.campus.vo.student.SchoolStudentScoreVo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/device/SchoolDeviceController.java
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
...@@ -23,7 +22,6 @@ import yangtz.cs.liu.campus.domain.device.SchoolDevice; ...@@ -23,7 +22,6 @@ import yangtz.cs.liu.campus.domain.device.SchoolDevice;
import yangtz.cs.liu.campus.service.area.ISchoolAreaService; import yangtz.cs.liu.campus.service.area.ISchoolAreaService;
import yangtz.cs.liu.campus.service.device.ISchoolDeviceService; import yangtz.cs.liu.campus.service.device.ISchoolDeviceService;
import yangtz.cs.liu.campus.vo.device.DeviceByIdVo; import yangtz.cs.liu.campus.vo.device.DeviceByIdVo;
import yangtz.cs.liu.campus.vo.device.DeviceListVo;
/** /**
* 设备管理Controller * 设备管理Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/device/SchoolDeviceRecordController.java
...@@ -8,13 +8,11 @@ import com.ruoyi.common.utils.DateUtils; ...@@ -8,13 +8,11 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.area.SchoolArea;
import yangtz.cs.liu.campus.domain.device.SchoolDeviceRecord; import yangtz.cs.liu.campus.domain.device.SchoolDeviceRecord;
import yangtz.cs.liu.campus.service.device.ISchoolDeviceRecordService; import yangtz.cs.liu.campus.service.device.ISchoolDeviceRecordService;
import yangtz.cs.liu.campus.service.device.ISchoolDeviceService; import yangtz.cs.liu.campus.service.device.ISchoolDeviceService;
...@@ -22,14 +20,12 @@ import yangtz.cs.liu.campus.vo.device.*; ...@@ -22,14 +20,12 @@ import yangtz.cs.liu.campus.vo.device.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.core.constant.ProcessCommon.ROLEKEY; import static com.core.constant.ProcessCommon.ROLEKEY;
import static com.core.constant.ProcessDefinition.INSTANDHALTUNG; import static com.core.constant.ProcessDefinition.INSTANDHALTUNG;
import static com.core.constant.ProcessDefinition.VEHICLEAPPLICATION;
import static yangtz.cs.liu.campus.constant.ProcessState.PASS; import static yangtz.cs.liu.campus.constant.ProcessState.PASS;
import static yangtz.cs.liu.campus.constant.ProcessState.REFUSE; import static yangtz.cs.liu.campus.constant.ProcessState.REFUSE;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/exam/ExamDetailController.java
...@@ -3,11 +3,9 @@ package yangtz.cs.liu.campus.controller.exam; ...@@ -3,11 +3,9 @@ package yangtz.cs.liu.campus.controller.exam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -18,10 +16,8 @@ import org.springframework.validation.annotation.Validated; ...@@ -18,10 +16,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.exam.ExamDetail; import yangtz.cs.liu.campus.domain.exam.ExamDetail;
import yangtz.cs.liu.campus.domain.exam.ExamMain;
import yangtz.cs.liu.campus.service.exam.IExamDetailService; import yangtz.cs.liu.campus.service.exam.IExamDetailService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/exam/ExamMainController.java
...@@ -8,7 +8,6 @@ import com.ruoyi.common.exception.ServiceException; ...@@ -8,7 +8,6 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.aspectj.weaver.loadtime.Aj;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -19,7 +18,6 @@ import yangtz.cs.liu.campus.domain.exam.*; ...@@ -19,7 +18,6 @@ import yangtz.cs.liu.campus.domain.exam.*;
import yangtz.cs.liu.campus.service.exam.*; import yangtz.cs.liu.campus.service.exam.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank; import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/exam/ExamUserController.java
package yangtz.cs.liu.campus.controller.exam; package yangtz.cs.liu.campus.controller.exam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.exam.ExamDetail;
import yangtz.cs.liu.campus.domain.exam.ExamUser;
import yangtz.cs.liu.campus.domain.exam.ExamUserScore;
import yangtz.cs.liu.campus.domain.exam.ExamUserScoreDetail;
import yangtz.cs.liu.campus.service.exam.IExamUserScoreDetailService; import yangtz.cs.liu.campus.service.exam.IExamUserScoreDetailService;
import yangtz.cs.liu.campus.service.exam.IExamUserScoreService; import yangtz.cs.liu.campus.service.exam.IExamUserScoreService;
import yangtz.cs.liu.campus.service.exam.IExamUserService; import yangtz.cs.liu.campus.service.exam.IExamUserService;
import yangtz.cs.liu.campus.vo.exam.ExamUserVo; import yangtz.cs.liu.campus.vo.exam.ExamUserVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/exam/ExamUserScoreController.java
...@@ -8,10 +8,8 @@ import org.slf4j.Logger; ...@@ -8,10 +8,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.exam.ExamUserScore;
import yangtz.cs.liu.campus.service.exam.IExamUserScoreService; import yangtz.cs.liu.campus.service.exam.IExamUserScoreService;
import yangtz.cs.liu.campus.vo.exam.ExamUserScoreVo; import yangtz.cs.liu.campus.vo.exam.ExamUserScoreVo;
import yangtz.cs.liu.campus.vo.exam.ExamUserVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/JuniorHighSchoolController.java
...@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolArtExamController.java
...@@ -3,7 +3,6 @@ package yangtz.cs.liu.campus.controller.examination; ...@@ -3,7 +3,6 @@ package yangtz.cs.liu.campus.controller.examination;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolArtStudentController.java
...@@ -2,25 +2,18 @@ package yangtz.cs.liu.campus.controller.examination; ...@@ -2,25 +2,18 @@ package yangtz.cs.liu.campus.controller.examination;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.examination.EduArtStudent;
import yangtz.cs.liu.campus.domain.examination.SchoolArtExam;
import yangtz.cs.liu.campus.domain.examination.SchoolArtStudent; import yangtz.cs.liu.campus.domain.examination.SchoolArtStudent;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.service.examination.ISchoolArtStudentService; import yangtz.cs.liu.campus.service.examination.ISchoolArtStudentService;
import yangtz.cs.liu.campus.vo.examination.ArtAndEduStudentVo; import yangtz.cs.liu.campus.vo.examination.ArtAndEduStudentVo;
import yangtz.cs.liu.campus.vo.examination.ArtEduStudentVo; import yangtz.cs.liu.campus.vo.examination.ArtEduStudentVo;
import yangtz.cs.liu.campus.vo.examination.SchoolArtStudentVo; import yangtz.cs.liu.campus.vo.examination.SchoolArtStudentVo;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.webpage.vo.WebSchoolArtStudentVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolTestProjectController.java
package yangtz.cs.liu.campus.controller.examination; package yangtz.cs.liu.campus.controller.examination;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoStudentController.java
...@@ -8,8 +8,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil; ...@@ -8,8 +8,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.fudao.FudaoStudent; import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import yangtz.cs.liu.campus.service.fudao.FudaoStudentService; import yangtz.cs.liu.campus.service.fudao.FudaoStudentService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo; import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoTeacherController.java
...@@ -7,9 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils; ...@@ -7,9 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher; import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.domain.student.SchoolEducation;
import yangtz.cs.liu.campus.service.fudao.FudaoTeacherService; import yangtz.cs.liu.campus.service.fudao.FudaoTeacherService;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo; import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/interest/SchoolInterestClassesAttendanceController.java
...@@ -23,7 +23,6 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -23,7 +23,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesAttendance; import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesAttendance;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesDetails;
import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesAttendanceService; import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesAttendanceService;
import yangtz.cs.liu.campus.vo.interest.AttendanceVO; import yangtz.cs.liu.campus.vo.interest.AttendanceVO;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/interest/SchoolInterestClassesChildController.java
package yangtz.cs.liu.campus.controller.interest; package yangtz.cs.liu.campus.controller.interest;
import java.io.IOException;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -29,7 +25,6 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -29,7 +25,6 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesChild; import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesChild;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesDetails;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesChildService; import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesChildService;
import yangtz.cs.liu.campus.vo.interest.ChildVO; import yangtz.cs.liu.campus.vo.interest.ChildVO;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/interest/SchoolInterestClassesController.java
...@@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -17,13 +16,10 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -17,13 +16,10 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClasses; import yangtz.cs.liu.campus.domain.interest.SchoolInterestClasses;
import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase;
import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesService; import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesService;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/interest/SchoolInterestClassesDetailsController.java
...@@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -17,12 +16,9 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -17,12 +16,9 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClasses;
import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesDetails; import yangtz.cs.liu.campus.domain.interest.SchoolInterestClassesDetails;
import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesDetailsService; import yangtz.cs.liu.campus.service.interest.ISchoolInterestClassesDetailsService;
import yangtz.cs.liu.campus.vo.interest.DetailsVO; import yangtz.cs.liu.campus.vo.interest.DetailsVO;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/introduce/SchoolIntroduceController.java
package yangtz.cs.liu.campus.controller.introduce; package yangtz.cs.liu.campus.controller.introduce;
import java.util.List;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -19,7 +11,6 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -19,7 +11,6 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.service.introduce.ISchoolIntroduceService; import yangtz.cs.liu.campus.service.introduce.ISchoolIntroduceService;
import yangtz.cs.liu.campus.domain.introduce.SchoolIntroduce; import yangtz.cs.liu.campus.domain.introduce.SchoolIntroduce;
import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/introduce/SchoolPicController.java
package yangtz.cs.liu.campus.controller.introduce; package yangtz.cs.liu.campus.controller.introduce;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.introduce.SchoolIntroduce;
import yangtz.cs.liu.campus.domain.introduce.SchoolPic; import yangtz.cs.liu.campus.domain.introduce.SchoolPic;
import yangtz.cs.liu.campus.service.introduce.ISchoolPicService; import yangtz.cs.liu.campus.service.introduce.ISchoolPicService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/material/MaterialController.java
...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.material; ...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.material;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/message/SchoolMessageParentsPushsController.java
...@@ -7,11 +7,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -7,11 +7,9 @@ import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -23,16 +21,12 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -23,16 +21,12 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.message.SchoolMessageParentsPushs; import yangtz.cs.liu.campus.domain.message.SchoolMessageParentsPushs;
import yangtz.cs.liu.campus.domain.message.SchoolMessagePush;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent; import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.service.message.ISchoolMessageParentsPushsDetailsService; import yangtz.cs.liu.campus.service.message.ISchoolMessageParentsPushsDetailsService;
import yangtz.cs.liu.campus.service.message.ISchoolMessageParentsPushsService; import yangtz.cs.liu.campus.service.message.ISchoolMessageParentsPushsService;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/message/SchoolMessagePushController.java
...@@ -15,17 +15,13 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -15,17 +15,13 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.message.SchoolMessagePush; import yangtz.cs.liu.campus.domain.message.SchoolMessagePush;
import yangtz.cs.liu.campus.domain.time.SchoolTime;
import yangtz.cs.liu.campus.service.message.ISchoolMessagePushService; import yangtz.cs.liu.campus.service.message.ISchoolMessagePushService;
import yangtz.cs.liu.wechat.vo.message.MessagePushVO; import yangtz.cs.liu.wechat.vo.message.MessagePushVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
import static yangtz.cs.liu.campus.constant.MessageConstant.NORMAL; import static yangtz.cs.liu.campus.constant.MessageConstant.NORMAL;
import static yangtz.cs.liu.campus.constant.TimeUseConstant.UN_USE;
import static yangtz.cs.liu.campus.constant.TimeUseConstant.USE;
@RestController @RestController
@RequestMapping("/schoolMessagePush") @RequestMapping("/schoolMessagePush")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/office/SchoolOfficePurchaseController.java
package yangtz.cs.liu.campus.controller.office; package yangtz.cs.liu.campus.controller.office;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.domain.PageBaseInfo;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -19,24 +13,16 @@ import org.springframework.validation.annotation.Validated; ...@@ -19,24 +13,16 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase; import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase;
import yangtz.cs.liu.campus.domain.vehicle.SchoolVehicleApplication;
import yangtz.cs.liu.campus.service.office.ISchoolOfficePurchaseService; import yangtz.cs.liu.campus.service.office.ISchoolOfficePurchaseService;
import yangtz.cs.liu.campus.vo.office.OfficeTodoListVO; import yangtz.cs.liu.campus.vo.office.OfficeTodoListVO;
import yangtz.cs.liu.campus.vo.vehicle.VehicleApplicationVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
import static com.core.constant.ProcessCommon.ROLEKEY; import static com.core.constant.ProcessCommon.ROLEKEY;
import static com.core.constant.ProcessDefinition.OFFICEPURCHASE; import static com.core.constant.ProcessDefinition.OFFICEPURCHASE;
import static com.core.constant.ProcessDefinition.VEHICLEAPPLICATION;
import static yangtz.cs.liu.campus.constant.ProcessState.PASS; import static yangtz.cs.liu.campus.constant.ProcessState.PASS;
import static yangtz.cs.liu.campus.constant.ProcessState.REFUSE; import static yangtz.cs.liu.campus.constant.ProcessState.REFUSE;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/patrol/SchoolPatrolController.java
...@@ -3,17 +3,13 @@ package yangtz.cs.liu.campus.controller.patrol; ...@@ -3,17 +3,13 @@ package yangtz.cs.liu.campus.controller.patrol;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.apache.ibatis.annotations.Param;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -25,9 +21,7 @@ import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolService; ...@@ -25,9 +21,7 @@ import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolService;
import yangtz.cs.liu.campus.vo.patrol.SchoolPatrolVo; import yangtz.cs.liu.campus.vo.patrol.SchoolPatrolVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 课堂巡视Controller * 课堂巡视Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/patrol/SchoolPatrolDetailsController.java
package yangtz.cs.liu.campus.controller.patrol; package yangtz.cs.liu.campus.controller.patrol;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.aspectj.weaver.loadtime.Aj;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.patrol.SchoolPatrolDetails; import yangtz.cs.liu.campus.domain.patrol.SchoolPatrolDetails;
import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolDetailsService; import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolDetailsService;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import static com.ruoyi.common.utils.StringUtils.isNotNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/patrol/SchoolPatrolRuleController.java
...@@ -16,7 +16,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -16,7 +16,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.patrol.SchoolPatrolRule; import yangtz.cs.liu.campus.domain.patrol.SchoolPatrolRule;
import yangtz.cs.liu.campus.domain.patrol.SchoolPatrolRuleDetails; import yangtz.cs.liu.campus.domain.patrol.SchoolPatrolRuleDetails;
import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolRuleDetailsService;
import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolRuleService; import yangtz.cs.liu.campus.service.patrol.ISchoolPatrolRuleService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/patrol/SchoolPatrolRuleDetailsController.java
...@@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/recipe/SchoolRecipesController.java
package yangtz.cs.liu.campus.controller.recipe; package yangtz.cs.liu.campus.controller.recipe;
import java.io.FileInputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import net.bytebuddy.asm.Advice;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -31,11 +22,8 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -31,11 +22,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.exam.ExamDetail;
import yangtz.cs.liu.campus.domain.message.SchoolMessagePush;
import yangtz.cs.liu.campus.domain.recipe.SchoolRecipes; import yangtz.cs.liu.campus.domain.recipe.SchoolRecipes;
import yangtz.cs.liu.campus.service.recipe.ISchoolRecipesService; import yangtz.cs.liu.campus.service.recipe.ISchoolRecipesService;
import yangtz.cs.liu.campus.vo.recipeVo.recipeVo;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull; import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull; import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/repairs/LogisticsRepairsController.java
...@@ -8,7 +8,6 @@ import java.util.Map; ...@@ -8,7 +8,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/resources/SchoolResourcesController.java
...@@ -4,7 +4,6 @@ import java.util.List; ...@@ -4,7 +4,6 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/resources/SchoolResourcesDetailsController.java
package yangtz.cs.liu.campus.controller.resources; package yangtz.cs.liu.campus.controller.resources;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
import com.sun.jna.platform.win32.WinDef;
import io.swagger.models.auth.In;
import org.apache.catalina.security.SecurityUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.resources.SchoolResources;
import yangtz.cs.liu.campus.domain.resources.SchoolResourcesDetails; import yangtz.cs.liu.campus.domain.resources.SchoolResourcesDetails;
import yangtz.cs.liu.campus.service.resources.ISchoolResourcesDetailsService; import yangtz.cs.liu.campus.service.resources.ISchoolResourcesDetailsService;
import yangtz.cs.liu.campus.service.resources.ISchoolResourcesService;
import yangtz.cs.liu.campus.vo.resource.SchoolResourcesDetailsVo; import yangtz.cs.liu.campus.vo.resource.SchoolResourcesDetailsVo;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Security;
import java.util.List; import java.util.List;
import java.util.Map;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
@RestController @RestController
@RequestMapping("/schoolResourcesDetails") @RequestMapping("/schoolResourcesDetails")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAtt/SchoolAttController.java
package yangtz.cs.liu.campus.controller.schoolAtt; package yangtz.cs.liu.campus.controller.schoolAtt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.area.SchoolArea;
import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt; import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttService; import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.vo.schoolAtt.SchoolAttVO; import yangtz.cs.liu.campus.vo.schoolAtt.SchoolAttVO;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAtt/SchoolAttMonController.java
package yangtz.cs.liu.campus.controller.schoolAtt; package yangtz.cs.liu.campus.controller.schoolAtt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAtt;
import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAttEa; import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAttEa;
import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAttMon; import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAttMon;
import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAttOt; import yangtz.cs.liu.campus.domain.schoolAtt.SchoolAttOt;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttEaService; import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttEaService;
import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttMonService; import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttMonService;
import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttOtService; import yangtz.cs.liu.campus.service.schoolAtt.ISchoolAttOtService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.vo.schoolAtt.SchoolAttVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolClass/SchoolClassMentorController.java
...@@ -8,21 +8,14 @@ import com.ruoyi.common.exception.ServiceException; ...@@ -8,21 +8,14 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.course.SchoolCourse;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.schoolCurriculum.SchoolCurriculum; import yangtz.cs.liu.campus.domain.schoolCurriculum.SchoolCurriculum;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.service.course.ISchoolCourseSerivice;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolCurriculum.ISchoolCurriculumService; import yangtz.cs.liu.campus.service.schoolCurriculum.ISchoolCurriculumService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo; import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo;
import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDcwj/SchoolDcwjController.java
...@@ -10,15 +10,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -10,15 +10,9 @@ import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -38,10 +32,8 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -38,10 +32,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.constant.DcwjType; import yangtz.cs.liu.campus.constant.DcwjType;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolDcwj.*; import yangtz.cs.liu.campus.domain.schoolDcwj.*;
import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDuty;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.mapper.schoolDcwj.SchoolDcwjPushMapper;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolDcwj.*; import yangtz.cs.liu.campus.service.schoolDcwj.*;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDcwj/SchoolDcwjNrController.java
package yangtz.cs.liu.campus.controller.schoolDcwj; package yangtz.cs.liu.campus.controller.schoolDcwj;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDcwj/SchoolDcwjRyController.java
...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolDcwj; ...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolDcwj;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDepartmentBudget/SchoolDepartmentBudgetController.java
...@@ -17,11 +17,8 @@ import org.activiti.engine.runtime.ProcessInstance; ...@@ -17,11 +17,8 @@ import org.activiti.engine.runtime.ProcessInstance;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.activiti.domain.HistoricActivity;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget; import yangtz.cs.liu.campus.domain.schoolDepartmentBudget.SchoolDepartmentBudget;
import yangtz.cs.liu.campus.domain.temp.DepartmentBudgetTemplate;
import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetService; import yangtz.cs.liu.campus.service.schoolDepartmentBudget.ISchoolDepartmentBudgetService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi; import yangtz.cs.liu.campus.util.VxTemlateSendApi;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDuty/SchoolDutyController.java
...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; ...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -28,7 +27,6 @@ import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDutyDetails; ...@@ -28,7 +27,6 @@ import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDutyDetails;
import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyDetailsService; import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyDetailsService;
import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyService; import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyService;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import static yangtz.cs.liu.campus.constant.DutyType.PUBLISHED; import static yangtz.cs.liu.campus.constant.DutyType.PUBLISHED;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDuty/SchoolDutyDetailsController.java
package yangtz.cs.liu.campus.controller.schoolDuty; package yangtz.cs.liu.campus.controller.schoolDuty;
import java.io.*;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
...@@ -37,11 +35,9 @@ import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDutyDetails; ...@@ -37,11 +35,9 @@ import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDutyDetails;
import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyDetailsService; import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyDetailsService;
import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyService; import yangtz.cs.liu.campus.service.schoolDuty.ISchoolDutyService;
import yangtz.cs.liu.campus.util.TemplateExcelUtils; import yangtz.cs.liu.campus.util.TemplateExcelUtils;
import yangtz.cs.liu.campus.util.WordUtils;
import yangtz.cs.liu.campus.vo.schoolDuty.*; import yangtz.cs.liu.campus.vo.schoolDuty.*;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull; import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static com.ruoyi.common.utils.StringUtils.isNull;
import static yangtz.cs.liu.campus.constant.DutyType.DORMITORYNUM; import static yangtz.cs.liu.campus.constant.DutyType.DORMITORYNUM;
import static yangtz.cs.liu.campus.constant.DutyType.GUARDNUM; import static yangtz.cs.liu.campus.constant.DutyType.GUARDNUM;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInfo/SchoolInfoAcquisitionController.java
...@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; ...@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -19,7 +17,6 @@ import yangtz.cs.liu.campus.domain.schoolInfo.SchoolInfoAcquisition; ...@@ -19,7 +17,6 @@ import yangtz.cs.liu.campus.domain.schoolInfo.SchoolInfoAcquisition;
import yangtz.cs.liu.campus.domain.schoolInfo.SchoolInfoDetail; import yangtz.cs.liu.campus.domain.schoolInfo.SchoolInfoDetail;
import yangtz.cs.liu.campus.service.schoolInfo.ISchoolInfoAcquisitionService; import yangtz.cs.liu.campus.service.schoolInfo.ISchoolInfoAcquisitionService;
import yangtz.cs.liu.campus.service.schoolInfo.ISchoolInfoDetailService; import yangtz.cs.liu.campus.service.schoolInfo.ISchoolInfoDetailService;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolInstrumentClassifyController.java
...@@ -5,13 +5,11 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -5,13 +5,11 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentClassify; import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentClassify;
import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentClassifyService; import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentClassifyService;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolInstrumentDetailController.java
...@@ -6,14 +6,12 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -6,14 +6,12 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentDetail; import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentDetail;
import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentDetailService; import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentDetailService;
import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentDetailVo; import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentDetailVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolTeacherBorrowController.java
package yangtz.cs.liu.campus.controller.schoolInstrument; package yangtz.cs.liu.campus.controller.schoolInstrument;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrument;
import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolTeacherBorrow;
import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentService; import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentService;
import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolTeacherBorrowService; import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolTeacherBorrowService;
import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentVo; import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentVo;
import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolTeacherBorrowVo; import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolTeacherBorrowVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolExperimentPlanController.java
package yangtz.cs.liu.campus.controller.schoolLab; package yangtz.cs.liu.campus.controller.schoolLab;
import java.text.DecimalFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
...@@ -8,8 +7,6 @@ import java.util.List; ...@@ -8,8 +7,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
...@@ -20,7 +17,6 @@ import com.ruoyi.common.annotation.Log; ...@@ -20,7 +17,6 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolLabClassYearController.java
...@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -25,23 +24,17 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -25,23 +24,17 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlan;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear; import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYearRelation; import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYearRelation;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.mapper.schoolLab.SchoolLabClassYearRelationMapper;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearRelationService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearRelationService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabVo;
/** /**
* 年级实验室预约Controller * 年级实验室预约Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolLabCompetitionController.java
...@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -17,7 +16,6 @@ import com.ruoyi.common.annotation.Log; ...@@ -17,7 +16,6 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabCompetition;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabCompetitionService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabCompetitionService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolTeacherExperimentApplyController.java
...@@ -3,18 +3,15 @@ package yangtz.cs.liu.campus.controller.schoolLab; ...@@ -3,18 +3,15 @@ package yangtz.cs.liu.campus.controller.schoolLab;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -24,17 +21,13 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -24,17 +21,13 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory; import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYearRelation;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs; import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs;
import yangtz.cs.liu.campus.service.accessory.IAccessoryService; import yangtz.cs.liu.campus.service.accessory.IAccessoryService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.service.schoolLab.ISchoollTeacherExperimentApplyLabsService; import yangtz.cs.liu.campus.service.schoolLab.ISchoollTeacherExperimentApplyLabsService;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherExperimentApplyVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherExperimentApplyVo;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolTeacherLabApplyController.java
...@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolGkAchievementController.java
...@@ -3,8 +3,9 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -3,8 +3,9 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -48,6 +49,19 @@ public class SchoolGkAchievementController extends BaseController ...@@ -48,6 +49,19 @@ public class SchoolGkAchievementController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/**
* 老师个人页面列表
*/
@GetMapping("/teacher/list")
public TableDataInfo teacherList(SchoolGkAchievement schoolGkAchievement){
startPage();
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievement);
return getDataTable(list);
}
/** /**
* 获取高考成绩详细信息 * 获取高考成绩详细信息
*/ */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -2,20 +2,24 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,20 +2,24 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.itextpdf.text.*;
import com.itextpdf.text.pdf.BaseFont;
import com.itextpdf.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.pdf.PDFUtil;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.impl.SysDictDataServiceImpl;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
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.impl.teacherFiles.IdCardNumberUtils;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
...@@ -38,6 +42,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -38,6 +42,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
@Autowired @Autowired
private SchoolTeacherBasichlnformationService basichlnformationService; private SchoolTeacherBasichlnformationService basichlnformationService;
@Autowired
private SysDictDataServiceImpl sysDictDataService;
/** /**
* 获取老师基本信息列表 * 获取老师基本信息列表
...@@ -251,8 +257,219 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -251,8 +257,219 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
return AjaxResult.success(basichlnformationService.importTeacherPicture(file)); return AjaxResult.success(basichlnformationService.importTeacherPicture(file));
} }
/**
* 综合查询
*/
@GetMapping("/comprehensive")
public AjaxResult comprehensive(ComprehensiveReq req) throws Exception{
ComperhensiveVo comprehensive = basichlnformationService.comprehensive(req);
return AjaxResult.success(comprehensive);
}
/**
* pdf导出
*/
@PostMapping("/exportPDF")
public void exportPdf(HttpServletResponse response,ComprehensiveReq req) throws Exception{
ComperhensiveVo comprehensive = basichlnformationService.comprehensive(req);
SchoolTeacherBasicInformationVo basicInformation = comprehensive.getBasicInformation();
try {
//创建文档
Document document = PDFUtil.createDocument();
//通过文档获取输出流
ByteArrayOutputStream outStream = PDFUtil.getOutStream(document);
//打开文档，准备后续添加内容
document.open();
//设置基础字体格式
BaseFont baseFont = PDFUtil.getBaseFont(PDFUtil.FONT_SONG, PDFUtil.BASE_FONT_CHINESE_ENCODING, Boolean.FALSE);
//设置标题
Chunk chunk = PDFUtil.getChunk("教师个人信息汇总", PDFUtil.getFont(baseFont, 20, Font.NORMAL));
Paragraph titleParagraph = PDFUtil.getParagraph(chunk, Element.ALIGN_CENTER, 20, null);
document.add(titleParagraph);
//创建表格(具体样式需要根据生成的PDF去调整)
PdfPTable pdfPTable = PDFUtil.getPdfPTable(8, 100, 1500);
Chunk qtchunk = PDFUtil.getChunk("教师基本信息", PDFUtil.getFont(baseFont, 10, Font.NORMAL));
Paragraph qtParagraph = PDFUtil.getParagraph(qtchunk, Element.ALIGN_LEFT, 0, null);
document.add(qtParagraph);
//创建单元格对象
PdfPCell pdfCell = PDFUtil.getPdfCell(null, Element.ALIGN_CENTER, Element.ALIGN_MIDDLE, null, Boolean.TRUE);
//此后代码开始设置值，会自动渲染到表格中，无需考虑换行问题
//设置单元格字体样式
Font cellFont = PDFUtil.getFont(baseFont, 8, Font.NORMAL);
cellFont.setStyle(Font.BOLD);
Font cellcoentFont = PDFUtil.getFont(baseFont, 7, Font.NORMAL);
//第一行
PDFUtil.addPdfPTitleCell("姓名", cellFont, pdfCell, pdfPTable, 20);
//合并第一行2-4个单元格
PDFUtil.addPdfPCell(basicInformation.getName(), cellcoentFont, pdfCell, pdfPTable, 20);
//第二行
PDFUtil.addPdfPTitleCell("性别", cellFont, pdfCell, pdfPTable, 20);
//合并第二行2-4单元格
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sys_user_sex",basicInformation.getSex()), cellcoentFont, pdfCell, pdfPTable, 20);
//第三行
PDFUtil.addPdfPTitleCell("年龄", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getAge().toString(), cellcoentFont, pdfCell, pdfPTable, 20);
Image img = Image.getInstance(basicInformation.getPhotoUrl());
Font sonTitleFont = PDFUtil.getFont(baseFont, 11, Font.BOLD);
PdfPCell nameplateCell = PDFUtil.getColSpanPdfCell(PDFUtil.getPhrase(" 照片 ", sonTitleFont),
Element.ALIGN_CENTER, Element.ALIGN_MIDDLE, 15, Boolean.TRUE, 2,6);
img.scaleToFit(135f, 1000);
nameplateCell.setImage(img);
pdfPTable.addCell(nameplateCell);
PDFUtil.addPdfPTitleCell("出生年月", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getBirthDate(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("籍贯", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getHometown(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("民族", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getNation(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("身份证号", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getIdCard(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("档案出生年月", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell( isNotString(basicInformation.getFileBirthDate()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("政治面貌", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("politics_tatusls",basicInformation.getPoliticalLandscape()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("入党时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getPartyMembershipTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("任教学科", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",basicInformation.getTeachingSubject()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_professional",basicInformation.getCurrentProfessionalTitle()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称取得资格时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getCurrentProfessionalTitleTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现聘职称", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_professional",basicInformation.getCurrentHiringProfessionalTitle()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称聘任时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getCurrentHiringProfessionalTitleTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现聘岗位", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_position",basicInformation.getCurrentPosition()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现岗位等级", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_joblevel",basicInformation.getCurrentJobLevel()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现岗位等级聘任时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getCurrentJobLevelAppointmentTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("职务", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getDuties(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("教师资格种类", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getTeacherQualificationType(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("教师资格证号码", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getTeacherQualificationCertificateNum(), cellcoentFont, pdfCell, pdfPTable, 20);
//import java.util.Map.Entry;
PDFUtil.addPdfPTitleCell("参加工作时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getWorkingHours(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("到二中工作时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getToSecondMiddleSchoolTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("二中工作年龄", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getToSecondAge().toString(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("教龄起算时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getLengthOfTeacherTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("工龄起算时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getLengthOfTeacherTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("工龄年限", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getSeniority().toString(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("在岗情况", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_situation",basicInformation.getOnDutySituation()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("在编情况", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_situation",basicInformation.getCurrentSituation()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业学院1", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution1(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("专业1", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getMajor1(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业时间1", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getGraduationTime1()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业学院2", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution2(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("专业2", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getMajor2(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业时间2", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getGraduationTime2()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业学院3", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution3(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("专业3", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getMajor3(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业时间3", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getGraduationTime3()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("第一学历", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getFirstDegree(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("最后学历", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getLastDegree(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("学位", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getDegree(), cellcoentFont, pdfCell, pdfPTable, 20);
//2.表格 工作量信息
//3.表格 班主任任职
//4.表格 专业成长
//5.表格 年度考核
//6.表格 教学成绩
//7.表格 高考成绩
//将表格添加至文中
document.add(pdfPTable);
//导出
PDFUtil.exportPDF(document, response, outStream);
}catch (Exception e){
e.printStackTrace();
}
}
private String isNotString(Object str){
String s = String.valueOf(str);
if (s.equals("null")){
return "";
}else {
return s;
}
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
...@@ -4,7 +4,6 @@ import java.util.List; ...@@ -4,7 +4,6 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
...@@ -4,7 +4,6 @@ import java.util.List; ...@@ -4,7 +4,6 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
...@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java
...@@ -25,7 +25,6 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -25,7 +25,6 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteamAwardController.java
...@@ -2,7 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,7 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -74,6 +75,8 @@ public class SchoolXteamAwardController extends BaseController ...@@ -74,6 +75,8 @@ public class SchoolXteamAwardController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SchoolXteamAward schoolXteamAward) public AjaxResult add(@RequestBody SchoolXteamAward schoolXteamAward)
{ {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
schoolXteamAward.setCreateBy(userId.toString());
return toAjax(schoolXteamAwardService.insertSchoolXteamAward(schoolXteamAward)); return toAjax(schoolXteamAwardService.insertSchoolXteamAward(schoolXteamAward));
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolRewardsPunishments/SchoolScAwardsController.java
package yangtz.cs.liu.campus.controller.schoolRewardsPunishments; package yangtz.cs.liu.campus.controller.schoolRewardsPunishments;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolRewardsPunishments/SchoolScDisciplineController.java
...@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -21,7 +20,6 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -21,7 +20,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScAwards;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline; import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScDisciplineService; import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScDisciplineService;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVehicleInOutController.java
...@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.SecurityUtils; ...@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVehicleInOut;
import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVehicleInOutService; import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVehicleInOutService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVideoConsultController.java
...@@ -15,7 +15,6 @@ import com.ruoyi.common.annotation.Log; ...@@ -15,7 +15,6 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVideoConsult;
import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVideoConsultService; import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVideoConsultService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVideoConsultExternalController.java
...@@ -8,7 +8,6 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -8,7 +8,6 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVideoConsultExternal;
import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVideoConsultExternalService; import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVideoConsultExternalService;
import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVideoConsultExternalVo; import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVideoConsultExternalVo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolbudget/SchoolBudgetController.java
package yangtz.cs.liu.campus.controller.schoolbudget; package yangtz.cs.liu.campus.controller.schoolbudget;
import java.io.IOException;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -8,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -8,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolcalendar/SchoolCalendarController.java
...@@ -4,17 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,17 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; 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.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.controller.patrol.SchoolPatrolController;
import yangtz.cs.liu.campus.domain.schoolcalendar.SchoolCalendar; import yangtz.cs.liu.campus.domain.schoolcalendar.SchoolCalendar;
import yangtz.cs.liu.campus.domain.schoolcalendar.SchoolCalendarDetail; import yangtz.cs.liu.campus.domain.schoolcalendar.SchoolCalendarDetail;
import yangtz.cs.liu.campus.domain.schoolcalendar.SchoolCalendarSelecter; import yangtz.cs.liu.campus.domain.schoolcalendar.SchoolCalendarSelecter;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolcalendar/SchoolCalendarDetailController.java
...@@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolexam/SchoolExamController.java
...@@ -21,15 +21,11 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -21,15 +21,11 @@ import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolexam.SchoolExam; import yangtz.cs.liu.campus.domain.schoolexam.SchoolExam;
import yangtz.cs.liu.campus.domain.schoolexam.SchoolExamDetail; import yangtz.cs.liu.campus.domain.schoolexam.SchoolExamDetail;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolexam.ISchoolExamDetailService; import yangtz.cs.liu.campus.service.schoolexam.ISchoolExamDetailService;
import yangtz.cs.liu.campus.service.schoolexam.ISchoolExamService; import yangtz.cs.liu.campus.service.schoolexam.ISchoolExamService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService;
import java.util.List;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank; import java.util.List;
/** /**
* 学校考试信息Controller * 学校考试信息Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolgrade/SchoolGradeController.java
package yangtz.cs.liu.campus.controller.schoolgrade; package yangtz.cs.liu.campus.controller.schoolgrade;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
...@@ -13,27 +11,19 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -13,27 +11,19 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.controller.patrol.SchoolPatrolController;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.vo.schoolgrade.GradeTreeSelect; import yangtz.cs.liu.campus.vo.schoolgrade.GradeTreeSelect;
import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.ruoyi.common.utils.StringUtils.isNull;
import static yangtz.cs.liu.campus.constant.EmployeeType.EMPLOYEE;
import static yangtz.cs.liu.campus.constant.EmployeeType.TEACH;
import static yangtz.cs.liu.campus.constant.GradeConstant.NEWTERM; import static yangtz.cs.liu.campus.constant.GradeConstant.NEWTERM;
import static yangtz.cs.liu.campus.constant.GradeConstant.UNNEW; import static yangtz.cs.liu.campus.constant.GradeConstant.UNNEW;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolgrade/SchoolGradeMentorController.java
...@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,7 +18,6 @@ import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; ...@@ -20,7 +18,6 @@ import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo; import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@RestController @RestController
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolEducationDetailsController.java
...@@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.student.SchoolEducationDetails; import yangtz.cs.liu.campus.domain.student.SchoolEducationDetails;
import yangtz.cs.liu.campus.domain.student.SchoolStudentEvaluate;
import yangtz.cs.liu.campus.service.student.ISchoolEducationDetailsService; import yangtz.cs.liu.campus.service.student.ISchoolEducationDetailsService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolEducationRuleController.java
package yangtz.cs.liu.campus.controller.student; package yangtz.cs.liu.campus.controller.student;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
...@@ -13,8 +12,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -13,8 +12,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.student.SchoolEducationRule; import yangtz.cs.liu.campus.domain.student.SchoolEducationRule;
import yangtz.cs.liu.campus.domain.student.SchoolEducationRuleDetails; import yangtz.cs.liu.campus.domain.student.SchoolEducationRuleDetails;
import yangtz.cs.liu.campus.domain.student.SchoolStudentEvaluate;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.service.student.ISchoolEducationRuleDetailsService; import yangtz.cs.liu.campus.service.student.ISchoolEducationRuleDetailsService;
import yangtz.cs.liu.campus.service.student.ISchoolEducationRuleService; import yangtz.cs.liu.campus.service.student.ISchoolEducationRuleService;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolEducationRuleDetailsController.java
package yangtz.cs.liu.campus.controller.student; package yangtz.cs.liu.campus.controller.student;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
...@@ -11,7 +10,6 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -11,7 +10,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.student.SchoolEducationRuleDetails; import yangtz.cs.liu.campus.domain.student.SchoolEducationRuleDetails;
import yangtz.cs.liu.campus.domain.student.SchoolStudentEvaluate;
import yangtz.cs.liu.campus.service.student.ISchoolEducationRuleDetailsService; import yangtz.cs.liu.campus.service.student.ISchoolEducationRuleDetailsService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolStudentController.java
...@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
import static yangtz.cs.liu.campus.constant.TurnoverConstant.BJ; import static yangtz.cs.liu.campus.constant.TurnoverConstant.BJ;
import static yangtz.cs.liu.campus.constant.TurnoverConstant.YTJ; import static yangtz.cs.liu.campus.constant.TurnoverConstant.YTJ;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolStudentLeaveController.java
package yangtz.cs.liu.campus.controller.student; package yangtz.cs.liu.campus.controller.student;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.utils.HolidayDateUtil;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
...@@ -16,22 +14,16 @@ import org.activiti.engine.TaskService; ...@@ -16,22 +14,16 @@ import org.activiti.engine.TaskService;
import org.activiti.engine.impl.persistence.entity.TaskEntityImpl; import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task; import org.activiti.engine.task.Task;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.activiti.domain.HistoricActivity;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.domain.student.SchoolStudentLeave; import yangtz.cs.liu.campus.domain.student.SchoolStudentLeave;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
...@@ -42,10 +34,6 @@ import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; ...@@ -42,10 +34,6 @@ import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi; import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO; import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.campus.vo.student.StudentLeaveVO; import yangtz.cs.liu.campus.vo.student.StudentLeaveVO;
import yangtz.cs.liu.wechat.domain.TemplateInfo;
import yangtz.cs.liu.wechat.domain.template.LeaveStateTemplate;
import yangtz.cs.liu.wechat.domain.template.LeaveTemplate;
import yangtz.cs.liu.wechat.domain.template.StudentLeaveTemplate;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import yangtz.cs.liu.wechat.utils.DateUtil; import yangtz.cs.liu.wechat.utils.DateUtil;
...@@ -57,7 +45,6 @@ import java.util.stream.Collectors; ...@@ -57,7 +45,6 @@ import java.util.stream.Collectors;
import static com.core.constant.ProcessDefinition.*; import static com.core.constant.ProcessDefinition.*;
import static yangtz.cs.liu.campus.constant.ProcessState.*; import static yangtz.cs.liu.campus.constant.ProcessState.*;
import static yangtz.cs.liu.campus.constant.ProcessState.XIAOJIA; import static yangtz.cs.liu.campus.constant.ProcessState.XIAOJIA;
import static yangtz.cs.liu.campus.constant.SumbitType.SUMBIT;
/** /**
* 学生请假Controller * 学生请假Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/student/SchoolStudentParentController.java
...@@ -3,13 +3,10 @@ package yangtz.cs.liu.campus.controller.student; ...@@ -3,13 +3,10 @@ package yangtz.cs.liu.campus.controller.student;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -24,8 +21,6 @@ import java.util.ArrayList; ...@@ -24,8 +21,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static yangtz.cs.liu.campus.constant.UserType.PARENT;
/** /**
* 学校学生父母信息Controller * 学校学生父母信息Controller
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/studentChange/StudentInfoChangeController.java
...@@ -12,7 +12,6 @@ import com.ruoyi.common.utils.DateUtils; ...@@ -12,7 +12,6 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.FileUtils;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -22,7 +21,6 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -22,7 +21,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.file.PubFile;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.domain.studentChange.StudentInfoChange; import yangtz.cs.liu.campus.domain.studentChange.StudentInfoChange;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/studentStatus/StudentStatusController.java
...@@ -4,22 +4,16 @@ import cn.afterturn.easypoi.entity.ImageEntity; ...@@ -4,22 +4,16 @@ import cn.afterturn.easypoi.entity.ImageEntity;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.afterturn.easypoi.word.WordExportUtil; import cn.afterturn.easypoi.word.WordExportUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.ImageUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -32,18 +26,12 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentService; ...@@ -32,18 +26,12 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.service.studentTurnover.IStudentTurnoverService; import yangtz.cs.liu.campus.service.studentTurnover.IStudentTurnoverService;
import yangtz.cs.liu.campus.util.TemplateExcelUtils; import yangtz.cs.liu.campus.util.TemplateExcelUtils;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO; import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.wechat.domain.Image;
import yangtz.cs.liu.wechat.vo.userInfo.UserInfoVo;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.stream.FileImageOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.net.URLEncoder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/studentTurnover/StudentTurnoverController.java
package yangtz.cs.liu.campus.controller.studentTurnover; package yangtz.cs.liu.campus.controller.studentTurnover;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -9,17 +8,13 @@ import javax.servlet.http.HttpServletResponse; ...@@ -9,17 +8,13 @@ import javax.servlet.http.HttpServletResponse;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.StringUtils;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
...@@ -31,14 +26,11 @@ import com.ruoyi.common.utils.poi.ExcelUtil; ...@@ -31,14 +26,11 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.domain.studentChange.StudentInfoChange;
import yangtz.cs.liu.campus.domain.studentTurnover.StudentTurnover; import yangtz.cs.liu.campus.domain.studentTurnover.StudentTurnover;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.service.studentTurnover.IStudentTurnoverService; import yangtz.cs.liu.campus.service.studentTurnover.IStudentTurnoverService;
import yangtz.cs.liu.campus.util.TemplateExcelUtils; import yangtz.cs.liu.campus.util.TemplateExcelUtils;
import yangtz.cs.liu.campus.vo.schoolDuty.DownVacation;
import yangtz.cs.liu.campus.vo.studentTurnover.TurnoverVo;
import static yangtz.cs.liu.campus.constant.TurnoverConstant.*; import static yangtz.cs.liu.campus.constant.TurnoverConstant.*;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherAwardController.java
...@@ -8,13 +8,10 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -8,13 +8,10 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherAward; import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherAward;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherAwardService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherAwardService;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherAwardVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherController.java
package yangtz.cs.liu.campus.controller.teacher; package yangtz.cs.liu.campus.controller.teacher;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -25,7 +24,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -25,7 +24,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import yangtz.cs.liu.campus.domain.message.SchoolMessagePush;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
...@@ -33,11 +31,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -33,11 +31,6 @@ import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static yangtz.cs.liu.campus.constant.SexConstant.MAN;
import static yangtz.cs.liu.campus.constant.UserType.TEACHER;
/** /**
* 学校老师Controller * 学校老师Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherDutyController.java
...@@ -6,14 +6,11 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -6,14 +6,11 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherDuty; import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherDuty;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherDutyService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherDutyService;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherDutyVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherDutyVO;
import yangtz.cs.liu.campus.vo.teacher.TeacherDutyMap;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherLeaveController.java
...@@ -2,14 +2,10 @@ package yangtz.cs.liu.campus.controller.teacher; ...@@ -2,14 +2,10 @@ package yangtz.cs.liu.campus.controller.teacher;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.utils.HolidayDateUtil; import com.core.utils.HolidayDateUtil;
import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -18,35 +14,25 @@ import com.ruoyi.system.service.ISysDeptService; ...@@ -18,35 +14,25 @@ import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService; import org.activiti.engine.TaskService;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.impl.persistence.entity.TaskEntityImpl; import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task; import org.activiti.engine.task.Task;
import org.activiti.spring.integration.Activiti;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.activiti.domain.HistoricActivity;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave; import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave;
import yangtz.cs.liu.campus.domain.temp.LeaveResultTemplate;
import yangtz.cs.liu.campus.domain.temp.TeacherLeaveTemplate;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherLeaveService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.service.workDay.ISchoolWorkDayService; import yangtz.cs.liu.campus.service.workDay.ISchoolWorkDayService;
import yangtz.cs.liu.campus.util.VxTemlateSendApi; import yangtz.cs.liu.campus.util.VxTemlateSendApi;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherLeaveVO;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO; import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
import yangtz.cs.liu.dingding.utils.DingMessageUtils; import yangtz.cs.liu.dingding.utils.DingMessageUtils;
import yangtz.cs.liu.dingding.vo.DingMessageVo;
import yangtz.cs.liu.wechat.domain.template.LeaveStateTemplate;
import yangtz.cs.liu.wechat.domain.template.LeaveTemplate;
import yangtz.cs.liu.wechat.service.api.IWxApiService; import yangtz.cs.liu.wechat.service.api.IWxApiService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -54,11 +40,9 @@ import java.text.SimpleDateFormat; ...@@ -54,11 +40,9 @@ import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import static com.core.constant.ProcessDefinition.TEACHERLEAVE; import static com.core.constant.ProcessDefinition.TEACHERLEAVE;
import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
import static yangtz.cs.liu.campus.constant.EmployeeType.TEACH; import static yangtz.cs.liu.campus.constant.EmployeeType.TEACH;
import static yangtz.cs.liu.campus.constant.GradeConstant.*; import static yangtz.cs.liu.campus.constant.GradeConstant.*;
import static yangtz.cs.liu.campus.constant.ProcessState.*; import static yangtz.cs.liu.campus.constant.ProcessState.*;
import static yangtz.cs.liu.campus.constant.WorkTime.*;
/** /**
* 学校老师请假Controller * 学校老师请假Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherOvertimeController.java
package yangtz.cs.liu.campus.controller.teacher; package yangtz.cs.liu.campus.controller.teacher;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.domain.PageBaseInfo;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -14,19 +11,13 @@ import com.ruoyi.common.utils.DateUtils; ...@@ -14,19 +11,13 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase;
import yangtz.cs.liu.campus.domain.student.SchoolStudentLeave;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherOvertime; import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherOvertime;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherOvertimeService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherOvertimeService;
import yangtz.cs.liu.campus.vo.office.OfficeTodoListVO;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherOvertimeVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherOvertimeVO;
import yangtz.cs.liu.campus.vo.teacher.TeacherLeaveVO;
import yangtz.cs.liu.campus.vo.teacher.TeacherOvertimeVO; import yangtz.cs.liu.campus.vo.teacher.TeacherOvertimeVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherResumeController.java
...@@ -16,9 +16,6 @@ import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherResumeService; ...@@ -16,9 +16,6 @@ import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherResumeService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
/** /**
* 学校老师履历Controller * 学校老师履历Controller
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherWagesController.java
package yangtz.cs.liu.campus.controller.teacher; package yangtz.cs.liu.campus.controller.teacher;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
...@@ -11,11 +10,8 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -11,11 +10,8 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherResume;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherWages; import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherWages;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherWagesService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherWagesService;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.campus.vo.student.SchoolTeacherWagesVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
package yangtz.cs.liu.campus.controller.teacherFiles; package yangtz.cs.liu.campus.controller.teacherFiles;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -10,15 +9,12 @@ import com.ruoyi.common.utils.poi.ExcelUtil; ...@@ -10,15 +9,12 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.controller.A;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService; import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 教师档案Controller * 教师档案Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
...@@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -14,7 +13,6 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal; ...@@ -14,7 +13,6 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import yangtz.cs.liu.campus.service.impl.teacherFiles.TeacherFilesExcelUtil; import yangtz.cs.liu.campus.service.impl.teacherFiles.TeacherFilesExcelUtil;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService; import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll; import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/thesis/ThesisController.java
...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.thesis; ...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.thesis;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/time/SchoolTimeDetailController.java
...@@ -14,14 +14,11 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -14,14 +14,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.controller.exam.ExamDetailController;
import yangtz.cs.liu.campus.domain.time.SchoolTime;
import yangtz.cs.liu.campus.domain.time.SchoolTimeDetail; import yangtz.cs.liu.campus.domain.time.SchoolTimeDetail;
import yangtz.cs.liu.campus.service.time.ISchoolTimeDetailService; import yangtz.cs.liu.campus.service.time.ISchoolTimeDetailService;
import yangtz.cs.liu.campus.vo.time.SchoolTimeDetailVO; import yangtz.cs.liu.campus.vo.time.SchoolTimeDetailVO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/time/SchoolTimeTableController.java
...@@ -17,7 +17,6 @@ import yangtz.cs.liu.campus.domain.time.SchoolSchedule; ...@@ -17,7 +17,6 @@ import yangtz.cs.liu.campus.domain.time.SchoolSchedule;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.time.ISchoolTimeTableService; import yangtz.cs.liu.campus.service.time.ISchoolTimeTableService;
import yangtz.cs.liu.campus.domain.time.SchoolTimeTable; import yangtz.cs.liu.campus.domain.time.SchoolTimeTable;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.campus.vo.time.*; import yangtz.cs.liu.campus.vo.time.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -26,7 +25,6 @@ import java.util.ArrayList; ...@@ -26,7 +25,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static yangtz.cs.liu.campus.constant.EmployeeType.EMPLOYEE;
/** /**
* 学校时间表 * 学校时间表
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/training/TrainingController.java
...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.training; ...@@ -2,7 +2,7 @@ package yangtz.cs.liu.campus.controller.training;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/vehicle/SchoolVehicleApplicationController.java
package yangtz.cs.liu.campus.controller.vehicle; package yangtz.cs.liu.campus.controller.vehicle;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -23,21 +15,10 @@ import org.springframework.web.bind.annotation.*; ...@@ -23,21 +15,10 @@ import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase;
import yangtz.cs.liu.campus.domain.vehicle.SchoolVehicleApplication; import yangtz.cs.liu.campus.domain.vehicle.SchoolVehicleApplication;
import yangtz.cs.liu.campus.service.vehicle.ISchoolVehicleApplicationService; import yangtz.cs.liu.campus.service.vehicle.ISchoolVehicleApplicationService;
import yangtz.cs.liu.campus.vo.office.OfficeTodoListVO;
import yangtz.cs.liu.campus.vo.vehicle.VehicleApplicationVO; import yangtz.cs.liu.campus.vo.vehicle.VehicleApplicationVO;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
import static com.core.constant.ProcessCommon.ROLEKEY;
import static com.core.constant.ProcessDefinition.OFFICEPURCHASE;
import static com.core.constant.ProcessDefinition.VEHICLEAPPLICATION;
import static yangtz.cs.liu.campus.constant.ProcessState.PASS;
import static yangtz.cs.liu.campus.constant.ProcessState.REFUSE;
/** /**
* 用车申请Controller * 用车申请Controller
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/vehicle/SchoolVehicleController.java
package yangtz.cs.liu.campus.controller.vehicle; package yangtz.cs.liu.campus.controller.vehicle;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -29,10 +26,6 @@ import yangtz.cs.liu.campus.domain.vehicle.SchoolVehicleApplication; ...@@ -29,10 +26,6 @@ import yangtz.cs.liu.campus.domain.vehicle.SchoolVehicleApplication;
import yangtz.cs.liu.campus.service.vehicle.ISchoolVehicleApplicationService; import yangtz.cs.liu.campus.service.vehicle.ISchoolVehicleApplicationService;
import yangtz.cs.liu.campus.service.vehicle.ISchoolVehicleService; import yangtz.cs.liu.campus.service.vehicle.ISchoolVehicleService;
import yangtz.cs.liu.campus.vo.vehicle.SchoolVehicleVO; import yangtz.cs.liu.campus.vo.vehicle.SchoolVehicleVO;
import yangtz.cs.liu.campus.vo.vehicle.VehicleLicenseVO;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
/** /**
* 车辆信息Controller * 车辆信息Controller
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/ComperhensiveVo.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import lombok.Data;
import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import java.util.List;
/**
* 综合查询对象返回集合
*/
@Data
public class ComperhensiveVo {
/**
* 教师个人信息
*/
private SchoolTeacherBasicInformationVo basicInformation;
/**
*工作量信息
*/
private List<SchoolAworkloadVo> schoolAworkload;
/**
* 班主任任职
*/
private List<SchoolAclassTeacherAssessmentVo> schoolAclassTeacherAssessments;
/**
* 年度考核
*/
private List<SchoolAnnualAssessment> schoolAnnualAssessment;
/**
* 教学成绩
*/
private List<SchoolXteachingAchievementsVo> schoolXteachingAchievements;
/**
* 高考成绩
*/
private List<SchoolGkAchievementVo> schoolGkAchievement;
/**
* 辅导教师获奖
*/
private List<FudaoTeacherVo> fudaoTeacher;
/**
* 辅导学生获奖
*/
private List<FudaoStudentVo> fudaoStudent;
/**
* 专业成绩
*/
private List<SpecialityVo> specialityVos;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/ComprehensiveReq.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import lombok.Data;
/**
* 综合查询
*/
@Data
public class ComprehensiveReq {
/**
* 姓名
*/
private String name;
/**
* 身份证号
*/
private String idCard;
/**
* 用户id
*/
private Long userId;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentReq.java
...@@ -28,6 +28,10 @@ public class SchoolAclassTeacherAssessmentReq extends BaseEntity ...@@ -28,6 +28,10 @@ public class SchoolAclassTeacherAssessmentReq extends BaseEntity
/** 学年(下拉框) */ /** 学年(下拉框) */
private String schoolYear; private String schoolYear;
/** 身份证号 */
private String idCard;
/** 届别(下拉框) */ /** 届别(下拉框) */
private String year; private String year;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java
...@@ -77,4 +77,6 @@ public class SchoolAworkload extends BaseEntity ...@@ -77,4 +77,6 @@ public class SchoolAworkload extends BaseEntity
/**合计*/ /**合计*/
private Long amountTo; private Long amountTo;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolGkAchievement.java
...@@ -3,7 +3,6 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn; ...@@ -3,7 +3,6 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
...@@ -33,6 +32,9 @@ public class SchoolGkAchievement extends BaseEntity ...@@ -33,6 +32,9 @@ public class SchoolGkAchievement extends BaseEntity
@Excel(name = "教师姓名") @Excel(name = "教师姓名")
private String teacherName; private String teacherName;
/**老师id**/
private Long userId;
/** 授课班级 */ /** 授课班级 */
@Excel(name = "授课班级",dictType = "class_num") @Excel(name = "授课班级",dictType = "class_num")
private String teachingClassName; private String teachingClassName;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolGkAchievementVo.java
...@@ -51,6 +51,10 @@ public class SchoolGkAchievementVo extends BaseEntity ...@@ -51,6 +51,10 @@ public class SchoolGkAchievementVo extends BaseEntity
/** 其他 */ /** 其他 */
private String other; private String other;
/**
* 审核状态
*/
private String auditState;
/** 删除状态 */ /** 删除状态 */
private String delFlag; private String delFlag;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
...@@ -149,7 +149,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity { ...@@ -149,7 +149,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
private Date toSecondMiddleSchoolTime; private Date toSecondMiddleSchoolTime;
/** /**
* 二中工作年龄 * 二中工作年龄
*/ */
private Integer toSecondAge; private Integer toSecondAge;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteamAwardVo.java
...@@ -40,6 +40,8 @@ public class SchoolXteamAwardVo extends BaseEntity ...@@ -40,6 +40,8 @@ public class SchoolXteamAwardVo extends BaseEntity
/** 团队成员贡献情况 */ /** 团队成员贡献情况 */
private String teamMembersContribution; private String teamMembersContribution;
/** 审核状态（0未提交，1审核中，2同意，3驳回） */
private String auditState;
/** 删除状态 */ /** 删除状态 */
private String delFlag; private String delFlag;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SpecialityVo.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* 专业信息包含
*4.3 综合荣誉...
* 4.4 教师获奖
* 4.5 讲课获奖
* 4.6 论文论著
* 4.7课题研究
*/
@Data
public class SpecialityVo {
/** 成长类型 */
private String growthType;
/** 学科 */
private String sub;
//获奖类别
private String awardtype;
//获奖等级
private String awardlevel;
//获奖级别
private String awardrank;
/** 成果名称 */
private String resultName;
/** 获奖人id */
private Long userId;
/** 获奖人 */
private String userName;
/** 主办单位 */
private String org;
/** 获奖时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date awardTime;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -3,6 +3,8 @@ package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn; ...@@ -3,6 +3,8 @@ package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -10,6 +12,8 @@ import com.ruoyi.common.utils.UnPackeUtil; ...@@ -10,6 +12,8 @@ import com.ruoyi.common.utils.UnPackeUtil;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.AllArgsConstructor;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
...@@ -17,17 +21,29 @@ import org.apache.poi.ss.usermodel.CellType; ...@@ -17,17 +21,29 @@ import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation; import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo; import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationMapper; import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationMapper;
import yangtz.cs.liu.campus.service.impl.fudao.FudaoStudentImpl;
import yangtz.cs.liu.campus.service.impl.fudao.FudaoTeacherImpl;
import yangtz.cs.liu.campus.service.impl.schoolAnnualAssessment.SchoolAnnualAssessmentServiceImpl;
import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils; import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import java.io.*; import java.io.*;
import java.text.ParseException; import java.text.ParseException;
...@@ -816,10 +832,154 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -816,10 +832,154 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
String substring = workingHours.substring(1, workingHours.length()); String substring = workingHours.substring(1, workingHours.length());
information.setWorkingHours(substring); information.setWorkingHours(substring);
} }
}
@Autowired
SchoolAworkloadServiceImpl schoolAworkloadService;
} @Autowired
SchoolAclassTeacherAssessmentServiceImpl schoolAclassTeacherAssessmentService;
@Autowired
SchoolGkAchievementServiceImpl schoolGkAchievementService;
@Autowired
ISysUserService sysUserService;
@Autowired
SchoolXteachingAchievementsServiceImpl schoolXteachingAchievementsService;
@Autowired
SchoolXteacherAwardsServiceImpl schoolXteacherAwardsService;
@Autowired
SchoolXlectureAwardsServiceImpl schoolXlectureAwardsService;
@Autowired
SchoolXacademicWorksServiceImpl schoolXacademicWorksService;
@Autowired
FudaoTeacherImpl fudaoTeacherimpl;
@Autowired
FudaoStudentImpl fudaoStudentImpl;
@Autowired
SchoolAnnualAssessmentServiceImpl schoolAnnualAssessmentService;
/**
* 综合信息查询
* @param req
* @return
*/
@Override
public ComperhensiveVo comprehensive(ComprehensiveReq req) throws Exception {
ComperhensiveVo comperhensiveVo = new ComperhensiveVo();
//1.查询教师进本信息 判断是根据身份证还是姓名
if (StringUtils.isNotEmpty(req.getName())){
//根据姓名 查询存在多个 使用list接受返回第一个
SchoolTeacherBasicInformationVo vo = new SchoolTeacherBasicInformationVo();
vo.setName(req.getName());
List<SchoolTeacherBasicInformationVo> list = this.list(vo);
if (!list.isEmpty()){
SchoolTeacherBasicInformationVo schoolTeacherBasicInformationVo = list.get(0);
SchoolTeacherBasicInformationVo schoolTeacherBasicInformationVo1 = this.getByIds(schoolTeacherBasicInformationVo.getId());
comperhensiveVo.setBasicInformation(schoolTeacherBasicInformationVo1);
}else {
throw new RuntimeException("教师信息未查到");
}
}else if (StringUtils.isNotEmpty(req.getIdCard())){
//身份证
SchoolTeacherBasicInformationVo vo = new SchoolTeacherBasicInformationVo();
vo.setIdCard(req.getIdCard());
List<SchoolTeacherBasicInformationVo> list = this.list(vo);
if (!list.isEmpty()){
SchoolTeacherBasicInformationVo schoolTeacherBasicInformationVo = list.get(0);
SchoolTeacherBasicInformationVo schoolTeacherBasicInformationVo1 = this.getByIds(schoolTeacherBasicInformationVo.getId());
comperhensiveVo.setBasicInformation(schoolTeacherBasicInformationVo1);
}else {
throw new RuntimeException("教师信息未查到");
}
}else {
throw new RuntimeException("查询条件身份证/姓名，必须输入一项否则无法查询");
}
SchoolTeacherBasicInformationVo basicInformation = comperhensiveVo.getBasicInformation();
if (null == basicInformation ){
return comperhensiveVo;
}
//2 工作量信息查询 使用身份证查询
SchoolAworkload schoolAworkload = new SchoolAworkload();
schoolAworkload.setIdCard(basicInformation.getIdCard());
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
comperhensiveVo.setSchoolAworkload(schoolAworkloadVos);
//3 班主任考核
SchoolAclassTeacherAssessmentReq req1 = new SchoolAclassTeacherAssessmentReq();
req1.setIdCard(basicInformation.getIdCard());
List<SchoolAclassTeacherAssessmentVo> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req1);
comperhensiveVo.setSchoolAclassTeacherAssessments(schoolAclassTeacherAssessmentVos);
//查询老师信息
SysUser sysUser = sysUserService.selectUserByPhone(basicInformation.getDdPhone(), "0");
if (null == sysUser){
throw new RuntimeException("查询人员没有存在系统用户中，请查询该用户手机号"+basicInformation.getDdPhone()+"是否在系统中");
}
//4 专业考核
// * 4.1高考成绩
SchoolGkAchievement schoolGkAchievement = new SchoolGkAchievement();
schoolGkAchievement.setUserId(sysUser.getUserId());
List<SchoolGkAchievementVo> schoolGkAchievementVos = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement);
comperhensiveVo.setSchoolGkAchievement(schoolGkAchievementVos);
// *4.2 教学成绩
SchoolXteachingAchievementsVo schoolXteachingAchievementsVo = new SchoolXteachingAchievementsVo();
schoolXteachingAchievementsVo.setUserId(sysUser.getUserId());
List<SchoolXteachingAchievementsVo> schoolXteachingAchievementsVos = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
comperhensiveVo.setSchoolXteachingAchievements(schoolXteachingAchievementsVos);
//* 4.3 综合成绩
List<SpecialityVo> specialityVos = new ArrayList<>();
// * 4.4 教师获奖
SchoolXteacherAwardsVo schoolXteacherAwardsVo = new SchoolXteacherAwardsVo();
schoolXteacherAwardsVo.setUserId(sysUser.getUserId());
List<SchoolXteacherAwardsVo> schoolXteacherAwardsVos = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
schoolXteacherAwardsVos.forEach(date->{
SpecialityVo specialityVo = new SpecialityVo();
BeanUtils.copyProperties(date,specialityVo);
specialityVos.add(specialityVo);
});
// * 4.5 讲课获奖
SchoolXlectureAwardsVo schoolXlectureAwardsVo = new SchoolXlectureAwardsVo();
schoolXlectureAwardsVo.setUserId(sysUser.getUserId());
List<SchoolXlectureAwardsVo> schoolXlectureAwardsVos = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
schoolXlectureAwardsVos.forEach(date->{
SpecialityVo specialityVo = new SpecialityVo();
BeanUtils.copyProperties(date,specialityVo);
specialityVos.add(specialityVo);
});
// * 4.6 论文论著
SchoolXacademicWorksVo schoolXacademicWorksVo = new SchoolXacademicWorksVo();
schoolXacademicWorksVo.setUserId(sysUser.getUserId());
List<SchoolXacademicWorksVo> schoolXacademicWorksVos = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
schoolXacademicWorksVos.forEach(date->{
SpecialityVo specialityVo = new SpecialityVo();
BeanUtils.copyProperties(date,specialityVo);
specialityVos.add(specialityVo);
});
// * 4.7课题研究
//5 辅导教师获奖
FudaoTeacherVo fudaoTeacher = new FudaoTeacherVo();
fudaoTeacher.setUserid(sysUser.getUserId());
List<FudaoTeacherVo> querylist = fudaoTeacherimpl.querylist(fudaoTeacher);
comperhensiveVo.setFudaoTeacher(querylist);
//6 辅导学生获奖
FudaoStudentVo fudaoStudent = new FudaoStudentVo();
fudaoStudent.setUserid(sysUser.getUserId());
List<FudaoStudentVo> querylist1 = fudaoStudentImpl.querylist(fudaoStudent);
comperhensiveVo.setFudaoStudent(querylist1);
//7 年度考核
SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment();
schoolAnnualAssessment.setIdCard(basicInformation.getIdCard());
List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments);
return comperhensiveVo;
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationService.java
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComperhensiveVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComprehensiveReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
...@@ -17,6 +20,13 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT ...@@ -17,6 +20,13 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT
int updateInformationById(SchoolTeacherBasicInformation information); int updateInformationById(SchoolTeacherBasicInformation information);
/**
* 综合信息查询
* @param
* @return
*/
public ComperhensiveVo comprehensive(ComprehensiveReq req) throws Exception;
/* /*
* 批量导入学生照片 * 批量导入学生照片
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/WxSchoolLabControoler.java
...@@ -3,13 +3,11 @@ package yangtz.cs.liu.wechat.controller.experiment; ...@@ -3,13 +3,11 @@ package yangtz.cs.liu.wechat.controller.experiment;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.UserInfoUtil; import com.ruoyi.framework.util.UserInfoUtil;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -22,7 +20,6 @@ import yangtz.cs.liu.campus.domain.schoolLab.SchoolLab; ...@@ -22,7 +20,6 @@ import yangtz.cs.liu.campus.domain.schoolLab.SchoolLab;
import yangtz.cs.liu.campus.service.impl.schoolLab.SchoolLabClassYearServiceImpl; import yangtz.cs.liu.campus.service.impl.schoolLab.SchoolLabClassYearServiceImpl;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabService;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabVo;
/** /**
* 实验室 * 实验室
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/office/WxSchoolOfficePurchaseController.java
...@@ -7,7 +7,6 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -7,7 +7,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.UserInfoUtil; import com.ruoyi.framework.util.UserInfoUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -17,7 +16,6 @@ import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase; ...@@ -17,7 +16,6 @@ import yangtz.cs.liu.campus.domain.office.SchoolOfficePurchase;
import yangtz.cs.liu.campus.service.office.ISchoolOfficePurchaseService; import yangtz.cs.liu.campus.service.office.ISchoolOfficePurchaseService;
import yangtz.cs.liu.campus.vo.office.OfficeTodoListVO; import yangtz.cs.liu.campus.vo.office.OfficeTodoListVO;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.xml
...@@ -25,14 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,14 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSchoolGkAchievementVo"> <sql id="selectSchoolGkAchievementVo">
select id, sub, teacher_name, year, teaching_class_name, class_type, gk_appraising, top_students_culture, increment_situation, effective_num_situation, other, audit_state, create_by, create_time, update_by, update_time, del_flag from school_gk_achievement select id, sub, teacher_name, year, teaching_class_name, user_id,class_type, gk_appraising, top_students_culture, increment_situation, effective_num_situation, other, audit_state, create_by, create_time, update_by, update_time, del_flag from school_gk_achievement
</sql> </sql>
<select id="selectSchoolGkAchievementVoList" parameterType="SchoolGkAchievement" resultType="SchoolGkAchievementVo"> <select id="selectSchoolGkAchievementVoList" parameterType="SchoolGkAchievement" resultType="SchoolGkAchievementVo">
<include refid="selectSchoolGkAchievementVo"/> <include refid="selectSchoolGkAchievementVo"/>
where del_flag = 0 where del_flag = 0
<if test="year != null and year != ''"> and year = #{year}</if> <if test="year != null and year != ''"> and year = #{year}</if>
<if test="sub != null and sub != ''"> and sub = #{sub}</if> <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="sub != null and sub != ''"> and sub = #{sub}</if>
<if test="teacherName != null and teacherName != ''"> and teacher_name like concat('%', #{teacher_name}, '%') </if> <if test="teacherName != null and teacherName != ''"> and teacher_name like concat('%', #{teacher_name}, '%') </if>
<if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if> <if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
<if test="classType != null and classType != ''"> and class_type = #{classType}</if> <if test="classType != null and classType != ''"> and class_type = #{classType}</if>
...@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSchoolGkAchievementVo"/> <include refid="selectSchoolGkAchievementVo"/>
where del_flag = 0 where del_flag = 0
<if test="year != null and year != ''"> and year = #{year}</if> <if test="year != null and year != ''"> and year = #{year}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="sub != null and sub != ''"> and sub = #{sub}</if> <if test="sub != null and sub != ''"> and sub = #{sub}</if>
<if test="teacherName != null and teacherName != ''"> and teacher_name like concat('%', #{teacher_name}, '%') </if> <if test="teacherName != null and teacherName != ''"> and teacher_name like concat('%', #{teacher_name}, '%') </if>
<if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if> <if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
...@@ -74,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -74,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="userId != null and userId != ''">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sub != null">#{sub},</if> <if test="sub != null">#{sub},</if>
...@@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="userId != null and userId != ''">#{userId},</if>
</trim> </trim>
</insert> </insert>
...@@ -114,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -114,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="userId != null and userId != ''">user_id = #{userId},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
...@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="list" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo"> <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 SELECT id,name,sex,id_card,file_birth_date,political_landscape,to_second_middle_school_time,current_professional_title,last_degree,on_duty_situation,dd_phone FROM school_teacher_basic_information where del_flag = 0
<if test="teachingSubject != null "> and teaching_subject = #{teachingSubject}</if> <if test="teachingSubject != null "> and teaching_subject = #{teachingSubject}</if>
<if test="name != null "> <if test="name != null ">
AND name like concat('%', #{name}, '%') AND name like concat('%', #{name}, '%')
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.xml
...@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="awardSituation != null and awardSituation != ''"> and award_situation = #{awardSituation}</if> <if test="awardSituation != null and awardSituation != ''"> and award_situation = #{awardSituation}</if>
<if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if> <if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if> <if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
</where> </where>
</select> </select>
...@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="awardSituation != null and awardSituation != ''"> and award_situation = #{awardSituation}</if> <if test="awardSituation != null and awardSituation != ''"> and award_situation = #{awardSituation}</if>
<if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if> <if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if> <if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
</where> </where>
</select> </select>
......
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