Merge branch 'fix/context' into 'release'

context 转换到 abstractContext

See merge request o2oa/o2oa!1697

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java

@@ -69,199 +69,202 @@ public class AttendanceDetail extends SliceJpaObject {
 	 */
 	public static final String empNo_FIELDNAME = "empNo";
 	@FieldDescribe("员工号")
-	@Column( length = JpaObject.length_96B, name = ColumnNamePrefix + empNo_FIELDNAME)
+	@Column(length = JpaObject.length_96B, name = ColumnNamePrefix + empNo_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String empNo;
 
 	public static final String empName_FIELDNAME = "empName";
 	@FieldDescribe("员工姓名distinguishedName")
-	@Column( length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix + empName_FIELDNAME)
+	@Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix
+			+ empName_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String empName;
 
 	public static final String topUnitName_FIELDNAME = "topUnitName";
 	@FieldDescribe("顶层组织名称distinguishedName")
-	@Column( length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix + topUnitName_FIELDNAME)
+	@Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix
+			+ topUnitName_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String topUnitName;
 
 	public static final String unitName_FIELDNAME = "unitName";
 	@FieldDescribe("组织名称distinguishedName")
-	@Column( length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix + unitName_FIELDNAME)
+	@Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix
+			+ unitName_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String unitName;
 
 	public static final String recordDate_FIELDNAME = "recordDate";
 	@FieldDescribe("打卡记录日期")
 	@Temporal(TemporalType.TIMESTAMP)
-	@Column( name = ColumnNamePrefix + recordDate_FIELDNAME)
+	@Column(name = ColumnNamePrefix + recordDate_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private Date recordDate;
 
 	public static final String yearString_FIELDNAME = "yearString";
 	@FieldDescribe("打卡记录年份")
-	@Column( length = JpaObject.length_16B, name = ColumnNamePrefix + yearString_FIELDNAME)
+	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + yearString_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String yearString;
 
 	public static final String monthString_FIELDNAME = "monthString";
 	@FieldDescribe("打卡记录月份")
-	@Column( length = JpaObject.length_16B, name = ColumnNamePrefix + monthString_FIELDNAME)
+	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + monthString_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String monthString;
 
 	public static final String recordDateString_FIELDNAME = "recordDateString";
 	@FieldDescribe("打卡记录日期字符串")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + recordDateString_FIELDNAME)
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + recordDateString_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String recordDateString;
 
 	public static final String cycleYear_FIELDNAME = "cycleYear";
 	@FieldDescribe("统计周期年份")
-	@Column( length = JpaObject.length_16B, name = ColumnNamePrefix + cycleYear_FIELDNAME)
+	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + cycleYear_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String cycleYear;
 
 	public static final String cycleMonth_FIELDNAME = "cycleMonth";
 	@FieldDescribe("统计周期月份")
-	@Column( length = JpaObject.length_16B, name = ColumnNamePrefix + cycleMonth_FIELDNAME)
+	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + cycleMonth_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String cycleMonth;
 
 	public static final String selfHolidayDayTime_FIELDNAME = "selfHolidayDayTime";
 	@FieldDescribe("请假时段:上午|下午|全天")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + selfHolidayDayTime_FIELDNAME)
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + selfHolidayDayTime_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String selfHolidayDayTime = "无";
 
 	public static final String absentDayTime_FIELDNAME = "absentDayTime";
 	@FieldDescribe("缺勤时段:上午|下午|全天")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + absentDayTime_FIELDNAME)
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + absentDayTime_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String absentDayTime = "无";
 
 	public static final String abnormalDutyDayTime_FIELDNAME = "abnormalDutyDayTime";
 	@FieldDescribe("异常打卡时段:上午|下午|全天")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + abnormalDutyDayTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + abnormalDutyDayTime_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String abnormalDutyDayTime = "无";
 
 	public static final String getSelfHolidayDays_FIELDNAME = "getSelfHolidayDays";
 	@FieldDescribe("休假天数: 0|0.5|1")
-	@Column( name = ColumnNamePrefix + getSelfHolidayDays_FIELDNAME )
+	@Column(name = ColumnNamePrefix + getSelfHolidayDays_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private Double getSelfHolidayDays = 0.0;
 
 	public static final String onWorkTime_FIELDNAME = "onWorkTime";
 	@FieldDescribe("上班时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + onWorkTime_FIELDNAME)
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + onWorkTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String onWorkTime;
 
 	public static final String offWorkTime_FIELDNAME = "offWorkTime";
 	@FieldDescribe("下班时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + offWorkTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + offWorkTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String offWorkTime;
 
 	public static final String middayRestStartTime_FIELDNAME = "middayRestStartTime";
 	@FieldDescribe("午休开始时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + middayRestStartTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + middayRestStartTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String middayRestStartTime;
 
 	public static final String middayRestEndTime_FIELDNAME = "middayRestEndTime";
 	@FieldDescribe("午休结束时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + middayRestEndTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + middayRestEndTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String middayRestEndTime;
 
 	public static final String onDutyTime_FIELDNAME = "onDutyTime";
 	@FieldDescribe("上班打卡签到时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + onDutyTime_FIELDNAME)
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + onDutyTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String onDutyTime;
 
-	public static final String morningOffdutyTime_FIELDNAME = "morningOffdutyTime";
+	public static final String morningOffDutyTime_FIELDNAME = "morningOffDutyTime";
 	@FieldDescribe("上班下午打卡签退时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + morningOffdutyTime_FIELDNAME)
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + morningOffDutyTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String morningOffDutyTime;
 
 	public static final String afternoonOnDutyTime_FIELDNAME = "afternoonOnDutyTime";
 	@FieldDescribe("下午上班打卡签到时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + afternoonOnDutyTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + afternoonOnDutyTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String afternoonOnDutyTime;
 
 	public static final String offDutyTime_FIELDNAME = "offDutyTime";
 	@FieldDescribe("下班打卡签退时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + offDutyTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + offDutyTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String offDutyTime;
 
 	public static final String lateTimeDuration_FIELDNAME = "lateTimeDuration";
 	@FieldDescribe("迟到时长")
-	@Column( name = ColumnNamePrefix + lateTimeDuration_FIELDNAME)
+	@Column(name = ColumnNamePrefix + lateTimeDuration_FIELDNAME)
 	private Long lateTimeDuration = 0L;
 
 	public static final String leaveEarlierTimeDuration_FIELDNAME = "leaveEarlierTimeDuration";
 	@FieldDescribe("早退时长")
-	@Column( name = ColumnNamePrefix + leaveEarlierTimeDuration_FIELDNAME )
+	@Column(name = ColumnNamePrefix + leaveEarlierTimeDuration_FIELDNAME)
 	private Long leaveEarlierTimeDuration = 0L;
 
 	public static final String workOvertimeTimeDuration_FIELDNAME = "workOvertimeTimeDuration";
 	@FieldDescribe("加班时长")
-	@Column( name = ColumnNamePrefix + workOvertimeTimeDuration_FIELDNAME )
+	@Column(name = ColumnNamePrefix + workOvertimeTimeDuration_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private Long workOvertimeTimeDuration = 0L;
 
 	public static final String workTimeDuration_FIELDNAME = "workTimeDuration";
 	@FieldDescribe("出勤时长")
-	@Column( name = ColumnNamePrefix + workTimeDuration_FIELDNAME )
+	@Column(name = ColumnNamePrefix + workTimeDuration_FIELDNAME)
 	private Long workTimeDuration = 0L;
 
 	public static final String attendance_FIELDNAME = "attendance";
 	@FieldDescribe("出勤天数（0|0.5|1）")
-	@Column( name = ColumnNamePrefix + attendance_FIELDNAME )
+	@Column(name = ColumnNamePrefix + attendance_FIELDNAME)
 	private Double attendance = 1.0;
 
 	public static final String absence_FIELDNAME = "absence";
 	@FieldDescribe("缺勤天数（0|0.5|1）")
-	@Column( name = ColumnNamePrefix + absence_FIELDNAME )
+	@Column(name = ColumnNamePrefix + absence_FIELDNAME)
 	private Double absence = 0.0;
 
 	public static final String recordStatus_FIELDNAME = "recordStatus";
 	@FieldDescribe("记录状态：0-未分析 1-已分析")
-	@Column( name = ColumnNamePrefix + recordStatus_FIELDNAME )
+	@Column(name = ColumnNamePrefix + recordStatus_FIELDNAME)
 	private Integer recordStatus = 0;
 
 	public static final String batchName_FIELDNAME = "batchName";
 	@FieldDescribe("导入批次号:导入文件的ID")
-	@Column( length = JpaObject.length_96B, name = ColumnNamePrefix + batchName_FIELDNAME )
+	@Column(length = JpaObject.length_96B, name = ColumnNamePrefix + batchName_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String batchName;
 
 	public static final String description_FIELDNAME = "description";
 	@FieldDescribe("说明备注")
-	@Column( length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME)
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String description;
 
 	public static final String appealStatus_FIELDNAME = "appealStatus";
 	@FieldDescribe("申诉状态:0-未申诉，1-申诉中，-1-申诉未通过，9-申诉通过")
-	@Column( name = ColumnNamePrefix + appealStatus_FIELDNAME)
+	@Column(name = ColumnNamePrefix + appealStatus_FIELDNAME)
 	private Integer appealStatus = 0;
 
 	public static final String appealReason_FIELDNAME = "appealReason";
 	@FieldDescribe("申诉原因")
-	@Column( length = JpaObject.length_64B, name = ColumnNamePrefix + appealReason_FIELDNAME )
+	@Column(length = JpaObject.length_64B, name = ColumnNamePrefix + appealReason_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String appealReason;
 
 	public static final String appealProcessor_FIELDNAME = "appealProcessor";
 	@FieldDescribe("申诉处理人")
-	@Column( length = JpaObject.length_255B, name = ColumnNamePrefix + appealProcessor_FIELDNAME )
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + appealProcessor_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String appealProcessor;
 
@@ -269,105 +272,121 @@ public class AttendanceDetail extends SliceJpaObject {
 	@Lob
 	@Basic(fetch = FetchType.EAGER)
 	@FieldDescribe("申诉具体说明")
-	@Column( length = JpaObject.length_2K, name = ColumnNamePrefix + appealDescription_FIELDNAME )
+	@Column(length = JpaObject.length_2K, name = ColumnNamePrefix + appealDescription_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String appealDescription;
 
 	public static final String isHoliday_FIELDNAME = "isHoliday";
 	@FieldDescribe("是否法定节假日")
-	@Column( name = ColumnNamePrefix + isHoliday_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isHoliday_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private Boolean isHoliday = false;
 
 	public static final String isWorkday_FIELDNAME = "isWorkday";
 	@FieldDescribe("是否调休工作日")
-	@Column( name = ColumnNamePrefix + isWorkday_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isWorkday_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private Boolean isWorkday = false;
 
 	public static final String isGetSelfHolidays_FIELDNAME = "isGetSelfHolidays";
 	@FieldDescribe("是否休假")
-	@Column( name = ColumnNamePrefix + isGetSelfHolidays_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isGetSelfHolidays_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private Boolean isGetSelfHolidays = false;
 
 	public static final String isAbsent_FIELDNAME = "isAbsent";
 	@FieldDescribe("是否缺勤")
-	@Column( name = ColumnNamePrefix + isAbsent_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isAbsent_FIELDNAME)
 	private Boolean isAbsent = false;
 
 	public static final String isAbnormalDuty_FIELDNAME = "isAbnormalDuty";
 	@FieldDescribe("是否异常打卡")
-	@Column( name = ColumnNamePrefix + isAbnormalDuty_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isAbnormalDuty_FIELDNAME)
 	private Boolean isAbnormalDuty = false;
 
 	public static final String isLackOfTime_FIELDNAME = "isLackOfTime";
 	@FieldDescribe("是否工时不足")
-	@Column( name = ColumnNamePrefix + isLackOfTime_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isLackOfTime_FIELDNAME)
 	private Boolean isLackOfTime = false;
 
 	public static final String isWorkOvertime_FIELDNAME = "isWorkOvertime";
 	@FieldDescribe("是否加班")
-	@Column( name = ColumnNamePrefix + isWorkOvertime_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isWorkOvertime_FIELDNAME)
 	private Boolean isWorkOvertime = false;
 
 	public static final String isLeaveEarlier_FIELDNAME = "isLeaveEarlier";
 	@FieldDescribe("是否早退")
-	@Column( name = ColumnNamePrefix + isLeaveEarlier_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isLeaveEarlier_FIELDNAME)
 	private Boolean isLeaveEarlier = false;
 
 	public static final String isLate_FIELDNAME = "isLate";
 	@FieldDescribe("是否迟到")
-	@Column( name = ColumnNamePrefix + isLate_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isLate_FIELDNAME)
 	private Boolean isLate = false;
 
 	public static final String isWeekend_FIELDNAME = "isWeekend";
 	@FieldDescribe("是否周末")
-	@Column( name = ColumnNamePrefix + isWeekend_FIELDNAME )
+	@Column(name = ColumnNamePrefix + isWeekend_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private Boolean isWeekend = false;
 
 	public static final String archiveTime_FIELDNAME = "archiveTime";
 	@FieldDescribe("记录归档时间")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + archiveTime_FIELDNAME )
+	@Column(length = JpaObject.length_32B, name = ColumnNamePrefix + archiveTime_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String archiveTime;
 
-	public String getMorningOffDutyTime() { return morningOffDutyTime; }
+	public String getMorningOffDutyTime() {
+		return morningOffDutyTime;
+	}
 
-	public void setMorningOffDutyTime(String morningOffDutyTime) { this.morningOffDutyTime = morningOffDutyTime; }
+	public void setMorningOffDutyTime(String morningOffDutyTime) {
+		this.morningOffDutyTime = morningOffDutyTime;
+	}
 
-	public String getAfternoonOnDutyTime() { return afternoonOnDutyTime; }
+	public String getAfternoonOnDutyTime() {
+		return afternoonOnDutyTime;
+	}
 
-	public void setAfternoonOnDutyTime(String afternoonOnDutyTime) { this.afternoonOnDutyTime = afternoonOnDutyTime; }
+	public void setAfternoonOnDutyTime(String afternoonOnDutyTime) {
+		this.afternoonOnDutyTime = afternoonOnDutyTime;
+	}
 
 	/**
 	 * 获取是否工时不足
 	 * 
 	 * @return
 	 */
-	public Boolean getIsLackOfTime() { return isLackOfTime; }
+	public Boolean getIsLackOfTime() {
+		return isLackOfTime;
+	}
 
 	/**
 	 * 设置是否工时不足
 	 * 
 	 * @param isLackOfTime
 	 */
-	public void setIsLackOfTime(Boolean isLackOfTime) { this.isLackOfTime = isLackOfTime; }
+	public void setIsLackOfTime(Boolean isLackOfTime) {
+		this.isLackOfTime = isLackOfTime;
+	}
 
 	/**
 	 * 获取员工号（String）
 	 * 
 	 * @return
 	 */
-	public String getEmpNo() { return empNo; }
+	public String getEmpNo() {
+		return empNo;
+	}
 
 	/**
 	 * 设置员工号（String）
 	 * 
 	 * @param empNo
 	 */
-	public void setEmpNo(String empNo) { this.empNo = empNo; }
+	public void setEmpNo(String empNo) {
+		this.empNo = empNo;
+	}
 
 	/**
 	 * 获取员工姓名（String）
@@ -398,515 +417,678 @@ public class AttendanceDetail extends SliceJpaObject {
 	 * 
 	 * @return
 	 */
-	public Boolean getIsLate() { return isLate; }
+	public Boolean getIsLate() {
+		return isLate;
+	}
 
 	/**
 	 * 设置员工是否已经迟到（Integer）
 	 * 
 	 * @param isLate
 	 */
-	public void setIsLate(Boolean isLate) { this.isLate = isLate; }
+	public void setIsLate(Boolean isLate) {
+		this.isLate = isLate;
+	}
 
 	/**
 	 * 获取员工是否早退（Integer）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsLeaveEarlier() { return isLeaveEarlier; }
+	public Boolean getIsLeaveEarlier() {
+		return isLeaveEarlier;
+	}
 
 	/**
 	 * 设置员工是否早退（Integer）
 	 * 
 	 * @param isLeaveEarlier
 	 */
-	public void setIsLeaveEarlier(Boolean isLeaveEarlier) { this.isLeaveEarlier = isLeaveEarlier; }
+	public void setIsLeaveEarlier(Boolean isLeaveEarlier) {
+		this.isLeaveEarlier = isLeaveEarlier;
+	}
 
 	/**
 	 * 获取员工员工打卡记录日期（String）
 	 * 
 	 * @return
 	 */
-	public String getRecordDateString() { return recordDateString; }
+	public String getRecordDateString() {
+		return recordDateString;
+	}
 
 	/**
 	 * 设置员工员工打卡记录日期（String）
 	 * 
 	 * @param recordDateString
 	 */
-	public void setRecordDateString(String recordDateString) { this.recordDateString = recordDateString; }
+	public void setRecordDateString(String recordDateString) {
+		this.recordDateString = recordDateString;
+	}
 
 	/**
 	 * 获取员工员工打卡记录日期（Date）
 	 * 
 	 * @return
 	 */
-	public Date getRecordDate() { return recordDate; }
+	public Date getRecordDate() {
+		return recordDate;
+	}
 
 	/**
 	 * 设置员工员工打卡记录日期（Date）
 	 * 
 	 * @param recordDate
 	 */
-	public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
+	public void setRecordDate(Date recordDate) {
+		this.recordDate = recordDate;
+	}
 
 	/**
 	 * 获取员工打卡记录导入批次号-导入文件ID（String）
 	 * 
 	 * @return
 	 */
-	public String getBatchName() { return batchName; }
+	public String getBatchName() {
+		return batchName;
+	}
 
 	/**
 	 * 设置员工打卡记录导入批次号-导入文件ID（String）
 	 * 
 	 * @param batchName
 	 */
-	public void setBatchName(String batchName) { this.batchName = batchName; }
+	public void setBatchName(String batchName) {
+		this.batchName = batchName;
+	}
 
 	/**
 	 * 获取员工标准上班时间（String）
 	 * 
 	 * @return
 	 */
-	public String getOnWorkTime() { return onWorkTime; }
+	public String getOnWorkTime() {
+		return onWorkTime;
+	}
 
 	/**
 	 * 设置员工标准上班时间（String）
 	 * 
 	 * @param onWorkTime
 	 */
-	public void setOnWorkTime(String onWorkTime) { this.onWorkTime = onWorkTime; }
+	public void setOnWorkTime(String onWorkTime) {
+		this.onWorkTime = onWorkTime;
+	}
 
 	/**
 	 * 获取员工标准下班时间（String）
 	 * 
 	 * @return
 	 */
-	public String getOffWorkTime() { return offWorkTime; }
+	public String getOffWorkTime() {
+		return offWorkTime;
+	}
 
 	/**
 	 * 设置员工标准下班时间（String）
 	 * 
 	 * @param offWorkTime
 	 */
-	public void setOffWorkTime(String offWorkTime) { this.offWorkTime = offWorkTime; }
+	public void setOffWorkTime(String offWorkTime) {
+		this.offWorkTime = offWorkTime;
+	}
 
 	/**
 	 * 获取员工迟到时长（Long）
 	 * 
 	 * @return
 	 */
-	public Long getLateTimeDuration() { return lateTimeDuration; }
+	public Long getLateTimeDuration() {
+		return lateTimeDuration;
+	}
 
 	/**
 	 * 设置员工迟到时长（Long）
 	 * 
 	 * @param lateTimeDuration
 	 */
-	public void setLateTimeDuration(Long lateTimeDuration) { this.lateTimeDuration = lateTimeDuration; }
+	public void setLateTimeDuration(Long lateTimeDuration) {
+		this.lateTimeDuration = lateTimeDuration;
+	}
 
 	/**
 	 * 获取员工早退时长（Long）
 	 * 
 	 * @return
 	 */
-	public Long getLeaveEarlierTimeDuration() { return leaveEarlierTimeDuration; }
+	public Long getLeaveEarlierTimeDuration() {
+		return leaveEarlierTimeDuration;
+	}
 
 	/**
 	 * 设置员工早退时长（Long）
 	 * 
 	 * @param leaveEarlierTimeDuration
 	 */
-	public void setLeaveEarlierTimeDuration(Long leaveEarlierTimeDuration) { this.leaveEarlierTimeDuration = leaveEarlierTimeDuration; }
+	public void setLeaveEarlierTimeDuration(Long leaveEarlierTimeDuration) {
+		this.leaveEarlierTimeDuration = leaveEarlierTimeDuration;
+	}
 
 	/**
 	 * 获取员工是否缺勤（Integer）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsAbsent() { return isAbsent; }
+	public Boolean getIsAbsent() {
+		return isAbsent;
+	}
 
 	/**
 	 * 设置员工是否缺勤（Integer）
 	 * 
 	 * @param isAbsent
 	 */
-	public void setIsAbsent(Boolean isAbsent) { this.isAbsent = isAbsent; }
+	public void setIsAbsent(Boolean isAbsent) {
+		this.isAbsent = isAbsent;
+	}
 
 	/**
 	 * 获取员工是否加班（Integer）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsWorkOvertime() { return isWorkOvertime; }
+	public Boolean getIsWorkOvertime() {
+		return isWorkOvertime;
+	}
 
 	/**
 	 * 设置员工是否加班（Integer）
 	 * 
 	 * @param isWorkOvertime
 	 */
-	public void setIsWorkOvertime(Boolean isWorkOvertime) { this.isWorkOvertime = isWorkOvertime; }
+	public void setIsWorkOvertime(Boolean isWorkOvertime) {
+		this.isWorkOvertime = isWorkOvertime;
+	}
 
 	/**
 	 * 获取员工加班时长（Long）
 	 * 
 	 * @return
 	 */
-	public Long getWorkOvertimeTimeDuration() { return workOvertimeTimeDuration; }
+	public Long getWorkOvertimeTimeDuration() {
+		return workOvertimeTimeDuration;
+	}
 
 	/**
 	 * 设置员工加班时长（Long）
 	 * 
 	 * @param workOvertimeTimeDuration
 	 */
-	public void setWorkOvertimeTimeDuration(Long workOvertimeTimeDuration) { this.workOvertimeTimeDuration = workOvertimeTimeDuration; }
+	public void setWorkOvertimeTimeDuration(Long workOvertimeTimeDuration) {
+		this.workOvertimeTimeDuration = workOvertimeTimeDuration;
+	}
 
 	/**
 	 * 获取当天是否为法定节假日（Integer）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsHoliday() { return isHoliday; }
+	public Boolean getIsHoliday() {
+		return isHoliday;
+	}
 
 	/**
 	 * 设置当天是否为法定节假日（Integer）
 	 * 
 	 * @param isHoliday
 	 */
-	public void setIsHoliday(Boolean isHoliday) { this.isHoliday = isHoliday; }
+	public void setIsHoliday(Boolean isHoliday) {
+		this.isHoliday = isHoliday;
+	}
 
 	/**
 	 * 获取员工出勤时长（分钟）（Long）
 	 * 
 	 * @return
 	 */
-	public Long getWorkTimeDuration() { return workTimeDuration; }
+	public Long getWorkTimeDuration() {
+		return workTimeDuration;
+	}
 
 	/**
 	 * 设置员工出勤时长（分钟）（Long）
 	 * 
 	 * @param workTimeDuration
 	 */
-	public void setWorkTimeDuration(Long workTimeDuration) { this.workTimeDuration = workTimeDuration; }
+	public void setWorkTimeDuration(Long workTimeDuration) {
+		this.workTimeDuration = workTimeDuration;
+	}
 
 	/**
 	 * 获取员工出勤天数（0，0.5，1）（Double）
 	 * 
 	 * @return
 	 */
-	public Double getAttendance() { return attendance; }
+	public Double getAttendance() {
+		return attendance;
+	}
 
 	/**
 	 * 设置员工出勤天数（0，0.5，1）（Double）
 	 * 
 	 * @param attendance
 	 */
-	public void setAttendance(Double attendance) { this.attendance = attendance; }
+	public void setAttendance(Double attendance) {
+		this.attendance = attendance;
+	}
 
 	/**
 	 * 获取员工上班打卡时间（String）
 	 * 
 	 * @return
 	 */
-	public String getOnDutyTime() { return onDutyTime; }
+	public String getOnDutyTime() {
+		return onDutyTime;
+	}
 
 	/**
 	 * 设置员工上班打卡时间（String）
 	 * 
 	 * @param onDutyTime
 	 */
-	public void setOnDutyTime(String onDutyTime) { this.onDutyTime = onDutyTime; }
+	public void setOnDutyTime(String onDutyTime) {
+		this.onDutyTime = onDutyTime;
+	}
 
 	/**
 	 * 获取员工下班打卡时间（String）
 	 * 
 	 * @return
 	 */
-	public String getOffDutyTime() { return offDutyTime; }
+	public String getOffDutyTime() {
+		return offDutyTime;
+	}
 
 	/**
 	 * 设置员工下班打卡时间（String）
 	 * 
 	 * @param offDutyTime
 	 */
-	public void setOffDutyTime(String offDutyTime) { this.offDutyTime = offDutyTime; }
+	public void setOffDutyTime(String offDutyTime) {
+		this.offDutyTime = offDutyTime;
+	}
 
 	/**
 	 * 获取员工打卡记录分析状态：0-未分析 1-已分析 -1-分析有错误（String）
 	 * 
 	 * @return
 	 */
-	public Integer getRecordStatus() { return recordStatus; }
+	public Integer getRecordStatus() {
+		return recordStatus;
+	}
 
 	/**
 	 * 设置员工打卡记录分析状态：0-未分析 1-已分析 -1-分析有错误（String）
 	 * 
 	 * @param recordStatus
 	 */
-	public void setRecordStatus(Integer recordStatus) { this.recordStatus = recordStatus; }
+	public void setRecordStatus(Integer recordStatus) {
+		this.recordStatus = recordStatus;
+	}
 
 	/**
 	 * 获取员工打卡当天是否调休的工作日（String）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsWorkday() { return isWorkday; }
+	public Boolean getIsWorkday() {
+		return isWorkday;
+	}
 
 	/**
 	 * 设置员工打卡当天是否调休的工作日（String）
 	 * 
 	 * @param isWorkday
 	 */
-	public void setIsWorkday(Boolean isWorkday) { this.isWorkday = isWorkday; }
+	public void setIsWorkday(Boolean isWorkday) {
+		this.isWorkday = isWorkday;
+	}
 
 	/**
 	 * 获取员工打卡当天是否周末（String）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsWeekend() { return isWeekend; }
+	public Boolean getIsWeekend() {
+		return isWeekend;
+	}
 
 	/**
 	 * 设置员工打卡当天是否周末（String）
 	 * 
 	 * @param isWeekend
 	 */
-	public void setIsWeekend(Boolean isWeekend) { this.isWeekend = isWeekend; }
+	public void setIsWeekend(Boolean isWeekend) {
+		this.isWeekend = isWeekend;
+	}
 
 	/**
 	 * 获取员工打卡记录分析处理说明：系统分析时自动填写（String）
 	 * 
 	 * @return
 	 */
-	public String getDescription() { return description; }
+	public String getDescription() {
+		return description;
+	}
 
 	/**
 	 * 设置员工打卡记录分析处理说明：系统分析时自动填写（String）
 	 * 
 	 * @param description
 	 */
-	public void setDescription(String description) { this.description = description; }
+	public void setDescription(String description) {
+		this.description = description;
+	}
 
 	/**
 	 * 获取员工所属顶层组织名称（String）
 	 * 
 	 * @return
 	 */
-	public String getTopUnitName() { return topUnitName; }
+	public String getTopUnitName() {
+		return topUnitName;
+	}
 
 	/**
 	 * 设置员工所属顶层组织名称（String）
 	 * 
 	 * @param topUnitName
 	 */
-	public void setTopUnitName(String topUnitName) { this.topUnitName = topUnitName; }
+	public void setTopUnitName(String topUnitName) {
+		this.topUnitName = topUnitName;
+	}
 
 	/**
 	 * 获取员工所属组织名称（String）
 	 * 
 	 * @return
 	 */
-	public String getUnitName() { return unitName; }
+	public String getUnitName() {
+		return unitName;
+	}
 
 	/**
 	 * 设置员工所属组织名称（String）
 	 * 
 	 * @param unitName
 	 */
-	public void setUnitName(String unitName) { this.unitName = unitName; }
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
 
 	/**
 	 * 获取员工打卡记录所在年份（String）
 	 * 
 	 * @return
 	 */
-	public String getYearString() { return yearString; }
+	public String getYearString() {
+		return yearString;
+	}
 
 	/**
 	 * 设置员工打卡记录所在年份（String）
 	 * 
 	 * @param yearString
 	 */
-	public void setYearString(String yearString) { this.yearString = yearString; }
+	public void setYearString(String yearString) {
+		this.yearString = yearString;
+	}
 
 	/**
 	 * 获取员工打卡记录所在月份（String）
 	 * 
 	 * @return
 	 */
-	public String getMonthString() { return monthString; }
+	public String getMonthString() {
+		return monthString;
+	}
 
 	/**
 	 * 设置员工打卡记录所在月份（String）
 	 * 
 	 * @param monthString
 	 */
-	public void setMonthString(String monthString) { this.monthString = monthString; }
+	public void setMonthString(String monthString) {
+		this.monthString = monthString;
+	}
 
 	/**
 	 * 获取员工是否处于休假中（Integer）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsGetSelfHolidays() { return isGetSelfHolidays; }
+	public Boolean getIsGetSelfHolidays() {
+		return isGetSelfHolidays;
+	}
 
 	/**
 	 * 设置员工是否处于休假中（Integer）
 	 * 
 	 * @param isGetSelfHolidays
 	 */
-	public void setIsGetSelfHolidays(Boolean isGetSelfHolidays) { this.isGetSelfHolidays = isGetSelfHolidays; }
+	public void setIsGetSelfHolidays(Boolean isGetSelfHolidays) {
+		this.isGetSelfHolidays = isGetSelfHolidays;
+	}
 
 	/**
 	 * 获取休假时段：无，上午，下午，全天（String）
 	 * 
 	 * @return
 	 */
-	public String getSelfHolidayDayTime() { return selfHolidayDayTime; }
+	public String getSelfHolidayDayTime() {
+		return selfHolidayDayTime;
+	}
 
 	/**
 	 * 设置休假时段：无，上午，下午，全天（String）
 	 * 
 	 * @param selfHolidayDayTime
 	 */
-	public void setSelfHolidayDayTime(String selfHolidayDayTime) { this.selfHolidayDayTime = selfHolidayDayTime; }
+	public void setSelfHolidayDayTime(String selfHolidayDayTime) {
+		this.selfHolidayDayTime = selfHolidayDayTime;
+	}
 
 	/**
 	 * 获取员工休假天数：0,0.5,1（String）
 	 * 
 	 * @return
 	 */
-	public Double getGetSelfHolidayDays() { return getSelfHolidayDays; }
+	public Double getGetSelfHolidayDays() {
+		return getSelfHolidayDays;
+	}
 
 	/**
 	 * 设置员工休假天数：0,0.5,1（String）
 	 * 
 	 * @param getSelfHolidayDays
 	 */
-	public void setGetSelfHolidayDays(Double getSelfHolidayDays) { this.getSelfHolidayDays = getSelfHolidayDays; }
+	public void setGetSelfHolidayDays(Double getSelfHolidayDays) {
+		this.getSelfHolidayDays = getSelfHolidayDays;
+	}
 
 	/**
 	 * 获取员工缺勤天数：0,0.5,1（String）
 	 * 
 	 * @return
 	 */
-	public Double getAbsence() { return absence; }
+	public Double getAbsence() {
+		return absence;
+	}
 
 	/**
 	 * 设置员工缺勤天数：0,0.5,1（String）
 	 * 
 	 * @param absence
 	 */
-	public void setAbsence(Double absence) { this.absence = absence; }
+	public void setAbsence(Double absence) {
+		this.absence = absence;
+	}
 
 	/**
 	 * 获取员工打卡记录分析结果申诉状态:0-未申诉，1-申诉中，-1-申诉未通过，9-申诉通过
 	 * 
 	 * @return
 	 */
-	public Integer getAppealStatus() { return appealStatus; }
+	public Integer getAppealStatus() {
+		return appealStatus;
+	}
 
 	/**
 	 * 获取员工打卡记录分析结果申诉状态:0-未申诉，1-申诉中，-1-申诉未通过，9-申诉通过
 	 * 
 	 * @param appealStatus
 	 */
-	public void setAppealStatus(Integer appealStatus) { this.appealStatus = appealStatus; }
+	public void setAppealStatus(Integer appealStatus) {
+		this.appealStatus = appealStatus;
+	}
 
 	/**
 	 * 获取员工打卡记录分析结果申诉简要理由（String）
 	 * 
 	 * @return
 	 */
-	public String getAppealReason() { return appealReason; }
+	public String getAppealReason() {
+		return appealReason;
+	}
 
 	/**
 	 * 设置员工打卡记录分析结果申诉简要理由（String）
 	 * 
 	 * @param appealReason
 	 */
-	public void setAppealReason(String appealReason) { this.appealReason = appealReason; }
+	public void setAppealReason(String appealReason) {
+		this.appealReason = appealReason;
+	}
 
 	/**
 	 * 获取员工打卡记录分析结果申诉详细理由（String）
 	 * 
 	 * @return
 	 */
-	public String getAppealDescription() { return appealDescription; }
+	public String getAppealDescription() {
+		return appealDescription;
+	}
 
 	/**
 	 * 设置员工打卡记录分析结果申诉详细理由（String）
 	 * 
 	 * @param appealDescription
 	 */
-	public void setAppealDescription(String appealDescription) { this.appealDescription = appealDescription; }
+	public void setAppealDescription(String appealDescription) {
+		this.appealDescription = appealDescription;
+	}
 
 	/**
 	 * 获取员工缺勤时段：无，上午，下午，全天（String）
 	 * 
 	 * @return
 	 */
-	public String getAbsentDayTime() { return absentDayTime; }
+	public String getAbsentDayTime() {
+		return absentDayTime;
+	}
 
 	/**
 	 * 设置员工缺勤时段：无，上午，下午，全天（String）
 	 * 
 	 * @param absentDayTime
 	 */
-	public void setAbsentDayTime(String absentDayTime) { this.absentDayTime = absentDayTime; }
+	public void setAbsentDayTime(String absentDayTime) {
+		this.absentDayTime = absentDayTime;
+	}
 
 	/**
 	 * 获取员工打卡异常时段：无，上午，下午，全天（String）
 	 * 
 	 * @return
 	 */
-	public String getAbnormalDutyDayTime() { return abnormalDutyDayTime; }
+	public String getAbnormalDutyDayTime() {
+		return abnormalDutyDayTime;
+	}
 
 	/**
 	 * 设置员工打卡异常时段：无，上午，下午，全天（String）
 	 * 
 	 * @param abnormalDutyDayTime
 	 */
-	public void setAbnormalDutyDayTime(String abnormalDutyDayTime) { this.abnormalDutyDayTime = abnormalDutyDayTime; }
+	public void setAbnormalDutyDayTime(String abnormalDutyDayTime) {
+		this.abnormalDutyDayTime = abnormalDutyDayTime;
+	}
 
 	/**
 	 * 获取员工是否打卡异常（Integer）
 	 * 
 	 * @return
 	 */
-	public Boolean getIsAbnormalDuty() { return isAbnormalDuty; }
+	public Boolean getIsAbnormalDuty() {
+		return isAbnormalDuty;
+	}
 
 	/**
 	 * 设置员工是否打卡异常（Integer）
 	 * 
 	 * @param isAbnormalDuty
 	 */
-	public void setIsAbnormalDuty(Boolean isAbnormalDuty) { this.isAbnormalDuty = isAbnormalDuty; }
-
-	public String getCycleYear() { return cycleYear; }
+	public void setIsAbnormalDuty(Boolean isAbnormalDuty) {
+		this.isAbnormalDuty = isAbnormalDuty;
+	}
 
-	public void setCycleYear(String cycleYear) { this.cycleYear = cycleYear; }
+	public String getCycleYear() {
+		return cycleYear;
+	}
 
-	public String getCycleMonth() { return cycleMonth; }
+	public void setCycleYear(String cycleYear) {
+		this.cycleYear = cycleYear;
+	}
 
-	public void setCycleMonth(String cycleMonth) { this.cycleMonth = cycleMonth; }
+	public String getCycleMonth() {
+		return cycleMonth;
+	}
 
-	public String getArchiveTime() { return archiveTime; }
+	public void setCycleMonth(String cycleMonth) {
+		this.cycleMonth = cycleMonth;
+	}
 
-	public void setArchiveTime(String archiveTime) { this.archiveTime = archiveTime; }
+	public String getArchiveTime() {
+		return archiveTime;
+	}
 
-	public String getAppealProcessor() { return appealProcessor; }
+	public void setArchiveTime(String archiveTime) {
+		this.archiveTime = archiveTime;
+	}
 
-	public void setAppealProcessor(String appealProcessor) { this.appealProcessor = appealProcessor; }
+	public String getAppealProcessor() {
+		return appealProcessor;
+	}
 
+	public void setAppealProcessor(String appealProcessor) {
+		this.appealProcessor = appealProcessor;
+	}
 
-	public String getMiddayRestStartTime() { return middayRestStartTime; }
+	public String getMiddayRestStartTime() {
+		return middayRestStartTime;
+	}
 
-	public void setMiddayRestStartTime(String middayRestStartTime) { this.middayRestStartTime = middayRestStartTime; }
+	public void setMiddayRestStartTime(String middayRestStartTime) {
+		this.middayRestStartTime = middayRestStartTime;
+	}
 
-	public String getMiddayRestEndTime() { return middayRestEndTime; }
+	public String getMiddayRestEndTime() {
+		return middayRestEndTime;
+	}
 
-	public void setMiddayRestEndTime(String middayRestEndTime) { this.middayRestEndTime = middayRestEndTime; }
+	public void setMiddayRestEndTime(String middayRestEndTime) {
+		this.middayRestEndTime = middayRestEndTime;
+	}
 
 	public Boolean getHoliday() {
 		return isHoliday;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxUnitForMonth.java

@@ -17,8 +17,6 @@ import javax.persistence.*;
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public class StatisticQywxUnitForMonth extends SliceJpaObject {
 
-
-
 	private static final String TABLE = PersistenceProperties.StatisticQywxUnitForMonth.table;
 	private static final long serialVersionUID = 2831416127767736230L;
 
@@ -52,65 +50,65 @@ public class StatisticQywxUnitForMonth extends SliceJpaObject {
 	 */
 	public static final String o2Unit_FIELDNAME = "o2Unit";
 	@FieldDescribe("O2用户所在的组织")
-	@Column( length = length_128B, name = ColumnNamePrefix + o2Unit_FIELDNAME )
+	@Column(length = length_128B, name = ColumnNamePrefix + o2Unit_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String o2Unit;
 
 	public static final String statisticYear_FIELDNAME = "statisticYear";
 	@FieldDescribe("统计年份")
-	@Column( length = JpaObject.length_16B, name = ColumnNamePrefix + statisticYear_FIELDNAME )
+	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + statisticYear_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String statisticYear;
 
 	public static final String statisticMonth_FIELDNAME = "statisticMonth";
 	@FieldDescribe("统计月份")
-	@Column( length = JpaObject.length_16B, name = ColumnNamePrefix + statisticMonth_FIELDNAME )
+	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + statisticMonth_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private String statisticMonth;
 
-	public static final String xworkDayCount_FIELDNAME = "xworkDayCount";
+	public static final String workDayCount_FIELDNAME = "workDayCount";
 	@FieldDescribe("出勤天数")
-	@Column( name = ColumnNamePrefix + xworkDayCount_FIELDNAME )
+	@Column(name = ColumnNamePrefix + workDayCount_FIELDNAME)
 	private Long workDayCount;
 
 	public static final String onDutyTimes_FIELDNAME = "onDutyTimes";
 	@FieldDescribe("上班签到次数")
-	@Column( name = ColumnNamePrefix + onDutyTimes_FIELDNAME )
+	@Column(name = ColumnNamePrefix + onDutyTimes_FIELDNAME)
 	private Long onDutyTimes;
 
 	public static final String offDutyTimes_FIELDNAME = "offDutyTimes";
 	@FieldDescribe("下班签到次数")
-	@Column( name = ColumnNamePrefix + offDutyTimes_FIELDNAME )
+	@Column(name = ColumnNamePrefix + offDutyTimes_FIELDNAME)
 	private Long offDutyTimes;
 
 	public static final String outsideDutyTimes_FIELDNAME = "outsideDutyTimes";
 	@FieldDescribe("外出签到次数")
-	@Column( name = ColumnNamePrefix + outsideDutyTimes_FIELDNAME )
+	@Column(name = ColumnNamePrefix + outsideDutyTimes_FIELDNAME)
 	private Long outsideDutyTimes;
 
 	public static final String resultNormal_FIELDNAME = "resultNormal";
 	@FieldDescribe("正常签到次数")
-	@Column( name = ColumnNamePrefix + resultNormal_FIELDNAME )
+	@Column(name = ColumnNamePrefix + resultNormal_FIELDNAME)
 	private Long resultNormal;
 
 	public static final String lateTimes_FIELDNAME = "lateTimes";
 	@FieldDescribe("迟到次数")
-	@Column( name = ColumnNamePrefix + lateTimes_FIELDNAME )
+	@Column(name = ColumnNamePrefix + lateTimes_FIELDNAME)
 	private Long lateTimes;
 
 	public static final String leaveEarlyTimes_FIELDNAME = "leaveEarlyTimes";
 	@FieldDescribe("早退次数")
-	@Column( name = ColumnNamePrefix + leaveEarlyTimes_FIELDNAME )
+	@Column(name = ColumnNamePrefix + leaveEarlyTimes_FIELDNAME)
 	private Long leaveEarlyTimes;
 
 	public static final String absenteeismTimes_FIELDNAME = "absenteeismTimes";
 	@FieldDescribe("旷工次数")
-	@Column( name = ColumnNamePrefix + absenteeismTimes_FIELDNAME )
+	@Column(name = ColumnNamePrefix + absenteeismTimes_FIELDNAME)
 	private Long absenteeismTimes;
 
 	public static final String notSignedCount_FIELDNAME = "notSignedCount";
 	@FieldDescribe("未打卡次数")
-	@Column( name = ColumnNamePrefix + notSignedCount_FIELDNAME )
+	@Column(name = ColumnNamePrefix + notSignedCount_FIELDNAME)
 	private Long notSignedCount;
 
 	public Long getResultNormal() {

o2server/x_base_core_project/src/main/java/com/x/base/core/project/AbstractContext.java

@@ -1,6 +1,19 @@
 package com.x.base.core.project;
 
+import javax.servlet.ServletContext;
+
+import org.quartz.DateBuilder;
+import org.quartz.JobBuilder;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.DateBuilder.IntervalUnit;
+
 import com.x.base.core.project.annotation.Module;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.schedule.AbstractJob;
 import com.x.base.core.project.thread.ThreadFactory;
 
 public abstract class AbstractContext {
@@ -30,4 +43,15 @@ public abstract class AbstractContext {
 		return this.module;
 	}
 
+	// 从servletContext中抽取context
+	public static AbstractContext fromServletContext(ServletContext servletContext) throws IllegalStateException {
+		Object o = servletContext.getAttribute(AbstractContext.class.getName());
+		if (null == o) {
+			throw new IllegalStateException("can not get context form servletContext.");
+		} else {
+			return (AbstractContext) o;
+		}
+	}
+
+	public abstract <T extends AbstractJob> void fireScheduleOnLocal(Class<T> cls, Integer delay) throws Exception;
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java

@@ -7,7 +7,6 @@ import java.util.UUID;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletRequest;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.openjpa.enhance.PCRegistry;
@@ -49,26 +48,6 @@ public class Context extends AbstractContext {
 
 	private static Logger logger = LoggerFactory.getLogger(Context.class);
 
-	/* 从servletContext中抽取context */
-	public static Context fromServletContext(ServletContext servletContext) throws Exception {
-		Object o = servletContext.getAttribute(Context.class.getName());
-		if (null == o) {
-			throw new Exception("can not get context form servletContext.");
-		} else {
-			return (Context) o;
-		}
-	}
-
-	/* 从servletRequest中抽取context */
-	public static Context fromServletRequest(ServletRequest servletRequest) throws Exception {
-		Object o = servletRequest.getServletContext().getAttribute(Context.class.getName());
-		if (null == o) {
-			throw new Exception("can not get context form servletRequest.");
-		} else {
-			return (Context) o;
-		}
-	}
-
 	/* 应用的磁盘路径 */
 	private volatile String path;
 
@@ -208,7 +187,7 @@ public class Context extends AbstractContext {
 		context.sslEnable = Config.currentNode().getApplication().getSslEnable();
 		context.initDatas();
 		context.threadFactory = new ThreadFactory(context);
-		servletContext.setAttribute(context.getClass().getName(), context);
+		servletContext.setAttribute(AbstractContext.class.getName(), context);
 		context.initialized = true;
 		return context;
 	}
@@ -272,6 +251,7 @@ public class Context extends AbstractContext {
 	 * 接受Center调度的schedule在本地运行,和scheduleOnLocal没有本质区别,仅仅是个withDescription(
 	 * "schedule")不一样,在log中记录这个值.
 	 */
+	@Override
 	public <T extends AbstractJob> void fireScheduleOnLocal(Class<T> cls, Integer delay) throws Exception {
 		/* 需要单独生成一个独立任务,保证group和预约的任务不重复 */
 		JobDataMap jobDataMap = new JobDataMap();

o2server/x_base_core_project/src/main/java/com/x/base/core/project/cache/TestClient.java

@@ -1,12 +0,0 @@
-package com.x.base.core.project.cache;
-
-import net.fortuna.ical4j.util.Optional;
-
-public class TestClient {
-
-	public static void main(String... strings) {
-		Optional<?> o =  Optional.ofNullable(null);
-		System.out.println(o);
-		System.out.println(o.isPresent());
-	}
-}

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/cache/ActionConfigFlush.java

@@ -16,8 +16,6 @@ class ActionConfigFlush extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext) throws Exception {
 		logger.debug(effectivePerson, "config flush.");
 		ActionResult<Wo> result = new ActionResult<>();
-//		com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) servletContext
-//				.getAttribute(com.x.base.core.project.Context.class.getName());
 		Config.flush();
 		Wo wo = new Wo();
 		wo.setValue(true);

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/cache/ActionReceive.java

@@ -21,7 +21,7 @@ class ActionReceive extends BaseAction {
 		logger.debug(effectivePerson, "receive:{}.", jsonElement);
 		ActionResult<Wo> result = new ActionResult<>();
 		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-		Object o = servletContext.getAttribute(com.x.base.core.project.Context.class.getName());
+		Object o = servletContext.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
 		if (null != o) {
 			com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) o;
 			if (null != ctx.clearCacheRequestQueue()) {

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/fireschedule/ActionExecute.java

@@ -3,6 +3,7 @@ package com.x.base.core.project.jaxrs.fireschedule;
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Context;
 
+import com.x.base.core.project.AbstractContext;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapBoolean;
@@ -18,7 +19,7 @@ class ActionExecute extends BaseAction {
 			throws Exception {
 		logger.debug(effectivePerson, "execute:{}.", className);
 		ActionResult<Wo> result = new ActionResult<>();
-		com.x.base.core.project.Context ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
+		AbstractContext ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
 		Class<?> clz = Class.forName(className);
 		ctx.fireScheduleOnLocal((Class<AbstractJob>) clz, 1);
 		Wo wo = new Wo();

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/logger/ActionDebug.java

@@ -15,7 +15,7 @@ class ActionDebug extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) servletContext
-				.getAttribute(com.x.base.core.project.Context.class.getName());
+				.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
 		logger.info("{} change logger level to DEBUG.", ctx.clazz().getName());
 		LoggerFactory.setLevelDebug();
 		result.setData(new Wo(true));

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/logger/ActionInfo.java

@@ -15,7 +15,7 @@ class ActionInfo extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) servletContext
-				.getAttribute(com.x.base.core.project.Context.class.getName());
+				.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
 		logger.info("{} change logger level to INFO.", ctx.clazz().getName());
 		LoggerFactory.setLevelInfo();
 		result.setData(new Wo(true));

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/logger/ActionTrace.java

@@ -15,7 +15,7 @@ class ActionTrace extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) servletContext
-				.getAttribute(com.x.base.core.project.Context.class.getName());
+				.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
 		logger.info("{} change logger level to TRACE.", ctx.clazz().getName());
 		LoggerFactory.setLevelTrace();
 		result.setData(new Wo(true));

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/logger/ActionWarn.java

@@ -15,7 +15,7 @@ class ActionWarn extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) servletContext
-				.getAttribute(com.x.base.core.project.Context.class.getName());
+				.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
 		logger.info("{} change logger level to WARN.", ctx.clazz().getName());
 		LoggerFactory.setLevelWarn();
 		result.setData(new Wo(true));

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/thread/ActionAlive.java

@@ -2,6 +2,7 @@ package com.x.base.core.project.jaxrs.thread;
 
 import javax.servlet.ServletContext;
 
+import com.x.base.core.project.AbstractContext;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapString;
@@ -15,7 +16,7 @@ class ActionAlive extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext, String name)
 			throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
-		com.x.base.core.project.Context ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
+		AbstractContext ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
 		Wo wo = new Wo();
 		wo.setValue(ctx.threadFactory().aliveLocal(name));
 		result.setData(wo);

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/thread/ActionParameter.java

@@ -5,6 +5,7 @@ import java.util.TreeMap;
 
 import javax.servlet.ServletContext;
 
+import com.x.base.core.project.AbstractContext;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
@@ -18,7 +19,7 @@ class ActionParameter extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext, String name)
 			throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
-		com.x.base.core.project.Context ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
+		AbstractContext ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
 		Wo wo = null;
 		Map<Object, Object> value = ctx.threadFactory().parameterLocal(name);
 		if (null != value) {

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/thread/ActionStop.java

@@ -2,6 +2,7 @@ package com.x.base.core.project.jaxrs.thread;
 
 import javax.servlet.ServletContext;
 
+import com.x.base.core.project.AbstractContext;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapBoolean;
@@ -15,7 +16,7 @@ class ActionStop extends BaseAction {
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, ServletContext servletContext, String name)
 			throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
-		com.x.base.core.project.Context ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
+		AbstractContext ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
 		Wo wo = new Wo();
 		wo.setValue(ctx.threadFactory().stopLocal(name));
 		result.setData(wo);

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/thread/ThreadAction.java

@@ -2,17 +2,21 @@ package com.x.base.core.project.jaxrs.thread;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
 
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.http.HttpMediaType;
 import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 import com.x.base.core.project.logger.Logger;
@@ -26,6 +30,8 @@ public class ThreadAction extends StandardJaxrsAction {
 
 	@JaxrsMethodDescribe(value = "是否运行中.", action = ActionAlive.class)
 	@GET
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
 	@Path("alive/{name}")
 	public void alive(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
 			@Context ServletContext servletContext, @PathParam("name") String name) {
@@ -42,6 +48,8 @@ public class ThreadAction extends StandardJaxrsAction {
 
 	@JaxrsMethodDescribe(value = "获取参数.", action = ActionParameter.class)
 	@GET
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
 	@Path("parameter/{name}")
 	public void parameter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
 			@Context ServletContext servletContext, @PathParam("name") String name) {
@@ -58,6 +66,8 @@ public class ThreadAction extends StandardJaxrsAction {
 
 	@JaxrsMethodDescribe(value = "停止运行.", action = ActionStop.class)
 	@GET
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
 	@Path("stop/{name}")
 	public void stop(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
 			@Context ServletContext servletContext, @PathParam("name") String name) {

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_EventComment.java

@@ -61,7 +61,7 @@ public class Calendar_EventComment extends SliceJpaObject {
 	@Lob
 	@Basic(fetch = FetchType.EAGER)
 	@FieldDescribe("COMMENT信息的LOB值")
-	@Column(name = lobValue_FIELDNAME, length = JpaObject.length_10M)
+	@Column(name = ColumnNamePrefix + lobValue_FIELDNAME, length = JpaObject.length_10M)
 	private String lobValue = "";
 
 	public static final String checkTime_FIELDNAME = "checkTime";

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionCreate.java

@@ -3,17 +3,18 @@ package com.x.organization.assemble.control.jaxrs.person;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.annotation.CheckPersistType;
-import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.x_message_assemble_communicate;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.connection.ActionResponse;
 import com.x.base.core.project.exception.ExceptionAccessDenied;
@@ -32,8 +33,6 @@ import com.x.organization.assemble.control.message.OrgMessageFactory;
 import com.x.organization.core.entity.Person;
 import com.x.organization.core.entity.Unit;
 
-import org.apache.commons.lang3.StringUtils;
-
 class ActionCreate extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCreate.class);

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/PersonAction.java

@@ -15,7 +15,6 @@ import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Snap.java

@@ -126,7 +126,7 @@ public class Snap extends SliceJpaObject {
 
 	public static final String person_FIELDNAME = "person";
 	@FieldDescribe("快照创建人.")
-	@Column(length = length_255B, name = ColumnNamePrefix + creatorPerson_FIELDNAME)
+	@Column(length = length_255B, name = ColumnNamePrefix + person_FIELDNAME)
 	@Index(name = TABLE + IndexNameMiddle + person_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String person;

o2server/x_program_center/src/main/java/com/x/program/center/Context.java

@@ -20,6 +20,7 @@ import org.quartz.DateBuilder;
 import org.quartz.DateBuilder.IntervalUnit;
 import org.quartz.Job;
 import org.quartz.JobBuilder;
+import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.Scheduler;
 import org.quartz.SimpleScheduleBuilder;
@@ -42,6 +43,7 @@ import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.organization.OrganizationDefinition;
 import com.x.base.core.project.queue.AbstractQueue;
+import com.x.base.core.project.schedule.AbstractJob;
 import com.x.base.core.project.schedule.JobReportListener;
 import com.x.base.core.project.schedule.SchedulerFactoryProperties;
 import com.x.base.core.project.thread.ThreadFactory;
@@ -170,7 +172,7 @@ public class Context extends AbstractContext {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			context.checkDefaultRole(emc);
 		}
-		servletContext.setAttribute(context.getClass().getName(), context);
+		servletContext.setAttribute(AbstractContext.class.getName(), context);
 		return context;
 	}
 
@@ -324,4 +326,21 @@ public class Context extends AbstractContext {
 		}
 	}
 
+	@Override
+	@Deprecated
+	// 重来没用调用过的方法,目标是全部方法全部移动到AbstractContext中
+	public <T extends AbstractJob> void fireScheduleOnLocal(Class<T> cls, Integer delay) throws Exception {
+		/* 需要单独生成一个独立任务,保证group和预约的任务不重复 */
+		JobDataMap jobDataMap = new JobDataMap();
+		jobDataMap.put("context", this);
+		JobDetail jobDetail = JobBuilder.newJob(cls).withIdentity(cls.getName(), clazz.getName())
+				.usingJobData(jobDataMap).withDescription(Config.node()).build();
+		/* 经过测试0代表不重复,仅运行一次 */
+		Trigger trigger = TriggerBuilder.newTrigger().withIdentity(cls.getName(), clazz.getName())
+				.withDescription("schedule").startAt(DateBuilder.futureDate(delay, IntervalUnit.SECOND))
+				.withSchedule(SimpleScheduleBuilder.simpleSchedule().withIntervalInSeconds(1).withRepeatCount(0))
+				.build();
+		scheduler.scheduleJob(jobDetail, trigger);
+	}
+
 }

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/cachedispatch/BaseAction.java

@@ -1,8 +1,5 @@
 package com.x.program.center.jaxrs.cachedispatch;
 
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -11,68 +8,4 @@ abstract class BaseAction extends StandardJaxrsAction {
 
 	private static Logger logger = LoggerFactory.getLogger(BaseAction.class);
 
-	private static ConcurrentHashMap<String, List<Class<?>>> entityInApplicationMap = null;
-
-
-	
-
-//	static List<Class<?>> findApplicationWithEntity(String name) {
-//		
-//		
-//		
-//		if (null == entityInApplicationMap) {
-//			synchronized (BaseAction.class) {
-//				if (null == entityInApplicationMap) {
-//					entityInApplicationMap = new ConcurrentHashMap<String, List<Class<?>>>();
-//					try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-//						List<ClassInfo> list = new ArrayList<>();
-//						list.addAll(scanResult.getSubclasses(AssembleA.class.getName()));
-//						list.addAll(scanResult.getSubclasses(ServiceA.class.getName()));
-//						for (ClassInfo info : list) {
-//							Class<?> clz = Class.forName(info.getName());
-//							Deployable deployable = (Deployable) clz.newInstance();
-//							deployable.dependency().containerEntities.forEach(o -> {
-//								List<Class<?>> os = entityInApplicationMap.get(o);
-//								if (null == os) {
-//									os = new ArrayList<Class<?>>();
-//									entityInApplicationMap.put(o, os);
-//								}
-//								os.add(clz);
-//							});
-//						}
-//					} catch (Exception e) {
-//						logger.error(e);
-//					}
-////					ScanResult scanResult = new FastClasspathScanner(Packages.PREFIX).scan();
-////					classes.addAll(scanResult.getNamesOfSubclassesOf(AssembleA.class));
-////					classes.addAll(scanResult.getNamesOfSubclassesOf(ServiceA.class));
-////					classes.stream().forEach(s -> {
-////						Class<?> clz;
-////						try {
-////							clz = Class.forName(s);
-////							Deployable deployable = (Deployable) clz.newInstance();
-////							deployable.dependency().containerEntities.forEach(o -> {
-////								List<Class<?>> list = entityInApplicationMap.get(o);
-////								if (null == list) {
-////									list = new ArrayList<Class<?>>();
-////									entityInApplicationMap.put(o, list);
-////								}
-////								list.add(clz);
-////							});
-////						} catch (Exception e) {
-////							e.printStackTrace();
-////						}
-////					});
-//				}
-//			}
-//		}
-//		List<Class<?>> list = entityInApplicationMap.get(name);
-//		if (null == list) {
-//			return new ArrayList<Class<?>>();
-//		} else {
-//			List<Class<?>> os = new ArrayList<>();
-//			os.addAll(list);
-//			return os;
-//		}
-//	}
 }