个人增加一个参数

gis_domain/src/main/java/com/gis/domain/dto/PersonalPageDateDto.java

@@ -21,6 +21,9 @@ public class PersonalPageDateDto extends PageDateDto {
 //    @ApiModelProperty(value = "日期,yyyy-MM-dd", required = true)
 //    private String date;
 
+    @ApiModelProperty(value = "参数, a | b | c")
+    private String y;
+
 
 
 

gis_domain/src/main/java/com/gis/domain/dto/PersonalPageDto.java

@@ -23,8 +23,8 @@ public class PersonalPageDto extends PageDto {
     @ApiModelProperty(value = "日期,yyyy-MM-dd", required = true)
     private String date;
 
-//    @ApiModelProperty(value = "部门id")
-//    private String deptId;
+    @ApiModelProperty(value = "参数, a | b | c")
+    private String y;
 
 
 }

gis_domain/src/main/java/com/gis/domain/dto/WorkPageDto.java

@@ -26,6 +26,9 @@ public class WorkPageDto extends PageDto {
     @ApiModelProperty(value = "部门id")
     private String deptId;
 
+    @ApiModelProperty(value = "参数, a | b | c")
+    private String y;
+
 
 
 

gis_service/src/main/java/com/gis/service/impl/TaskesTimateServiceImpl.java

@@ -201,6 +201,13 @@ public class TaskesTimateServiceImpl extends ZtBaseServiceImpl<TaskesTimateEntit
     public Result<DetailVo> workByMonthDetail(WorkPageDto param) {
         startPage(param);
         List<DetailVo> effortVos = entityMapper.workByMonthDetail(param);
+
+        String y = param.getY();
+
+        if (StrUtil.isNotBlank(y)){
+            effortVos = filterData(effortVos, y);
+        }
+
         return Result.success(new PageInfo<>(effortVos));
     }
 
@@ -208,9 +215,30 @@ public class TaskesTimateServiceImpl extends ZtBaseServiceImpl<TaskesTimateEntit
     public Result<DetailVo> workByDayDetail(PersonalPageDateDto param) {
         startPage(param);
         List<DetailVo> effortVos = entityMapper.workByDayDetail(param);
+
+        String y = param.getY();
+        if (StrUtil.isNotBlank(y)){
+            effortVos = filterData(effortVos, y);
+        }
+
         return Result.success(new PageInfo<>(effortVos));
     }
 
+
+    private  List<DetailVo> filterData(List<DetailVo> effortVos , String filterKey){
+        log.info("需要过滤数据key：{}", filterKey);
+        filterKey = filterKey.toUpperCase();
+        ArrayList<DetailVo> list = new ArrayList<>();
+        for (DetailVo vo : effortVos) {
+            String code = vo.getCode();
+            if (code.startsWith(filterKey)){
+                list.add(vo);
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public Result<DetailVo> excelDetailByDay(DeptDto param) {
         long start = System.currentTimeMillis();

gis_web/src/main/java/com/gis/web/controller/ProjectController.java

@@ -25,7 +25,7 @@ import javax.validation.Valid;
 
 @Api(tags = "项目管理")
 @Slf4j
-@RequestMapping("/api/project")
+@RequestMapping("/api/project/v2")
 @RestController
 public class ProjectController extends BaseController {