anderx 1 éve%!(EXTRA string=óta)
szülő
commit
0ffc44b7ca

+ 7 - 58
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -22,11 +22,11 @@ import com.ruoyi.project.service.ProjectStaffService;
 import com.ruoyi.project.service.ProjectTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Date;
@@ -40,17 +40,15 @@ import java.util.List;
 @RequestMapping("/api/project")
 public class ProjectTaskController extends BaseController {
 
-    @Autowired
+    @Resource
     private ProjectTaskService projectTaskService;
-    @Autowired
+    @Resource
     private ProjectStaffService projectStaffService;
-    @Autowired
+    @Resource
     private ProjectStaffRecordService projectStaffRecordService;
 
     /**
      * 新增项目任务
-     * @param projectTask
-     * @return
      */
     @PostMapping("/add")
     @ApiOperation("新增项目")
@@ -67,8 +65,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 查询项目编号
-     * @param projectTask
-     * @return
      */
     @GetMapping("/checkProjectNumber")
     @ApiOperation("查询项目编号")
@@ -81,8 +77,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 修改项目
-     * @param projectTask
-     * @return
      */
     @PutMapping("/update")
     @ApiOperation("修改项目")
@@ -99,8 +93,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 新增项目成员
-     * @param in
-     * @return
      */
     @PostMapping("/addStaff")
     @ApiOperation("新增项目成员")
@@ -111,8 +103,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 新增成员打卡
-     * @param in
-     * @return
      */
     @PostMapping("/addRecord")
     @ApiOperation("新增项目打卡")
@@ -134,8 +124,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 修改成员打卡
-     * @param in
-     * @return
      */
     @PostMapping("/updateRecord")
     @ApiOperation("修改成员打卡")
@@ -153,8 +141,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 研发打卡日志详情
-     * @param id
-     * @return
      */
     @GetMapping("/recordDetails")
     @ApiOperation("打卡日志详情")
@@ -166,8 +152,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 审核成员打卡
-     * @param in
-     * @return
      */
     @PostMapping("/examineRecord")
     @ApiOperation("审核成员打卡")
@@ -181,8 +165,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 批量审核成员打卡
-     * @param in
-     * @return
      */
     @PostMapping("/batchExamineRecord")
     @ApiOperation("批量审核成员打卡")
@@ -195,8 +177,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 成员打卡列表
-     * @param in
-     * @return
      */
     @GetMapping("/listRecord")
     @ApiOperation("成员打卡列表")
@@ -209,8 +189,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 成员打卡审核日志
-     * @param in
-     * @return
      */
     @GetMapping("/listRecordLog")
     @ApiOperation("成员打卡审核日志")
@@ -221,7 +199,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 导出项目打卡列表
-     * @param response
      */
     @PostMapping("/listRecord/export")
     @ApiOperation("导出项目打卡列表")
@@ -235,10 +212,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 导入数据
-     * @param file
-     * @param updateSupport
-     * @return
-     * @throws Exception
      */
     @PostMapping("/listRecord/importData")
     @ApiOperation("导入项目打卡数据")
@@ -253,7 +226,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目打卡日志导出模版
-     * @param response
      */
     @PostMapping("/listRecord/importTemplate")
     @ApiOperation("项目打卡日志导出模版")
@@ -266,8 +238,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 删除项目成员
-     * @param in
-     * @return
      */
     @PostMapping("/deleteStaff")
     @ApiOperation("删除项目成员")
@@ -281,8 +251,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目成员列表
-     * @param in
-     * @return
      */
     @GetMapping("/listStaff")
     @ApiOperation("项目成员列表")
@@ -296,8 +264,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 删除项目
-     * @param in
-     * @return
      */
     @PostMapping("/deleteProject")
     @ApiOperation("删除项目")
@@ -311,8 +277,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目详情
-     * @param id
-     * @return
      */
     @GetMapping ("/details")
     @ApiOperation("项目详情")
@@ -326,8 +290,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目列表
-     * @param
-     * @return
      */
     @GetMapping ("/list")
     @ApiOperation("项目列表")
@@ -338,7 +300,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 导出项目列表
-     * @param response
      */
     @PostMapping("/export")
     @ApiOperation("导出项目列表")
@@ -353,10 +314,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 导入数据
-     * @param file
-     * @param updateSupport
-     * @return
-     * @throws Exception
      */
     @PostMapping("/importData")
     @Log(title = "项目管理", businessType = BusinessType.IMPORT)
@@ -381,9 +338,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 上传项目文件
-     * @param file
-     * @return
-     * @throws Exception
      */
     @PostMapping("/upload")
     @ApiOperation("上传文件")
@@ -400,8 +354,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 查询剩余时间
-     * @param id
-     * @return
      */
     @GetMapping("/myDuration")
     @ApiOperation("查询剩余打卡时间")
@@ -409,7 +361,9 @@ public class ProjectTaskController extends BaseController {
         return projectStaffRecordService.myDuration(id,recordTime);
     }
 
-
+    /**
+     * 查询我的月份数据
+     */
     @GetMapping("/myDurationMonth")
     @ApiOperation("查询我的月份数据")
     public AjaxResult myDurationMonth(Long id,Integer year,Integer month){
@@ -418,8 +372,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 项目附件目录
-     * @param pid
-     * @return
      */
     @GetMapping("/selectProjectImg")
     public AjaxResult selectProjectImg(Long pid){
@@ -431,9 +383,6 @@ public class ProjectTaskController extends BaseController {
 
     /**
      * 下载项目打卡数据包
-     * @param response
-     * @param ids
-     * @throws IOException
      */
     @GetMapping("/download")
     public void downloadFiles(HttpServletResponse response,String ids) {