Commit 93fa9c3e authored by cq990612's avatar cq990612

优化代码结构

parent 17c813a7
package cn.wisenergy.model.dto; package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -13,6 +13,7 @@ import java.util.Date; ...@@ -13,6 +13,7 @@ import java.util.Date;
* @QQ1799796883 * @QQ1799796883
*/ */
@Data @Data
@Accessors(chain = true)
@ApiModel(value="CalendarDto", description="日历展示类") @ApiModel(value="CalendarDto", description="日历展示类")
public class CalendarDto implements Serializable { public class CalendarDto implements Serializable {
......
package cn.wisenergy.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="ManagerProjectsDto", description="管理的项目/商机")
public class ManagerProjectsDto implements Serializable {
private static final long serialVersionUID = -7790290335357240530L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "oaProjectId",value = "OA中的项目编号")
private String oaProjectId;
@ApiModelProperty(name = "projectName",value = "项目名称")
private String projectName;
@ApiModelProperty(name = "type",value = "1:项目,2:商机")
private Integer type;
@ApiModelProperty(name = "managerId",value = "项目经理userId")
private Integer managerId;
@ApiModelProperty(name = "deptId",value = "部门id")
private Integer deptId;
@ApiModelProperty(name = "workTime",value = "工时预算")
private Integer workTime;
@ApiModelProperty(name = "costBudget",value = "成本预算,以万为单位")
private BigDecimal costBudget;
@ApiModelProperty(name = "isConclusion",value = "是否结项 :0:项目已结束、1:项目未结束")
private Integer isConclusion;
@ApiModelProperty(name = "startTime",value = "项目开始时间")
private Date startTime;
@ApiModelProperty(name = "endTime",value = "项目结束时间")
private Date endTime;
@ApiModelProperty(name = "createTime",value = "创建时间")
private Date createTime;
@ApiModelProperty(name = "modifyTime",value = "修改时间")
private Date modifyTime;
//其他
@ApiModelProperty(name = "Participants",value = "参与人员")
private String Participants;
@ApiModelProperty(name = "currentLaborCost",value = "当前工时成本")
private String currentLaborCost;
@ApiModelProperty(name = "totalCurrentWorkingHours",value = "当前工时总计")
private String totalCurrentWorkingHours;
@ApiModelProperty(name = "isItOverdue",value = "是否超期")
private String isItOverdue;
@ApiModelProperty(name = "isThereABudgetChange",value = "是否有预算更变")
private String isThereABudgetChange;
}
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="GetManagerProjectsVo", description="获取管理项目VO")
public class GetManagerProjectsVo {
@ApiModelProperty(name = "page",value = "当前页")
private Integer page;
@ApiModelProperty(name = "pageSize",value = "一页的记录数")
private Integer pageSize;
@ApiModelProperty(name = "userId",value = "用户id")
private Integer userId;
@ApiModelProperty(name = "projectId",value = "项目id")
private Integer projectId;
@ApiModelProperty(name = "isConclusion",value = "是否结项:0:结项,1:未结束")
private Integer isConclusion;
}
...@@ -40,4 +40,7 @@ public interface WorkProjectService { ...@@ -40,4 +40,7 @@ public interface WorkProjectService {
* @return * @return
*/ */
List<WorkProject> getUserManageProjects(Integer userId); List<WorkProject> getUserManageProjects(Integer userId);
} }
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/work_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.110.84:3306/work_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: root
password: 123456 password: admin!@#123
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
......
...@@ -3,7 +3,7 @@ server: ...@@ -3,7 +3,7 @@ server:
uri-encoding: UTF-8 uri-encoding: UTF-8
max-threads: 1000 max-threads: 1000
min-spare-threads: 30 min-spare-threads: 30
port: 8080 port: 8081
connection-timeout: 5000ms connection-timeout: 5000ms
spring: spring:
......
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