|
@@ -1,6 +1,7 @@
|
|
|
package com.qy.worksheetsystem.controller;
|
|
|
|
|
|
import com.qy.worksheetsystem.model.MessageResult;
|
|
|
+import com.qy.worksheetsystem.model.MessageResultV2;
|
|
|
import com.qy.worksheetsystem.service.ProjectPersonService;
|
|
|
import com.qy.worksheetsystem.util.JWTUtil;
|
|
|
import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
|
|
@@ -32,7 +33,8 @@ public class ProjectController {
|
|
|
@RequestMapping(value = "/getProjectList", method = RequestMethod.GET)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
|
|
|
- @ApiImplicitParam(name = "state", value = "项目状态", required = true, paramType = "query", dataType = "String"),
|
|
|
+ @ApiImplicitParam(name = "month", value = "月份", required = true, paramType = "query", dataType = "String"),
|
|
|
+ @ApiImplicitParam(name = "state", value = "项目状态", paramType = "query", dataType = "String"),
|
|
|
})
|
|
|
public MessageResult getProjectList(@RequestHeader("token") String token, String state) {
|
|
|
Map result = new HashMap();
|
|
@@ -56,7 +58,9 @@ public class ProjectController {
|
|
|
result.put("data", projectManagementByState);
|
|
|
result.put("msg", "未查询到数据!");
|
|
|
}
|
|
|
- return MessageResult.success().add("data", result);
|
|
|
+ MessageResultV2 resultV2 = MessageResultV2.success();
|
|
|
+ resultV2.setData( projectManagementByState);
|
|
|
+ return resultV2;
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "获取员工时间范围内项目列表", notes = "获取员工时间范围内项目列表")
|