diff --git a/src/main/java/com/ccsens/defaultwbs/bean/dto/ClockingInDto.java b/src/main/java/com/ccsens/defaultwbs/bean/dto/ClockingInDto.java new file mode 100644 index 0000000..680256f --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/dto/ClockingInDto.java @@ -0,0 +1,81 @@ +package com.ccsens.defaultwbs.bean.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author AUSU + */ +@Data +public class ClockingInDto { + + @Data + @ApiModel("查询考勤信息") + public static class QueryClockingIn{ + @NotNull(message = "请选择项目信息") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("打卡角色") + private Long roleId; + @ApiModelProperty("成员id数组") + private List memberIdList; + } + + @Data + @ApiModel("进行打卡") + public static class PunchTheClock{ + @ApiModelProperty("记录id(没有则不传)") + private Long id; + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("打卡日期") + private Long dateTime; + @NotNull(message = "成员id不能为空") + @ApiModelProperty("考勤信息中的成员id") + private Long memberId; + @NotNull(message = "审核员id不能为空") + @ApiModelProperty("审核员id") + private Long checkerId; + @ApiModelProperty("打卡类型(0-早,1-晚)") + private Byte clockType; + } + + @Data + @ApiModel("检查人审核打卡") + public static class Audit{ + @NotNull(message = "打卡信息错误") + @ApiModelProperty("打卡记录id") + private Long id; + @NotNull(message = "项目信息错误") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("审批类型(0-修改,1-驳回,2审核通过)") + private Byte type; + @ApiModelProperty("早打卡时间") + private Long morning; + @ApiModelProperty("晚打卡时间") + private Long night; + } + + @Data + @ApiModel("导出打卡记录") + public static class ExportRecord{ + @NotNull(message = "项目信息错误") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("成员id数组") + private List memberIdList; + } +} diff --git a/src/main/java/com/ccsens/defaultwbs/bean/dto/DeliverDto.java b/src/main/java/com/ccsens/defaultwbs/bean/dto/DeliverDto.java new file mode 100644 index 0000000..72d9403 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/dto/DeliverDto.java @@ -0,0 +1,80 @@ +package com.ccsens.defaultwbs.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class DeliverDto { + + @Data + @ApiModel("查询所有检查人") + public static class QueryChecker{ + @NotNull(message = "请选择项目") + @ApiModelProperty("项目id") + private Long projectId; + } + + @Data + @ApiModel("检查交付物") + public static class CheckDeliver{ + @NotNull(message = "检查信息错误") + @ApiModelProperty("检查记录id") + private Long checkId; + @NotNull(message = "项目信息错误") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("检查状态(1-通过,2-驳回)") + private Byte status; + @ApiModelProperty("分数") + private String score; + @ApiModelProperty("评论") + private String remark; + } + + @Data + @ApiModel("提交交付物") + public static class SaveDeliver{ + @NotNull(message = "请选择项目") + @ApiModelProperty("项目id") + private Long projectId; + @NotNull(message = "请选择任务") + @ApiModelProperty("分解任务id") + private Long taskSubId; + @ApiModelProperty("文本内容") + private String content; + @ApiModelProperty("检查人列表") + private List checkerList; + } + + @Data + @ApiModel("查询任务的交付物历史") + public static class QueryDeliverOfTask{ + @NotNull(message = "请选择项目信息") + @ApiModelProperty("项目id") + private Long projectId; + @NotNull(message = "请选择任务") + @ApiModelProperty("任务分解id") + private Long taskSubId; + } + + @Data + @ApiModel("查询项目的交付物历史") + public static class QueryDeliverOfProject { + @NotNull(message = "请选择项目信息") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } +} diff --git a/src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingIn.java b/src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingIn.java new file mode 100644 index 0000000..8448123 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingIn.java @@ -0,0 +1,128 @@ +package com.ccsens.defaultwbs.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProClockingIn implements Serializable { + private Long id; + + private Long memberId; + + private Long checkerId; + + private Long morning; + + private Byte morningStatus; + + private Long night; + + private Byte nightStatus; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getCheckerId() { + return checkerId; + } + + public void setCheckerId(Long checkerId) { + this.checkerId = checkerId; + } + + public Long getMorning() { + return morning; + } + + public void setMorning(Long morning) { + this.morning = morning; + } + + public Byte getMorningStatus() { + return morningStatus; + } + + public void setMorningStatus(Byte morningStatus) { + this.morningStatus = morningStatus; + } + + public Long getNight() { + return night; + } + + public void setNight(Long night) { + this.night = night; + } + + public Byte getNightStatus() { + return nightStatus; + } + + public void setNightStatus(Byte nightStatus) { + this.nightStatus = nightStatus; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", memberId=").append(memberId); + sb.append(", checkerId=").append(checkerId); + sb.append(", morning=").append(morning); + sb.append(", morningStatus=").append(morningStatus); + sb.append(", night=").append(night); + sb.append(", nightStatus=").append(nightStatus); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingInExample.java b/src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingInExample.java new file mode 100644 index 0000000..84cfd0d --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingInExample.java @@ -0,0 +1,801 @@ +package com.ccsens.defaultwbs.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProClockingInExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProClockingInExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andCheckerIdIsNull() { + addCriterion("checker_id is null"); + return (Criteria) this; + } + + public Criteria andCheckerIdIsNotNull() { + addCriterion("checker_id is not null"); + return (Criteria) this; + } + + public Criteria andCheckerIdEqualTo(Long value) { + addCriterion("checker_id =", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdNotEqualTo(Long value) { + addCriterion("checker_id <>", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdGreaterThan(Long value) { + addCriterion("checker_id >", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdGreaterThanOrEqualTo(Long value) { + addCriterion("checker_id >=", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdLessThan(Long value) { + addCriterion("checker_id <", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdLessThanOrEqualTo(Long value) { + addCriterion("checker_id <=", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdIn(List values) { + addCriterion("checker_id in", values, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdNotIn(List values) { + addCriterion("checker_id not in", values, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdBetween(Long value1, Long value2) { + addCriterion("checker_id between", value1, value2, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdNotBetween(Long value1, Long value2) { + addCriterion("checker_id not between", value1, value2, "checkerId"); + return (Criteria) this; + } + + public Criteria andMorningIsNull() { + addCriterion("morning is null"); + return (Criteria) this; + } + + public Criteria andMorningIsNotNull() { + addCriterion("morning is not null"); + return (Criteria) this; + } + + public Criteria andMorningEqualTo(Long value) { + addCriterion("morning =", value, "morning"); + return (Criteria) this; + } + + public Criteria andMorningNotEqualTo(Long value) { + addCriterion("morning <>", value, "morning"); + return (Criteria) this; + } + + public Criteria andMorningGreaterThan(Long value) { + addCriterion("morning >", value, "morning"); + return (Criteria) this; + } + + public Criteria andMorningGreaterThanOrEqualTo(Long value) { + addCriterion("morning >=", value, "morning"); + return (Criteria) this; + } + + public Criteria andMorningLessThan(Long value) { + addCriterion("morning <", value, "morning"); + return (Criteria) this; + } + + public Criteria andMorningLessThanOrEqualTo(Long value) { + addCriterion("morning <=", value, "morning"); + return (Criteria) this; + } + + public Criteria andMorningIn(List values) { + addCriterion("morning in", values, "morning"); + return (Criteria) this; + } + + public Criteria andMorningNotIn(List values) { + addCriterion("morning not in", values, "morning"); + return (Criteria) this; + } + + public Criteria andMorningBetween(Long value1, Long value2) { + addCriterion("morning between", value1, value2, "morning"); + return (Criteria) this; + } + + public Criteria andMorningNotBetween(Long value1, Long value2) { + addCriterion("morning not between", value1, value2, "morning"); + return (Criteria) this; + } + + public Criteria andMorningStatusIsNull() { + addCriterion("morning_status is null"); + return (Criteria) this; + } + + public Criteria andMorningStatusIsNotNull() { + addCriterion("morning_status is not null"); + return (Criteria) this; + } + + public Criteria andMorningStatusEqualTo(Byte value) { + addCriterion("morning_status =", value, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusNotEqualTo(Byte value) { + addCriterion("morning_status <>", value, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusGreaterThan(Byte value) { + addCriterion("morning_status >", value, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("morning_status >=", value, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusLessThan(Byte value) { + addCriterion("morning_status <", value, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusLessThanOrEqualTo(Byte value) { + addCriterion("morning_status <=", value, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusIn(List values) { + addCriterion("morning_status in", values, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusNotIn(List values) { + addCriterion("morning_status not in", values, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusBetween(Byte value1, Byte value2) { + addCriterion("morning_status between", value1, value2, "morningStatus"); + return (Criteria) this; + } + + public Criteria andMorningStatusNotBetween(Byte value1, Byte value2) { + addCriterion("morning_status not between", value1, value2, "morningStatus"); + return (Criteria) this; + } + + public Criteria andNightIsNull() { + addCriterion("night is null"); + return (Criteria) this; + } + + public Criteria andNightIsNotNull() { + addCriterion("night is not null"); + return (Criteria) this; + } + + public Criteria andNightEqualTo(Long value) { + addCriterion("night =", value, "night"); + return (Criteria) this; + } + + public Criteria andNightNotEqualTo(Long value) { + addCriterion("night <>", value, "night"); + return (Criteria) this; + } + + public Criteria andNightGreaterThan(Long value) { + addCriterion("night >", value, "night"); + return (Criteria) this; + } + + public Criteria andNightGreaterThanOrEqualTo(Long value) { + addCriterion("night >=", value, "night"); + return (Criteria) this; + } + + public Criteria andNightLessThan(Long value) { + addCriterion("night <", value, "night"); + return (Criteria) this; + } + + public Criteria andNightLessThanOrEqualTo(Long value) { + addCriterion("night <=", value, "night"); + return (Criteria) this; + } + + public Criteria andNightIn(List values) { + addCriterion("night in", values, "night"); + return (Criteria) this; + } + + public Criteria andNightNotIn(List values) { + addCriterion("night not in", values, "night"); + return (Criteria) this; + } + + public Criteria andNightBetween(Long value1, Long value2) { + addCriterion("night between", value1, value2, "night"); + return (Criteria) this; + } + + public Criteria andNightNotBetween(Long value1, Long value2) { + addCriterion("night not between", value1, value2, "night"); + return (Criteria) this; + } + + public Criteria andNightStatusIsNull() { + addCriterion("night_status is null"); + return (Criteria) this; + } + + public Criteria andNightStatusIsNotNull() { + addCriterion("night_status is not null"); + return (Criteria) this; + } + + public Criteria andNightStatusEqualTo(Byte value) { + addCriterion("night_status =", value, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusNotEqualTo(Byte value) { + addCriterion("night_status <>", value, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusGreaterThan(Byte value) { + addCriterion("night_status >", value, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("night_status >=", value, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusLessThan(Byte value) { + addCriterion("night_status <", value, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusLessThanOrEqualTo(Byte value) { + addCriterion("night_status <=", value, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusIn(List values) { + addCriterion("night_status in", values, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusNotIn(List values) { + addCriterion("night_status not in", values, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusBetween(Byte value1, Byte value2) { + addCriterion("night_status between", value1, value2, "nightStatus"); + return (Criteria) this; + } + + public Criteria andNightStatusNotBetween(Byte value1, Byte value2) { + addCriterion("night_status not between", value1, value2, "nightStatus"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliver.java b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliver.java new file mode 100644 index 0000000..7d7cee8 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliver.java @@ -0,0 +1,139 @@ +package com.ccsens.defaultwbs.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProDeliver implements Serializable { + private Long id; + + private Long taskSubId; + + private Long memberId; + + private Long fileId; + + private String filePath; + + private String content; + + private Long projectId; + + private Long time; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTaskSubId() { + return taskSubId; + } + + public void setTaskSubId(Long taskSubId) { + this.taskSubId = taskSubId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getFileId() { + return fileId; + } + + public void setFileId(Long fileId) { + this.fileId = fileId; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath == null ? null : filePath.trim(); + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content == null ? null : content.trim(); + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getTime() { + return time; + } + + public void setTime(Long time) { + this.time = time; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", taskSubId=").append(taskSubId); + sb.append(", memberId=").append(memberId); + sb.append(", fileId=").append(fileId); + sb.append(", filePath=").append(filePath); + sb.append(", content=").append(content); + sb.append(", projectId=").append(projectId); + sb.append(", time=").append(time); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverChecker.java b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverChecker.java new file mode 100644 index 0000000..b23f466 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverChecker.java @@ -0,0 +1,117 @@ +package com.ccsens.defaultwbs.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProDeliverChecker implements Serializable { + private Long id; + + private Long deliverId; + + private Long memberId; + + private String score; + + private String remark; + + private Byte status; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeliverId() { + return deliverId; + } + + public void setDeliverId(Long deliverId) { + this.deliverId = deliverId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public String getScore() { + return score; + } + + public void setScore(String score) { + this.score = score == null ? null : score.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Byte getStatus() { + return status; + } + + public void setStatus(Byte status) { + this.status = status; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", deliverId=").append(deliverId); + sb.append(", memberId=").append(memberId); + sb.append(", score=").append(score); + sb.append(", remark=").append(remark); + sb.append(", status=").append(status); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverCheckerExample.java b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverCheckerExample.java new file mode 100644 index 0000000..b33d698 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverCheckerExample.java @@ -0,0 +1,761 @@ +package com.ccsens.defaultwbs.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProDeliverCheckerExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProDeliverCheckerExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNull() { + addCriterion("deliver_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNotNull() { + addCriterion("deliver_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverIdEqualTo(Long value) { + addCriterion("deliver_id =", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotEqualTo(Long value) { + addCriterion("deliver_id <>", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThan(Long value) { + addCriterion("deliver_id >", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_id >=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThan(Long value) { + addCriterion("deliver_id <", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_id <=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdIn(List values) { + addCriterion("deliver_id in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotIn(List values) { + addCriterion("deliver_id not in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdBetween(Long value1, Long value2) { + addCriterion("deliver_id between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_id not between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(String value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(String value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(String value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(String value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(String value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(String value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLike(String value) { + addCriterion("score like", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotLike(String value) { + addCriterion("score not like", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(String value1, String value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(String value1, String value2) { + addCriterion("score not between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Byte value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Byte value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Byte value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Byte value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Byte value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Byte value1, Byte value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Byte value1, Byte value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverExample.java b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverExample.java new file mode 100644 index 0000000..23aa732 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/po/ProDeliverExample.java @@ -0,0 +1,881 @@ +package com.ccsens.defaultwbs.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProDeliverExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProDeliverExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIsNull() { + addCriterion("task_sub_id is null"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIsNotNull() { + addCriterion("task_sub_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubIdEqualTo(Long value) { + addCriterion("task_sub_id =", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotEqualTo(Long value) { + addCriterion("task_sub_id <>", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdGreaterThan(Long value) { + addCriterion("task_sub_id >", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_sub_id >=", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdLessThan(Long value) { + addCriterion("task_sub_id <", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdLessThanOrEqualTo(Long value) { + addCriterion("task_sub_id <=", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIn(List values) { + addCriterion("task_sub_id in", values, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotIn(List values) { + addCriterion("task_sub_id not in", values, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdBetween(Long value1, Long value2) { + addCriterion("task_sub_id between", value1, value2, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotBetween(Long value1, Long value2) { + addCriterion("task_sub_id not between", value1, value2, "taskSubId"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andFileIdIsNull() { + addCriterion("file_id is null"); + return (Criteria) this; + } + + public Criteria andFileIdIsNotNull() { + addCriterion("file_id is not null"); + return (Criteria) this; + } + + public Criteria andFileIdEqualTo(Long value) { + addCriterion("file_id =", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotEqualTo(Long value) { + addCriterion("file_id <>", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdGreaterThan(Long value) { + addCriterion("file_id >", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdGreaterThanOrEqualTo(Long value) { + addCriterion("file_id >=", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdLessThan(Long value) { + addCriterion("file_id <", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdLessThanOrEqualTo(Long value) { + addCriterion("file_id <=", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdIn(List values) { + addCriterion("file_id in", values, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotIn(List values) { + addCriterion("file_id not in", values, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdBetween(Long value1, Long value2) { + addCriterion("file_id between", value1, value2, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotBetween(Long value1, Long value2) { + addCriterion("file_id not between", value1, value2, "fileId"); + return (Criteria) this; + } + + public Criteria andFilePathIsNull() { + addCriterion("file_path is null"); + return (Criteria) this; + } + + public Criteria andFilePathIsNotNull() { + addCriterion("file_path is not null"); + return (Criteria) this; + } + + public Criteria andFilePathEqualTo(String value) { + addCriterion("file_path =", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotEqualTo(String value) { + addCriterion("file_path <>", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathGreaterThan(String value) { + addCriterion("file_path >", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathGreaterThanOrEqualTo(String value) { + addCriterion("file_path >=", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLessThan(String value) { + addCriterion("file_path <", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLessThanOrEqualTo(String value) { + addCriterion("file_path <=", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLike(String value) { + addCriterion("file_path like", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotLike(String value) { + addCriterion("file_path not like", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathIn(List values) { + addCriterion("file_path in", values, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotIn(List values) { + addCriterion("file_path not in", values, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathBetween(String value1, String value2) { + addCriterion("file_path between", value1, value2, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotBetween(String value1, String value2) { + addCriterion("file_path not between", value1, value2, "filePath"); + return (Criteria) this; + } + + public Criteria andContentIsNull() { + addCriterion("content is null"); + return (Criteria) this; + } + + public Criteria andContentIsNotNull() { + addCriterion("content is not null"); + return (Criteria) this; + } + + public Criteria andContentEqualTo(String value) { + addCriterion("content =", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotEqualTo(String value) { + addCriterion("content <>", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThan(String value) { + addCriterion("content >", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThanOrEqualTo(String value) { + addCriterion("content >=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThan(String value) { + addCriterion("content <", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThanOrEqualTo(String value) { + addCriterion("content <=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLike(String value) { + addCriterion("content like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotLike(String value) { + addCriterion("content not like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentIn(List values) { + addCriterion("content in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentNotIn(List values) { + addCriterion("content not in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentBetween(String value1, String value2) { + addCriterion("content between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andContentNotBetween(String value1, String value2) { + addCriterion("content not between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andTimeIsNull() { + addCriterion("time is null"); + return (Criteria) this; + } + + public Criteria andTimeIsNotNull() { + addCriterion("time is not null"); + return (Criteria) this; + } + + public Criteria andTimeEqualTo(Long value) { + addCriterion("time =", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotEqualTo(Long value) { + addCriterion("time <>", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThan(Long value) { + addCriterion("time >", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThanOrEqualTo(Long value) { + addCriterion("time >=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThan(Long value) { + addCriterion("time <", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThanOrEqualTo(Long value) { + addCriterion("time <=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeIn(List values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List values) { + addCriterion("time not in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeBetween(Long value1, Long value2) { + addCriterion("time between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotBetween(Long value1, Long value2) { + addCriterion("time not between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/bean/vo/ClockingInVo.java b/src/main/java/com/ccsens/defaultwbs/bean/vo/ClockingInVo.java new file mode 100644 index 0000000..fbd296b --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/vo/ClockingInVo.java @@ -0,0 +1,71 @@ +package com.ccsens.defaultwbs.bean.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ClockingInVo { + + @Data + @ApiModel("考勤信息") + public static class ClockingInInfo{ + @ApiModelProperty("时间") + private String dateTime; + @ApiModelProperty("打卡记录") + private List recordList = new ArrayList<>(); + } + @Data + @ApiModel("打卡记录") + public static class ClockRecord{ + @ApiModelProperty("记录id") + private Long id; + @ApiModelProperty("成员id") + private Long memberId; + @ApiModelProperty("成员名称") + private String memberName; + @JsonIgnore + @ApiModelProperty("成员UserId") + private Long memberUserId; + @ApiModelProperty("早打卡时间") + private Long morning; + @ApiModelProperty("早打卡状态") + private Byte morningStatus; + @ApiModelProperty("晚打卡时间") + private Long night; + @ApiModelProperty("晚打卡状态") + private Byte nightStatus; + @ApiModelProperty("检查人id") + private Long checkerId; + @ApiModelProperty("检查人名字") + private String checkerName; + @ApiModelProperty("上次检查人id") + private Long lastCheckerId; + @ApiModelProperty("上次检查人名字") + private String lastCheckerName; + @ApiModelProperty("打卡人不是不是我(0-否,1-是)") + private Byte isMine = 0; + @ApiModelProperty("检查人是不是我(0-否,1-是)") + private Byte isChecker = 0; + } + + @Data + @ApiModel("excel路径") + public static class ExcelUrl{ + @ApiModelProperty("文件路径") + private String url; + } + + @Data + @ApiModel("上一次检查人") + public static class LastChecker{ + @ApiModelProperty("上一次检查人Id") + private Long lastCheckerId; + @ApiModelProperty("上次检查人名字") + private String lastCheckerName; + } +} diff --git a/src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java b/src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java new file mode 100644 index 0000000..f977846 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java @@ -0,0 +1,68 @@ +package com.ccsens.defaultwbs.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class DeliverVo { + + @Data + @ApiModel("所有检查人信息") + public static class Checker{ + @ApiModelProperty("检查人id") + private Long memberId; + @ApiModelProperty("检查人名字") + private String name; + } + + + @Data + @ApiModel("项目下的交付物记录") + public static class DeliverOfProject{ + @ApiModelProperty("项目名称") + private String projectName; + @ApiModelProperty("任务列表") + private List deliverOfTaskList; + } + + @Data + @ApiModel("任务的交付物历史") + public static class DeliverOfTask{ + @ApiModelProperty("交付物id") + private String id; + @ApiModelProperty("上传人名字") + private String name; + @ApiModelProperty("任务名称") + private String taskName; + @ApiModelProperty("上传时间") + private Long time; + @ApiModelProperty("文本内容") + private String content; + @ApiModelProperty("检查人列表") + private List checkerList; + } + + + @Data + @ApiModel("检查人信息") + public static class CheckerInfo{ + @ApiModelProperty("检查记录id") + private String checkId; + @ApiModelProperty("检查人id") + private Long checkerId; + @ApiModelProperty("检查人名字") + private String checkerName; + @ApiModelProperty("检查状态(0-未审核,1-通过,2-驳回)") + private Byte status; + @ApiModelProperty("分数") + private String score; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("是不是我(0-否,1-是)") + private Byte isMine; + + } +} diff --git a/src/main/java/com/ccsens/defaultwbs/persist/dao/ProClockingInDao.java b/src/main/java/com/ccsens/defaultwbs/persist/dao/ProClockingInDao.java new file mode 100644 index 0000000..bdeb81a --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/persist/dao/ProClockingInDao.java @@ -0,0 +1,38 @@ +package com.ccsens.defaultwbs.persist.dao; + +import com.ccsens.common.bean.po.ProClockingIn; +import com.ccsens.common.bean.vo.CClockingInVo; +import com.ccsens.common.persist.mapper.ProClockingInMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author AUSU + */ +@Repository +public interface ProClockingInDao extends ProClockingInMapper { + + /** + * 查询成员打卡记录 + * @param memberIdList 成员id列表 + * @return 打卡记录列表 + */ + List queryByMemberId(@Param("memberIdList") List memberIdList); + + /** + * 查询该成员今天是否有打卡记录 + * @param memberId 成员id + * @param currentTimeMillis 当前时间时间戳 + * @return 打卡记录 + */ + ProClockingIn queryHaveData(@Param("memberId") Long memberId, @Param("time") long currentTimeMillis); + + /** + * 查询上一次打卡的检查人 + * @param memberId 打卡人id + * @return 上一次检查人的信息 + */ + CClockingInVo.LastChecker queryLastChecker(@Param("memberId") Long memberId); +} diff --git a/src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverCheckerDao.java b/src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverCheckerDao.java new file mode 100644 index 0000000..280c976 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverCheckerDao.java @@ -0,0 +1,9 @@ +package com.ccsens.defaultwbs.persist.dao; + +import com.ccsens.common.persist.mapper.ProDeliverCheckerMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProDeliverCheckerDao extends ProDeliverCheckerMapper { + +} diff --git a/src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverDao.java b/src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverDao.java new file mode 100644 index 0000000..0935a53 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverDao.java @@ -0,0 +1,26 @@ +package com.ccsens.defaultwbs.persist.dao; + +import com.ccsens.common.bean.dto.CDeliverDto; +import com.ccsens.common.bean.vo.CDeliverVo; +import com.ccsens.common.persist.mapper.ProDeliverMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ProDeliverDao extends ProDeliverMapper { + + /** + * 根据任务id查询交付物记录 + * @param params 任务id + * @return 交付物记录列表 + */ + List queryDeliverOfTask(CDeliverDto.QueryDeliverOfTask params); + + /** + * 查询项目下的所有任务交付记录 + * @param params 项目id + * @return 所有项目及交付物 + */ + List queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params); +} diff --git a/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProClockingInMapper.java b/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProClockingInMapper.java new file mode 100644 index 0000000..a266ac2 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProClockingInMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.defaultwbs.persist.mapper; + +import com.ccsens.defaultwbs.bean.po.ProClockingIn; +import com.ccsens.defaultwbs.bean.po.ProClockingInExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProClockingInMapper { + long countByExample(ProClockingInExample example); + + int deleteByExample(ProClockingInExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProClockingIn record); + + int insertSelective(ProClockingIn record); + + List selectByExample(ProClockingInExample example); + + ProClockingIn selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProClockingIn record, @Param("example") ProClockingInExample example); + + int updateByExample(@Param("record") ProClockingIn record, @Param("example") ProClockingInExample example); + + int updateByPrimaryKeySelective(ProClockingIn record); + + int updateByPrimaryKey(ProClockingIn record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProDeliverCheckerMapper.java b/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProDeliverCheckerMapper.java new file mode 100644 index 0000000..e51faed --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProDeliverCheckerMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.defaultwbs.persist.mapper; + +import com.ccsens.defaultwbs.bean.po.ProDeliverChecker; +import com.ccsens.defaultwbs.bean.po.ProDeliverCheckerExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProDeliverCheckerMapper { + long countByExample(ProDeliverCheckerExample example); + + int deleteByExample(ProDeliverCheckerExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProDeliverChecker record); + + int insertSelective(ProDeliverChecker record); + + List selectByExample(ProDeliverCheckerExample example); + + ProDeliverChecker selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProDeliverChecker record, @Param("example") ProDeliverCheckerExample example); + + int updateByExample(@Param("record") ProDeliverChecker record, @Param("example") ProDeliverCheckerExample example); + + int updateByPrimaryKeySelective(ProDeliverChecker record); + + int updateByPrimaryKey(ProDeliverChecker record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProDeliverMapper.java b/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProDeliverMapper.java new file mode 100644 index 0000000..ba6136b --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/persist/mapper/ProDeliverMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.defaultwbs.persist.mapper; + +import com.ccsens.defaultwbs.bean.po.ProDeliver; +import com.ccsens.defaultwbs.bean.po.ProDeliverExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProDeliverMapper { + long countByExample(ProDeliverExample example); + + int deleteByExample(ProDeliverExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProDeliver record); + + int insertSelective(ProDeliver record); + + List selectByExample(ProDeliverExample example); + + ProDeliver selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProDeliver record, @Param("example") ProDeliverExample example); + + int updateByExample(@Param("record") ProDeliver record, @Param("example") ProDeliverExample example); + + int updateByPrimaryKeySelective(ProDeliver record); + + int updateByPrimaryKey(ProDeliver record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java b/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java new file mode 100644 index 0000000..20a5252 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java @@ -0,0 +1,356 @@ +package com.ccsens.defaultwbs.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.common.bean.po.ProMember; +import com.ccsens.common.bean.vo.CClockingInVo; +import com.ccsens.common.persist.dao.ProMemberDao; +import com.ccsens.common.util.CommonCodeError; +import com.ccsens.defaultwbs.bean.dto.ClockingInDto; +import com.ccsens.defaultwbs.bean.po.ProClockingIn; + +import com.ccsens.defaultwbs.bean.vo.ClockingInVo; +import com.ccsens.defaultwbs.persist.dao.ProClockingInDao; + +import com.ccsens.util.PoiUtil; +import com.ccsens.util.PropUtil; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class ClockingInService implements IClockingInService { + + @Resource + private ProMemberDao memberDao; + @Resource + private ProClockingInDao clockingInDao; + @Resource + private Snowflake snowflake; + + @Override + public List queryClockingIn(ClockingInDto.QueryClockingIn params, Long userId) { + //返回值 + List list = new ArrayList<>(); + //创建时间 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Date startTimeParam = new Date(params.getStartTime()); + Date endTimeParam = new Date(params.getEndTime()); + long dayDifference = DateUtil.betweenDay(startTimeParam, endTimeParam, false)+1; + GregorianCalendar calendar = new GregorianCalendar(); + calendar.setTime(startTimeParam); + ClockingInVo.ClockingInInfo start = new ClockingInVo.ClockingInInfo(); + start.setDateTime(format.format(startTimeParam)); + list.add(start); + for (long i = 1; i < dayDifference; i++) { + calendar.add(Calendar.DATE,1); + Date time = calendar.getTime(); + ClockingInVo.ClockingInInfo clockingInInfo = new ClockingInVo.ClockingInInfo(); + clockingInInfo.setDateTime(format.format(time)); + list.add(clockingInInfo); + } + ClockingInVo.ClockingInInfo end = new ClockingInVo.ClockingInInfo(); + end.setDateTime(format.format(endTimeParam)); + list.add(end); + + //添加成员信息 + //1.查询全部 + + List memberIdList = new ArrayList<>(); + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + memberIdList.add(userOfMemberId); + ProMember member = memberDao.queryMemberOfRole(userOfMemberId,params.getRoleId()); + if (CollectionUtil.isEmpty(params.getMemberIdList())){ + List clockRecordList = memberDao.queryMembersOfClock(params.getProjectId(),userOfMemberId,params.getRoleId()); + memberIdList.addAll(clockRecordList.stream().map(CClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList())); + for (ClockingInVo.ClockingInInfo clockingInInfo : list) { + if (ObjectUtil.isNotNull(member)) { + ClockingInVo.ClockRecord clockRecord = new ClockingInVo.ClockRecord(); + clockRecord.setMemberId(member.getId()); + clockRecord.setMemberName(member.getName()); + clockRecord.setMemberUserId(member.getUserId()); + clockingInInfo.getRecordList().add(clockRecord); + if (member.getUserId().equals(clockRecord.getMemberUserId())) { + clockRecord.setIsMine((byte)1); + } + } + for (CClockingInVo.ClockRecord record : clockRecordList) { + ClockingInVo.ClockRecord otherClockRecord = new ClockingInVo.ClockRecord(); + otherClockRecord.setMemberId(record.getMemberId()); + otherClockRecord.setMemberName(record.getMemberName()); + otherClockRecord.setMemberUserId(record.getMemberUserId()); + clockingInInfo.getRecordList().add(otherClockRecord); + if (member.getUserId().equals(otherClockRecord.getMemberUserId())) { + record.setIsMine((byte)1); + } + } + } + }else { + //2.筛选成员 + List clockRecordList = memberDao.queryMemberByIdList(params.getMemberIdList(),params.getRoleId()); + if (CollectionUtil.isNotEmpty(clockRecordList)) { + memberIdList.addAll(clockRecordList.stream().map(CClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList())); + for (ClockingInVo.ClockingInInfo clockingInInfo : list) { + for (CClockingInVo.ClockRecord clockRecord : clockRecordList) { + ClockingInVo.ClockRecord filterRecord = new ClockingInVo.ClockRecord(); + filterRecord.setMemberId(clockRecord.getMemberId()); + filterRecord.setMemberName(clockRecord.getMemberName()); + filterRecord.setMemberUserId(clockRecord.getMemberUserId()); + if (filterRecord.getMemberUserId().equals(userId)) { + filterRecord.setIsMine((byte)1); + } + clockingInInfo.getRecordList().add(filterRecord); + } + } + } + + } + + //查询所有成员打卡记录 + if (CollectionUtil.isNotEmpty(memberIdList)) { + List clockRecords = clockingInDao.queryByMemberId(memberIdList); + for (ClockingInVo.ClockingInInfo clockingInInfo2 : list) { + for (CClockingInVo.ClockRecord record : clockRecords) { + if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime()) || format.format(new Date(record.getNight())).equals(clockingInInfo2.getDateTime())) { + for (ClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) { + if (clockRecord.getMemberId().equals(record.getMemberId())) { + + clockRecord.setId(record.getId()); + clockRecord.setMemberName(record.getMemberName()); + clockRecord.setMemberId(record.getMemberId()); + clockRecord.setCheckerName(record.getCheckerName()); + clockRecord.setCheckerId(record.getCheckerId()); + clockRecord.setMorning(record.getMorning()); + clockRecord.setMorningStatus(record.getMorningStatus()); + clockRecord.setNight(record.getNight()); + clockRecord.setNightStatus(record.getNightStatus()); + if (record.getCheckerId().equals(member.getId())) { + clockRecord.setIsChecker((byte)1); + } + } + } + } + } + } + } + + List collect = list.stream().distinct().collect(Collectors.toList()); + //查询上次检查人 + for (ClockingInVo.ClockingInInfo clockingInInfo : collect) { + if (clockingInInfo.getDateTime().equals(format.format(new Date(System.currentTimeMillis())))) { + for (ClockingInVo.ClockRecord clockRecord : clockingInInfo.getRecordList()) { + CClockingInVo.LastChecker lastChecker = clockingInDao.queryLastChecker(clockRecord.getMemberId()); + if (ObjectUtil.isNotNull(lastChecker)) { + clockRecord.setLastCheckerId(lastChecker.getLastCheckerId()); + clockRecord.setLastCheckerName(lastChecker.getLastCheckerName()); + } + } + } + } + return collect; + } + + @Override + public void punchTheClock(ClockingInDto.PunchTheClock params, Long userId) { + //判断选择打卡的成员和当前用户是否匹配 + ProMember proMember = memberDao.selectByPrimaryKey(params.getMemberId()); + if(ObjectUtil.isNull(proMember) || !proMember.getUserId().equals(userId)){ + throw new BaseException(CommonCodeError.MEMBER_NOT_MINE); + } + //验证打卡日期是否是今天 + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String format = df.format(new Date()); + log.info("获取今天的日期：{}",format); + if(!format.equalsIgnoreCase(df.format(new Date(params.getDateTime())))){ + throw new BaseException(CommonCodeError.DATE_ERROR); + } + //判断是否有打卡记录 + ProClockingIn proClockingIn = clockingInDao.queryHaveData(params.getMemberId(),System.currentTimeMillis()); + if(ObjectUtil.isNotNull(proClockingIn)){ + //如果有记录则查找记录并修改 +// ProClockingIn proClockingIn = clockingInDao.selectByPrimaryKey(params.getId()); + if(params.getClockType() == 0 && proClockingIn.getMorningStatus() == 0){ + proClockingIn.setMorning(System.currentTimeMillis()); + proClockingIn.setMorningStatus((byte) 1); + }else if(params.getClockType() == 1 && proClockingIn.getNightStatus() == 0){ + proClockingIn.setNight(System.currentTimeMillis()); + proClockingIn.setNightStatus((byte) 1); + } + proClockingIn.setCheckerId(params.getCheckerId()); + clockingInDao.updateByPrimaryKeySelective(proClockingIn); + }else { + //如果没有记录，则添加一条新的记录 + ProClockingIn newClockingIn = new ProClockingIn(); + newClockingIn.setId(snowflake.nextId()); + newClockingIn.setMemberId(params.getMemberId()); + newClockingIn.setCheckerId(params.getCheckerId()); + if(params.getClockType() == 0){ + newClockingIn.setMorning(System.currentTimeMillis()); + newClockingIn.setMorningStatus((byte) 1); + }else if(params.getClockType() == 1){ + newClockingIn.setNight(System.currentTimeMillis()); + newClockingIn.setNightStatus((byte) 1); + } + clockingInDao.insertSelective(newClockingIn); + } + + } + + @Override + public void auditRecord(ClockingInDto.Audit params, Long userId) { + ProClockingIn record = clockingInDao.selectByPrimaryKey(params.getId()); + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + if (!record.getCheckerId().equals(userOfMemberId)) { + throw new BaseException(CommonCodeError.NO_POWER); + } + //修改 + if (0 == params.getType()) { + ProClockingIn proClockingIn = new ProClockingIn(); + proClockingIn.setId(params.getId()); + if (ObjectUtil.isNotNull(params.getMorning())) { + proClockingIn.setMorning(params.getMorning()); + } + if (ObjectUtil.isNotNull(params.getNight())) { + proClockingIn.setNight(params.getNight()); + } + clockingInDao.updateByPrimaryKeySelective(proClockingIn); + } + //驳回 + if (1 == params.getType()) { + ProClockingIn proClockingIn = new ProClockingIn(); + proClockingIn.setId(params.getId()); + if (ObjectUtil.isNotNull(params.getMorning())) { + proClockingIn.setMorningStatus((byte)2); + } + if (ObjectUtil.isNotNull(params.getNight())) { + proClockingIn.setNightStatus((byte)2); + } + clockingInDao.updateByPrimaryKeySelective(proClockingIn); + } + //审核通过 + if (2 == params.getType()) { + ProClockingIn proClockingIn = new ProClockingIn(); + proClockingIn.setId(params.getId()); + if (ObjectUtil.isNotNull(params.getMorning())) { + proClockingIn.setMorningStatus((byte)3); + } + if (ObjectUtil.isNotNull(params.getNight())) { + proClockingIn.setNightStatus((byte)3); + } + clockingInDao.updateByPrimaryKeySelective(proClockingIn); + } + } + + @Override + public ClockingInVo.ExcelUrl exportRecord(ClockingInDto.QueryClockingIn params, Long userId) throws IOException { + log.info("开始调用查询考勤方法"); + List clockingInInfos = queryClockingIn(params, userId); + log.info("调用查询考勤方法结束{}",clockingInInfos); + Workbook workbook = new XSSFWorkbook(); + //空白格 + PoiUtil.PoiUtilCell blank = new PoiUtil.PoiUtilCell(); + //excel + List> list = new ArrayList<>(); + //第一行list + List firstCells = new ArrayList<>(); + //第二行list + List secondCells = new ArrayList<>(); + //第一行开始 + PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(); + poiUtilCell.setValue(""); + poiUtilCell.setColspan(1); + poiUtilCell.setRowspan(2); + firstCells.add(poiUtilCell); + //第二行开始 + secondCells.add(blank); + for (ClockingInVo.ClockingInInfo clockingInInfo : clockingInInfos) { + PoiUtil.PoiUtilCell cellOne = new PoiUtil.PoiUtilCell(); + cellOne.setValue(clockingInInfo.getDateTime()); + cellOne.setColspan(2); + cellOne.setRowspan(1); + firstCells.add(cellOne); + firstCells.add(blank); + PoiUtil.PoiUtilCell cellTwo = new PoiUtil.PoiUtilCell(); + cellTwo.setValue("早"); + secondCells.add(cellTwo); + PoiUtil.PoiUtilCell cellTwo2 = new PoiUtil.PoiUtilCell(); + cellTwo2.setValue("晚"); + secondCells.add(cellTwo2); + } + list.add(firstCells); + list.add(secondCells); + for (ClockingInVo.ClockingInInfo clockingInInfo : clockingInInfos) { + //添加考勤人员信息 + for (ClockingInVo.ClockRecord clockRecord : clockingInInfo.getRecordList()) { + List memberCells = new ArrayList<>(); + PoiUtil.PoiUtilCell cell = new PoiUtil.PoiUtilCell(); + cell.setValue(clockRecord.getMemberName()); + memberCells.add(cell); + list.add(memberCells); + } + break; + } + + SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); + for (ClockingInVo.ClockingInInfo clockingInInfo : clockingInInfos) { + for (int i = 0; i < clockingInInfo.getRecordList().size(); i++) { + List poiUtilCells = list.get(i + 2); + PoiUtil.PoiUtilCell morning = new PoiUtil.PoiUtilCell(); + if (ObjectUtil.isNull(clockingInInfo.getRecordList().get(i).getMorning()) || 0 == clockingInInfo.getRecordList().get(i).getMorning()){ + morning.setValue("未打卡"); + }else if (2 == clockingInInfo.getRecordList().get(i).getMorningStatus()){ + morning.setValue("已驳回"); + }else { + morning.setValue(format.format(new Date(clockingInInfo.getRecordList().get(i).getMorning()))); + } + poiUtilCells.add(morning); + PoiUtil.PoiUtilCell night = new PoiUtil.PoiUtilCell(); + if (ObjectUtil.isNull(clockingInInfo.getRecordList().get(i).getNight()) || 0 == clockingInInfo.getRecordList().get(i).getNight()){ + night.setValue("未打卡"); + }else if (2 == clockingInInfo.getRecordList().get(i).getNightStatus()){ + night.setValue("已驳回"); + }else { + night.setValue(format.format(new Date(clockingInInfo.getRecordList().get(i).getNight()))); + } + poiUtilCells.add(night); + + } + } + + + //导出操作 + String fileName = DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = PropUtil.path + fileName; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + + Workbook wbs = PoiUtil.exportWB("Sheet1", list, workbook); + OutputStream stream = new FileOutputStream(tmpFile); + wbs.write(stream); + stream.close(); + ClockingInVo.ExcelUrl excelUrl = new ClockingInVo.ExcelUrl(); + String url = PropUtil.imgDomain+fileName; + excelUrl.setUrl(url); + return excelUrl; + } +} diff --git a/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java b/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java new file mode 100644 index 0000000..259b044 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java @@ -0,0 +1,245 @@ +package com.ccsens.defaultwbs.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.defaultwbs.bean.dto.DeliverDto; +import com.ccsens.defaultwbs.bean.message.DeliverMessageWithChecker; +import com.ccsens.defaultwbs.bean.message.DeliverMessageWithUpload; +import com.ccsens.defaultwbs.bean.po.ProDeliver; +import com.ccsens.defaultwbs.bean.po.ProDeliverChecker; +import com.ccsens.defaultwbs.bean.po.ProMember; +import com.ccsens.defaultwbs.bean.po.ProTaskSub; +import com.ccsens.defaultwbs.bean.vo.DeliverVo; +import com.ccsens.defaultwbs.bean.vo.CMemberVo; +import com.ccsens.defaultwbs.bean.vo.CProjectVo; +import com.ccsens.defaultwbs.persist.dao.*; +import com.ccsens.defaultwbs.util.CommonCodeError; +import com.ccsens.util.JacksonUtil; +import com.ccsens.util.bean.message.defaultwbs.InMessage; +import com.ccsens.util.bean.message.defaultwbs.MessageConstant; +import com.ccsens.util.config.RabbitMQConfig; +import com.ccsens.util.exception.BaseException; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.core.AmqpTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * @author AUSU + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class DeliverService implements IDeliverService { + + @Resource + private ProMemberDao memberDao; + @Resource + private ProProjectDao projectDao; + @Resource + private ProTaskSubDao taskSubDao; + @Resource + private ProDeliverDao deliverDao; + @Resource + private ProDeliverCheckerDao deliverCheckerDao; + @Resource + private ProRoleTaskDao roleTaskDao; + @Resource + private ProRoleDao roleDao; + @Resource + private ProRoleMemberDao roleMemberDao; + @Resource + private Snowflake snowflake; + @Resource + private AmqpTemplate rabbitTemplate; + + @Override + public List queryChecker(DeliverDto.QueryChecker params, Long userId) { + return memberDao.queryChecker(params.getProjectId()); + } + + + @Override + public void saveDeliver(DeliverDto.SaveDeliver params, Long userId) throws Exception { + if (CollectionUtil.isEmpty(params.getCheckerList())) { + throw new BaseException(CommonCodeError.CHECKER_DONT_NULL); + } + CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId()); + if (ObjectUtil.isNull(projectById)) { + throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND); + } + ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(params.getTaskSubId()); + if (ObjectUtil.isNull(taskSub)) { + throw new BaseException(CommonCodeError.NOT_TASK); + } + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + if (ObjectUtil.isNull(userOfMemberId)) { + throw new BaseException(CommonCodeError.NO_POWER); + } + List userOfRoles = roleMemberDao.findMemberOfRoleIds(userOfMemberId); + //查看是否是我负责的任务 + if (CollectionUtil.isNotEmpty(userOfRoles)) { + List isMyTask = roleTaskDao.isMyTask(taskSub.getTaskDetailId(), userOfRoles); + if (CollectionUtil.isEmpty(isMyTask)) { + throw new BaseException(CommonCodeError.NO_POWER); + } + }else { + throw new BaseException(CommonCodeError.NO_POWER); + } + + ProDeliver proDeliver = new ProDeliver(); + proDeliver.setId(snowflake.nextId()); + proDeliver.setTaskSubId(params.getTaskSubId()); + proDeliver.setMemberId(userOfMemberId); + proDeliver.setContent(params.getContent()); + proDeliver.setProjectId(params.getProjectId()); + proDeliver.setTime(System.currentTimeMillis()); + deliverDao.insertSelective(proDeliver); + for (Long checkerId : params.getCheckerList()) { + ProDeliverChecker deliverChecker = new ProDeliverChecker(); + deliverChecker.setId(snowflake.nextId()); + deliverChecker.setDeliverId(proDeliver.getId()); + deliverChecker.setMemberId(checkerId); + deliverChecker.setStatus((byte)0); + deliverCheckerDao.insertSelective(deliverChecker); + } + //TODO 发送消息 + sendToDeliverUploadMessage(params, userId, taskSub.getTaskDetailId(), proDeliver.getId()); + } + + public void sendToDeliverUploadMessage(DeliverDto.SaveDeliver params, Long userId, Long taskDetailId, Long deliverId) throws Exception { + //获取任务所属的角色id + Long roleId = roleDao.getRoleIdByTaskDetailId(taskDetailId); + //获取成员id和成员名 + CMemberVo.MemberIdAndName memberIdAndName = memberDao.getByUserIdAndProjectId(params.getProjectId(), userId); + Long memberId = null; + String memberName = null; + if(ObjectUtil.isNotNull(memberIdAndName)){ + memberId = memberIdAndName.getId(); + memberName = memberIdAndName.getName(); + } + //发送的消息内容 + DeliverMessageWithUpload message = new DeliverMessageWithUpload(params.getTaskSubId(), + taskDetailId,deliverId,roleId,memberId,memberName); + //通过成员id批量获取userId + List userIdList = memberDao.queryUserIdByMemberId(params.getCheckerList()); + if(CollectionUtil.isNotEmpty(userIdList)){ + //获取接受者的userId + Set userIdSet = new HashSet<>(userIdList); + //封装成inMessage + InMessage inMessage = new InMessage(); + inMessage.setToDomain(MessageConstant.DomainType.User); + inMessage.setTos(userIdSet); + inMessage.setData(JacksonUtil.beanToJson(message)); + log.info("发送消息--上传交付物--：{}",inMessage); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, + JacksonUtil.beanToJson(inMessage)); + } + } + + + @Override + public List queryDeliverOfTask(DeliverDto.QueryDeliverOfTask params, Long userId) { + ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(params.getTaskSubId()); + if (ObjectUtil.isNull(taskSub)) { + throw new BaseException(CommonCodeError.NOT_TASK); + } + List deliverOfTask = deliverDao.queryDeliverOfTask(params); + if (CollectionUtil.isNotEmpty(deliverOfTask)) { + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + // 判断检查人是否是当前用户 + for (DeliverVo.DeliverOfTask deliver : deliverOfTask) { + if (CollectionUtil.isNotEmpty(deliver.getCheckerList())) { + for (DeliverVo.CheckerInfo checkerInfo : deliver.getCheckerList()) { + checkerInfo.setIsMine((byte)0); + if (checkerInfo.getCheckerId().equals(userOfMemberId)){ + checkerInfo.setIsMine((byte)1); + } + } + } + } + } + return deliverOfTask; + } + + + @Override + public void checkDeliver(DeliverDto.CheckDeliver params, Long userId) throws Exception { + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + ProDeliverChecker deliverChecker = deliverCheckerDao.selectByPrimaryKey(params.getCheckId()); + if (!userOfMemberId.equals(deliverChecker.getMemberId())) { + throw new BaseException(CommonCodeError.NO_POWER); + } + ProDeliverChecker deliverCheck = new ProDeliverChecker(); + deliverCheck.setId(params.getCheckId()); + deliverCheck.setStatus(params.getStatus()); + deliverCheck.setRemark(params.getRemark()); + deliverCheck.setScore(params.getScore()); + deliverCheckerDao.updateByPrimaryKeySelective(deliverCheck); + //TODO 发送消息 + sendToDeliverCheckerMessage(deliverChecker.getDeliverId(),params.getProjectId(),userId); + } + + private void sendToDeliverCheckerMessage(Long deliverId, Long projectId, Long userId) throws Exception { + Long subTaskId = null; + Long taskDetailId = null; + Long roleId = null; + Long memberId = null; + String memberName = null; + //获取任务信息 + ProDeliver deliver = deliverDao.selectByPrimaryKey(deliverId); + if(ObjectUtil.isNotNull(deliver)){ + subTaskId = deliver.getTaskSubId(); + ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(deliver.getTaskSubId()); + if(ObjectUtil.isNotNull(taskSub)){ + taskDetailId = taskSub.getTaskDetailId(); + //获取任务所属的角色id + roleId = roleDao.getRoleIdByTaskDetailId(taskDetailId); + } + } + //获取成员id和成员名 + CMemberVo.MemberIdAndName memberIdAndName = memberDao.getByUserIdAndProjectId(projectId, userId); + if(ObjectUtil.isNotNull(memberIdAndName)){ + memberId = memberIdAndName.getId(); + memberName = memberIdAndName.getName(); + } + //发送的消息内容 + DeliverMessageWithChecker checkerMessage = new DeliverMessageWithChecker(subTaskId,taskDetailId,deliverId,roleId,memberId,memberName); + //获取上传者的userId（消息接收者） + ProMember uploadMember = memberDao.selectByPrimaryKey(deliver.getMemberId()); + if(ObjectUtil.isNotNull(uploadMember)){ + Set userIdSet = new HashSet<>(); + userIdSet.add(uploadMember.getUserId().toString()); + //封装成inMessage + InMessage inMessage = new InMessage(); + inMessage.setToDomain(MessageConstant.DomainType.User); + inMessage.setTos(userIdSet); + inMessage.setData(JacksonUtil.beanToJson(checkerMessage)); + log.info("发送消息--检查交付物--：{}",inMessage); + rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, + JacksonUtil.beanToJson(inMessage)); + } + } + + + @Override + public PageInfo queryDeliverOfProject(DeliverDto.QueryDeliverOfProject params, Long userId) { + CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId()); + if (ObjectUtil.isNull(projectById)) { + throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND); + } + PageHelper.startPage(params.getPageNum(),params.getPageSize()); + List deliverOfTask = deliverDao.queryDeliverOfProject(params); + return new PageInfo<>(deliverOfTask); + } + +} diff --git a/src/main/java/com/ccsens/defaultwbs/service/IClockingInService.java b/src/main/java/com/ccsens/defaultwbs/service/IClockingInService.java new file mode 100644 index 0000000..5c3c53a --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/service/IClockingInService.java @@ -0,0 +1,43 @@ +package com.ccsens.defaultwbs.service; + +import com.ccsens.defaultwbs.bean.dto.ClockingInDto; +import com.ccsens.defaultwbs.bean.vo.ClockingInVo; + +import java.io.IOException; +import java.util.List; + +/** + * @author AUSU + */ +public interface IClockingInService { + + /** + * 查询考勤信息 + * @param params 参数 + * @param userId 当前用户userId + * @return 考勤信息 + */ + List queryClockingIn(ClockingInDto.QueryClockingIn params, Long userId); + + /** + * 打卡 + * @param params 参数 + * @param userId 当前用户userId + */ + void punchTheClock(ClockingInDto.PunchTheClock params, Long userId); + + /** + * 审核打卡时间 + * @param params 参数 + * @param userId 当前用户userId + */ + void auditRecord(ClockingInDto.Audit params, Long userId); + + /** + * 导出考勤记录 + * @param params 参数 + * @param userId 当前用户userId + * @return excel的路径 + */ + ClockingInVo.ExcelUrl exportRecord(ClockingInDto.QueryClockingIn params, Long userId) throws IOException; +} diff --git a/src/main/java/com/ccsens/defaultwbs/service/IDeliverService.java b/src/main/java/com/ccsens/defaultwbs/service/IDeliverService.java new file mode 100644 index 0000000..23c5e70 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/service/IDeliverService.java @@ -0,0 +1,51 @@ +package com.ccsens.defaultwbs.service; + +import com.ccsens.defaultwbs.bean.dto.DeliverDto; +import com.ccsens.defaultwbs.bean.vo.DeliverVo; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +/** + * @author AUSU + */ +public interface IDeliverService { + + /** + * 查询所有检查人 + * @param params 项目id + * @param userId 用户id + * @return 检查人列表 + */ + List queryChecker(DeliverDto.QueryChecker params, Long userId); + + /** + * 提交交付物 + * @param params 项目id + * @param userId 用户id + */ + void saveDeliver(DeliverDto.SaveDeliver params, Long userId) throws Exception; + + /** + * 查询任务的交付物历史记录 + * @param params 任务分解id + * @param userId 用户id + * @return 检查人列表 + */ + List queryDeliverOfTask(DeliverDto.QueryDeliverOfTask params, Long userId); + + /** + * 检查交付物 + * @param params 检查记录id + * @param userId 当前登录用户 + */ + void checkDeliver(DeliverDto.CheckDeliver params, Long userId) throws Exception; + + /** + * 查询项目的交付物历史记录 + * @param params 项目id + * @param userId 用户id + * @return 检查人列表 + */ + PageInfo queryDeliverOfProject(DeliverDto.QueryDeliverOfProject params, Long userId); +} diff --git a/src/main/resources/mapper_dao/ProClockingInDao.xml b/src/main/resources/mapper_dao/ProClockingInDao.xml new file mode 100644 index 0000000..6e48842 --- /dev/null +++ b/src/main/resources/mapper_dao/ProClockingInDao.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper_dao/ProDeliverCheckerDao.xml b/src/main/resources/mapper_dao/ProDeliverCheckerDao.xml new file mode 100644 index 0000000..74761ed --- /dev/null +++ b/src/main/resources/mapper_dao/ProDeliverCheckerDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper_dao/ProDeliverDao.xml b/src/main/resources/mapper_dao/ProDeliverDao.xml new file mode 100644 index 0000000..a358d28 --- /dev/null +++ b/src/main/resources/mapper_dao/ProDeliverDao.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/ProClockingInMapper.xml b/src/main/resources/mapper_raw/ProClockingInMapper.xml new file mode 100644 index 0000000..898545a --- /dev/null +++ b/src/main/resources/mapper_raw/ProClockingInMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, member_id, checker_id, morning, morning_status, night, night_status, created_at, + updated_at, rec_status + + + + + delete from t_pro_clocking_in + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_clocking_in + + + + + + insert into t_pro_clocking_in (id, member_id, checker_id, + morning, morning_status, night, + night_status, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT}, + #{morning,jdbcType=BIGINT}, #{morningStatus,jdbcType=TINYINT}, #{night,jdbcType=BIGINT}, + #{nightStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_clocking_in + + + id, + + + member_id, + + + checker_id, + + + morning, + + + morning_status, + + + night, + + + night_status, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{checkerId,jdbcType=BIGINT}, + + + #{morning,jdbcType=BIGINT}, + + + #{morningStatus,jdbcType=TINYINT}, + + + #{night,jdbcType=BIGINT}, + + + #{nightStatus,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_clocking_in + + + id = #{record.id,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + checker_id = #{record.checkerId,jdbcType=BIGINT}, + + + morning = #{record.morning,jdbcType=BIGINT}, + + + morning_status = #{record.morningStatus,jdbcType=TINYINT}, + + + night = #{record.night,jdbcType=BIGINT}, + + + night_status = #{record.nightStatus,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_clocking_in + set id = #{record.id,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + checker_id = #{record.checkerId,jdbcType=BIGINT}, + morning = #{record.morning,jdbcType=BIGINT}, + morning_status = #{record.morningStatus,jdbcType=TINYINT}, + night = #{record.night,jdbcType=BIGINT}, + night_status = #{record.nightStatus,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_clocking_in + + + member_id = #{memberId,jdbcType=BIGINT}, + + + checker_id = #{checkerId,jdbcType=BIGINT}, + + + morning = #{morning,jdbcType=BIGINT}, + + + morning_status = #{morningStatus,jdbcType=TINYINT}, + + + night = #{night,jdbcType=BIGINT}, + + + night_status = #{nightStatus,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_clocking_in + set member_id = #{memberId,jdbcType=BIGINT}, + checker_id = #{checkerId,jdbcType=BIGINT}, + morning = #{morning,jdbcType=BIGINT}, + morning_status = #{morningStatus,jdbcType=TINYINT}, + night = #{night,jdbcType=BIGINT}, + night_status = #{nightStatus,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/ProDeliverCheckerMapper.xml b/src/main/resources/mapper_raw/ProDeliverCheckerMapper.xml new file mode 100644 index 0000000..1b0bf5e --- /dev/null +++ b/src/main/resources/mapper_raw/ProDeliverCheckerMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, deliver_id, member_id, score, remark, status, created_at, updated_at, rec_status + + + + + delete from t_pro_deliver_checker + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_deliver_checker + + + + + + insert into t_pro_deliver_checker (id, deliver_id, member_id, + score, remark, status, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{score,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_deliver_checker + + + id, + + + deliver_id, + + + member_id, + + + score, + + + remark, + + + status, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{score,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{status,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_deliver_checker + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + score = #{record.score,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + status = #{record.status,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_deliver_checker + set id = #{record.id,jdbcType=BIGINT}, + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + score = #{record.score,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_deliver_checker + + + deliver_id = #{deliverId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + score = #{score,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_deliver_checker + set deliver_id = #{deliverId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + score = #{score,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + status = #{status,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/ProDeliverMapper.xml b/src/main/resources/mapper_raw/ProDeliverMapper.xml new file mode 100644 index 0000000..abef794 --- /dev/null +++ b/src/main/resources/mapper_raw/ProDeliverMapper.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_sub_id, member_id, file_id, file_path, content, project_id, time, created_at, + updated_at, rec_status + + + + + delete from t_pro_deliver + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_deliver + + + + + + insert into t_pro_deliver (id, task_sub_id, member_id, + file_id, file_path, content, + project_id, time, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{taskSubId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{fileId,jdbcType=BIGINT}, #{filePath,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, + #{projectId,jdbcType=BIGINT}, #{time,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_deliver + + + id, + + + task_sub_id, + + + member_id, + + + file_id, + + + file_path, + + + content, + + + project_id, + + + time, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskSubId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{fileId,jdbcType=BIGINT}, + + + #{filePath,jdbcType=VARCHAR}, + + + #{content,jdbcType=VARCHAR}, + + + #{projectId,jdbcType=BIGINT}, + + + #{time,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_deliver + + + id = #{record.id,jdbcType=BIGINT}, + + + task_sub_id = #{record.taskSubId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + file_id = #{record.fileId,jdbcType=BIGINT}, + + + file_path = #{record.filePath,jdbcType=VARCHAR}, + + + content = #{record.content,jdbcType=VARCHAR}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + time = #{record.time,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_deliver + set id = #{record.id,jdbcType=BIGINT}, + task_sub_id = #{record.taskSubId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=BIGINT}, + file_path = #{record.filePath,jdbcType=VARCHAR}, + content = #{record.content,jdbcType=VARCHAR}, + project_id = #{record.projectId,jdbcType=BIGINT}, + time = #{record.time,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_deliver + + + task_sub_id = #{taskSubId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + file_id = #{fileId,jdbcType=BIGINT}, + + + file_path = #{filePath,jdbcType=VARCHAR}, + + + content = #{content,jdbcType=VARCHAR}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + time = #{time,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_deliver + set task_sub_id = #{taskSubId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=BIGINT}, + file_path = #{filePath,jdbcType=VARCHAR}, + content = #{content,jdbcType=VARCHAR}, + project_id = #{projectId,jdbcType=BIGINT}, + time = #{time,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mbg.xml b/src/main/resources/mbg.xml index 3cf17e7..5eb50a2 100644 --- a/src/main/resources/mbg.xml +++ b/src/main/resources/mbg.xml @@ -58,7 +58,7 @@ -
+ @@ -78,6 +78,9 @@ +
+
+