diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java index f2707e49..82de62b3 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java @@ -1,59 +1,33 @@ package com.ibeetl.jlw.web; -import cn.jlw.Interceptor.RFile; import cn.jlw.Interceptor.SCoreUser; -import cn.jlw.Interceptor.GetFile; import cn.jlw.util.ToolUtils; import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; -import com.ibeetl.admin.core.util.ConvertUtil; -import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.StudentHandsOnTaskReport; +import com.ibeetl.jlw.service.StudentHandsOnTaskReportService; +import com.ibeetl.jlw.web.query.StudentHandsOnTaskReportQuery; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.ss.usermodel.VerticalAlignment; import org.beetl.sql.core.engine.PageQuery; import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.validation.annotation.Validated; - -import com.ibeetl.admin.console.web.dto.DictExcelImportData; -import com.ibeetl.admin.console.web.query.UserQuery; -import com.ibeetl.admin.core.annotation.Function; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.service.*; -import com.ibeetl.jlw.web.query.*; - import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; -import java.math.BigDecimal; - -import javax.annotation.Resource; /** * 学生-课程实操-报告撰写 学生-课程实操-报告撰写 接口 @@ -221,7 +195,7 @@ public class StudentHandsOnTaskReportController{ return JsonResult.success(); } - @PostMapping(MODEL + "/add.do") + @PostMapping(API + "/add.do") public JsonResult addStudentHandsOnTaskReport(@RequestBody @Validated(ValidateConfig.ADD.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, BindingResult result,@SCoreUser CoreUser coreUser){ if(result.hasErrors()){ return JsonResult.failMessage(result);