Commit f3bcbe9d authored by cq990612's avatar cq990612

优化代码结构

parent e712163f
...@@ -25,8 +25,11 @@ public class WorkLevel { ...@@ -25,8 +25,11 @@ public class WorkLevel {
private Integer rank; private Integer rank;
@ApiModelProperty(name = "icon",value = "图标")
private String icon;
/**附加字段*/ /**附加字段*/
@TableField(exist = false) @TableField(exist = false)
private String path; private String path;
} }
package cn.wisenergy.model.dto; package cn.wisenergy.model.dto;
import cn.wisenergy.model.app.WorkType;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -15,4 +16,6 @@ public class ProjectsDto { ...@@ -15,4 +16,6 @@ public class ProjectsDto {
private List<ProjectManagerDto> projectManagerDto; private List<ProjectManagerDto> projectManagerDto;
private List<WorkType> workTypes;
} }
...@@ -61,6 +61,7 @@ public class WorkTimeOrderDto { ...@@ -61,6 +61,7 @@ public class WorkTimeOrderDto {
@ApiModelProperty(name = "isOvertime", value = "0:正常工时,1:加班") @ApiModelProperty(name = "isOvertime", value = "0:正常工时,1:加班")
private Integer isOvertime; private Integer isOvertime;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
@ApiModelProperty(name = "rejectTime",value = "驳回时间") @ApiModelProperty(name = "rejectTime",value = "驳回时间")
private Date rejectTime; private Date rejectTime;
......
...@@ -5,7 +5,7 @@ package cn.wisenergy.model.enums; ...@@ -5,7 +5,7 @@ package cn.wisenergy.model.enums;
* @QQ1799796883 * @QQ1799796883
*/ */
public enum LevelEnum { public enum LevelEnum {
EXAMINE("审批","/index"), EXAMINE("工时审批","/index"),
STATISTICS("统计","/statistical"), STATISTICS("统计","/statistical"),
PROJECT_MANAGER( "项目/商机管理","/projects"), PROJECT_MANAGER( "项目/商机管理","/projects"),
TIMEEXPORT("工时导出","/export"), TIMEEXPORT("工时导出","/export"),
......
...@@ -535,9 +535,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -535,9 +535,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
} }
ProjectsDto projectsDto = new ProjectsDto(); ProjectsDto projectsDto = new ProjectsDto();
WorkUser user = workUserService.getById(userId); WorkUser user = workUserService.getById(userId);
// 1.获取可填报的项目 // 1.获取可填报的类型
List<WorkType> workTypes = workTypeService.getAll();
if (!CollectionUtils.isEmpty(workTypes)) {
projectsDto.setWorkTypes(workTypes);
}
// 2.获取可填报的项目
projectsDto.setProjectInfoDto(getProjectInfoDto(userId)); projectsDto.setProjectInfoDto(getProjectInfoDto(userId));
// 2.获取可审批的项目 // 3.获取可审批的项目
List<UserRoleLevelDto> roleUserLevel = UserRoleLevelUtils.getRoleUserLevel(userId); List<UserRoleLevelDto> roleUserLevel = UserRoleLevelUtils.getRoleUserLevel(userId);
if (CollectionUtils.isEmpty(roleUserLevel)) { if (CollectionUtils.isEmpty(roleUserLevel)) {
return projectsDto; return projectsDto;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment