瀏覽代碼

新增新版考勤导入

anderx 1 年之前
父節點
當前提交
84b4f85f6c
共有 1 個文件被更改,包括 3 次插入13 次删除
  1. 3 13
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

+ 3 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -28,8 +28,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -233,7 +231,7 @@ public class ProjectTaskController extends BaseController {
     @ApiOperation("项目打卡日志导出模版")
     public void listRecordImportTemplate(HttpServletResponse response)
     {
-        ExcelUtil<ProjectStaffRecordOut> util = new ExcelUtil<ProjectStaffRecordOut>(ProjectStaffRecordOut.class);
+        ExcelUtil<ProjectStaffRecordOut> util = new ExcelUtil<>(ProjectStaffRecordOut.class);
         util.importTemplateExcel(response, "项目打卡日志列表");
     }
 
@@ -324,8 +322,7 @@ public class ProjectTaskController extends BaseController {
     {
         ExcelUtil<ProjectTaskListOut> util = new ExcelUtil<>(ProjectTaskListOut.class);
         List<ProjectTaskListOut> list = util.importExcel(file.getInputStream());
-        String operName = getUsername();
-        String message = projectTaskService.importProject(list, updateSupport, operName);
+        String message = projectTaskService.importProject(list, updateSupport, getUsername());
         return success(message);
     }
 
@@ -333,7 +330,7 @@ public class ProjectTaskController extends BaseController {
     @ApiOperation("项目导出模版")
     public void importTemplate(HttpServletResponse response)
     {
-        ExcelUtil<ProjectTaskListOut> util = new ExcelUtil<ProjectTaskListOut>(ProjectTaskListOut.class);
+        ExcelUtil<ProjectTaskListOut> util = new ExcelUtil<>(ProjectTaskListOut.class);
         util.importTemplateExcel(response, "项目列表");
     }
 
@@ -408,8 +405,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目及日志上传天河链
-     * @param id
-     * @return
      */
     @GetMapping("/saveProjectTaskTianhe")
     public AjaxResult saveProjectTaskTianhe(@RequestParam("id") String id){
@@ -422,8 +417,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目日志上传天河链
-     * @param id
-     * @return
      */
     @GetMapping("/saveProjectStaffRecordTianhe")
     public AjaxResult saveProjectStaffRecordTianhe(@RequestParam("id") String id){
@@ -437,8 +430,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 文字上传天河链
-     * @param content
-     * @return
      */
     @GetMapping("/saveText")
     public AjaxResult saveText(@RequestParam("content") String content){
@@ -474,7 +465,6 @@ public class ProjectTaskController extends BaseController {
      * 获取项目月份打卡数据
      * @param id 项目编号
      * @param yearMonth  年月份
-     * @return 数据
      */
     @PostMapping("/getMonthClockExport")
     public void getMonthClockExport(@RequestParam("id") Integer id,@RequestParam("yearMonth") String yearMonth,HttpServletResponse response){