Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleInformation.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleInformation.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleInformation.java (revision 23978) @@ -0,0 +1,182 @@ +package com.forgon.disinfectsystem.entity.basedatamanager.schedule; + +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import com.forgon.security.model.User; + +/** + * 排班信息 + * @author YanWeiNing + * + */ +@Entity +@Table(name = "ScheduleInformation") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class ScheduleInformation { + + /** + * 标识字段 + */ + private Long id; + + /** + * 所属班次 + */ + private ScheduleDefinition scheduleDefinition; + + /** + * 所属用户 + */ + //private User user; + + /** + * 所属用户排班 + */ + private UserSchedule userSchedule; + + /** + * 排班日期 + */ + private Date scheduleTime; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建用户id + */ + private Long createdUserId; + + /** + * 创建用户名称 + */ + private String createdUserName; + + /** + * 最后修改时间 + */ + private Date lastUpdateTime; + + /* + * 最后修改用户id + */ + private Long lastUpdateUserId; + + /** + * 最后修改用户名称 + */ + private String lastUpdateUserName; + + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @ManyToOne + @JoinColumn(name = "userSchedule_id") + public UserSchedule getUserSchedule() { + return userSchedule; + } + + public void setUserSchedule(UserSchedule userSchedule) { + this.userSchedule = userSchedule; + } + + @ManyToOne + @JoinColumn(name = "scheduleDefinition_id") + public ScheduleDefinition getScheduleDefinition() { + return scheduleDefinition; + } + + public void setScheduleDefinition(ScheduleDefinition scheduleDefinition) { + this.scheduleDefinition = scheduleDefinition; + } + +// @OneToOne +// @JoinColumn(name = "user_Id", referencedColumnName = "id") +// public User getUser() { +// return user; +// } +// +// +// public void setUser(User user) { +// this.user = user; +// } + + public Date getScheduleTime() { + return scheduleTime; + } + + public void setScheduleTime(Date scheduleTime) { + this.scheduleTime = scheduleTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Long getCreatedUserId() { + return createdUserId; + } + + public void setCreatedUserId(Long createdUserId) { + this.createdUserId = createdUserId; + } + + public String getCreatedUserName() { + return createdUserName; + } + + public void setCreatedUserName(String createdUserName) { + this.createdUserName = createdUserName; + } + + public Date getLastUpdateTime() { + return lastUpdateTime; + } + + public void setLastUpdateTime(Date lastUpdateTime) { + this.lastUpdateTime = lastUpdateTime; + } + + public Long getLastUpdateUserId() { + return lastUpdateUserId; + } + + public void setLastUpdateUserId(Long lastUpdateUserId) { + this.lastUpdateUserId = lastUpdateUserId; + } + + public String getLastUpdateUserName() { + return lastUpdateUserName; + } + + public void setLastUpdateUserName(String lastUpdateUserName) { + this.lastUpdateUserName = lastUpdateUserName; + } + +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/UserSchedule.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/UserSchedule.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/UserSchedule.java (revision 23978) @@ -0,0 +1,101 @@ +package com.forgon.disinfectsystem.entity.basedatamanager.schedule; + +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.CascadeType; + +/** + * 用户排班 + * @author YanWeiNing + * + */ +@Entity +@Table(name = "UserSchedule") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class UserSchedule { + + /** + * 标识字段 + */ + private Long id; + + /** + * 剩余休假天数 + */ + private Long holiDay; + + /** + * 所属用户id + */ + private Long userId; + + /** + * 所属用户名称 + */ + private String userName; + + /** + * 包含的排班信息 + */ + private List scheduleInformationList; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @OneToMany(fetch = FetchType.LAZY) + @Cascade(value = { CascadeType.ALL }) + @JoinColumn(name = "userSchedule_id") + public List getScheduleInformationList() { + return scheduleInformationList; + } + + public void setScheduleInformationList( + List scheduleInformationList) { + this.scheduleInformationList = scheduleInformationList; + } + + public Long getHoliDay() { + return holiDay; + } + + public void setHoliDay(Long holiDay) { + this.holiDay = holiDay; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + +} Index: forgon-core/src/main/java/com/forgon/log/model/Log.java =================================================================== diff -u -r23608 -r23978 --- forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 23608) +++ forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 23978) @@ -64,6 +64,7 @@ public static final String MODEL_MATERIALDEFINITION = "材料定义"; public static final String MODEL_EXPENSIVEGOODS = "高值耗材"; public static final String MODEL_CONTRACT = "合同模块"; + public static final String MODEL_SCHDEULE = "排班模块"; public static final String MODEL_WORKFLOW = "流程定义"; public static final String MODEL_USER = "用户定义"; public static final String MODEL_GoodsBinding = "物品绑定"; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleDefinition.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleDefinition.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleDefinition.java (revision 23978) @@ -0,0 +1,328 @@ +package com.forgon.disinfectsystem.entity.basedatamanager.schedule; + +import java.sql.Time; +import java.time.LocalTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import org.hibernate.annotations.CascadeType; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.Cascade; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +/** + * 班次定义表 + * @author YanWeiNing + * + */ +@Entity +@Table(name = "ScheduleDefinition") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class ScheduleDefinition { + + /** + * 标识字段 + */ + private Long id; + + /** + * 编号 + */ + private String serialNumber; + + /** + * 班次名称 + */ + private String sheduleName; + + /** + * 拼音 + */ + private String spelling; + + /** + * 五笔 + */ + private String wbCode; + + /** + * 科室编码 + */ + private String orgUnitCode; + + /** + * 所属科室名称 + */ + private String orgUnitName; + + /** + * 上班时间 + */ + private Date startWorkingTime; + + /** + * 下班时间 + */ + private Date endWorkingTime; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建用户id + */ + private Long createdUserId; + + /** + * 创建用户名称 + */ + private String createdUserName; + + /** + * 最后修改时间 + */ + private Date lastUpdateTime; + + /* + * 最后修改用户id + */ + private Long lastUpdateUserId; + + /** + * 最后修改用户名称 + */ + private String lastUpdateUserName; + + /** + * 备注 + */ + private String remark; + + + /** + * 操作状态：删除，添加，修改（用于历史记录查看） + */ + private String operationStatus; + public static final String OPERATIONSTATUS_ADD = "增加"; + public static final String OPERATIONSTATUS_UPDATE = "修改"; + public static final String OPERATIONSTATUS_DELETE = "删除"; + + /** + * 是否为源定义（用于区分历史数据，若true:则是源定义，若false:则是历史数据的） + */ + private Boolean isSource; + + /** + * 是否已删除（默认为false） + */ + private Boolean isDeleteStatus = false; + + + /** + * 排班关联的排班信息 + */ + @JsonIgnore + private List scheduleInformations = new ArrayList(); + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @OneToMany(fetch = FetchType.LAZY) + @Cascade(value = {CascadeType.ALL}) + @JoinColumn(name = "scheduleDefinition_id") + public List getScheduleInformations() { + return scheduleInformations; + } + + public void setScheduleInformations( + List scheduleInformations) { + this.scheduleInformations = scheduleInformations; + } + + public String getSheduleName() { + return sheduleName; + } + + public void setSheduleName(String sheduleName) { + this.sheduleName = sheduleName; + } + + public String getOrgUnitCode() { + return orgUnitCode; + } + + public void setOrgUnitCode(String orgUnitCode) { + this.orgUnitCode = orgUnitCode; + } + + public String getOrgUnitName() { + return orgUnitName; + } + + public void setOrgUnitName(String orgUnitName) { + this.orgUnitName = orgUnitName; + } + + public Date getCreateTime() { + return createTime; + } + + @Temporal(TemporalType.TIME) + public Date getStartWorkingTime() { + return startWorkingTime; + } + public void setStartWorkingTime(Date startWorkingTime) { + this.startWorkingTime = startWorkingTime; + } + + @Temporal(TemporalType.TIME) + public Date getEndWorkingTime() { + return endWorkingTime; + } + + public void setEndWorkingTime(Date endWorkingTime) { + this.endWorkingTime = endWorkingTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Long getCreatedUserId() { + return createdUserId; + } + + public void setCreatedUserId(Long createdUserId) { + this.createdUserId = createdUserId; + } + + public String getCreatedUserName() { + return createdUserName; + } + + public void setCreatedUserName(String createdUserName) { + this.createdUserName = createdUserName; + } + + public Date getLastUpdateTime() { + return lastUpdateTime; + } + + public void setLastUpdateTime(Date lastUpdateTime) { + this.lastUpdateTime = lastUpdateTime; + } + + public Long getLastUpdateUserId() { + return lastUpdateUserId; + } + + public void setLastUpdateUserId(Long lastUpdateUserId) { + this.lastUpdateUserId = lastUpdateUserId; + } + + public String getLastUpdateUserName() { + return lastUpdateUserName; + } + + public void setLastUpdateUserName(String lastUpdateUserName) { + this.lastUpdateUserName = lastUpdateUserName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + public String getOperationStatus() { + return operationStatus; + } + + public void setOperationStatus(String operationStatus) { + this.operationStatus = operationStatus; + } + + public String getSerialNumber() { + return serialNumber; + } + + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + + public Boolean getIsSource() { + return isSource; + } + + public void setIsSource(Boolean isSource) { + this.isSource = isSource; + } + + + public String getSpelling() { + return spelling; + } + + public void setSpelling(String spelling) { + this.spelling = spelling; + } + + public String getWbCode() { + return wbCode; + } + + public void setWbCode(String wbCode) { + this.wbCode = wbCode; + } + + public Boolean getIsDeleteStatus() { + return isDeleteStatus; + } + + public void setIsDeleteStatus(Boolean isDeleteStatus) { + this.isDeleteStatus = isDeleteStatus; + } + + @Override + public String toString() { + return "ScheduleDefinition [id=" + id + ", serialNumber=" + + serialNumber + ", sheduleName=" + sheduleName + ", spelling=" + + spelling + ", wbCode=" + wbCode + ", orgUnitCode=" + + orgUnitCode + ", orgUnitName=" + orgUnitName + + ", startWorkingTime=" + startWorkingTime + + ", endWorkingTime=" + endWorkingTime + ", createTime=" + + createTime + ", createdUserId=" + createdUserId + + ", createdUserName=" + createdUserName + ", lastUpdateTime=" + + lastUpdateTime + ", lastUpdateUserId=" + lastUpdateUserId + + ", lastUpdateUserName=" + lastUpdateUserName + ", remark=" + + remark + ", operationStatus=" + operationStatus + + ", isSource=" + isSource + ", isDeleteStatus=" + + isDeleteStatus + ", scheduleInformations=" + + scheduleInformations + "]"; + } + +}