Skip to content

o2oa
o2oa

ghsby / o2oa
落后 Fork 源项目 2880 个版本

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 1
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 5f7b4922 编写于 作者: liyi_hz2008's avatar liyi_hz2008
浏览文件
操作

Merge branch 'fix/Attendance.appeal.create.reporter' into 'release' 

[考勤管理]修复了在某些情况下发起考勤结果申诉出现错误的问题(汇报领导)

See merge request o2oa/o2oa!964
上级 d6f37073 37b6d7fa
显示空白变更内容
内联 并排
Showing with 36 addition and 530 deletion
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealCreate.java
浏览文件 @ 5f7b4922
......@@ -95,7 +95,9 @@ public class ActionAppealCreate extends BaseAction {
try {
appealAuditPersonName = attendanceAppealInfoServiceAdv.getAppealAuditPerson( personName, attendanceAppealInfo.getUnitName(), wrapIn.getIdentity() );
if( StringUtils.isNotEmpty( appealAuditPersonName )){
if(StringUtils.indexOf(appealAuditPersonName, "@I")>0){
appealAuditPersonName = userManagerService.getPersonNameByIdentity(appealAuditPersonName);
}
attendanceAppealAuditInfo.setProcessPerson1( appealAuditPersonName );
attendanceAppealAuditInfo.setCurrentProcessor( appealAuditPersonName );
attendanceAppealInfo.setCurrentProcessor( appealAuditPersonName );// 将第一个处理人设置为当前处理人
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListNextWithFilter.java
浏览文件 @ 5f7b4922
......@@ -43,13 +43,13 @@ public class ActionListNextWithFilter extends BaseAction {
List<String> unitNames = new ArrayList<String>();
List<String> topUnitNames_tmp = null;
List<String> unitNames_tmp = null;
WrapInFilter wrapIn = null;
Wi wrapIn = null;
AttendanceScheduleSetting scheduleSetting_top = null;
AttendanceScheduleSetting scheduleSetting = null;
Boolean check = true;
try {
wrapIn = this.convertToWrapIn(jsonElement, WrapInFilter.class);
wrapIn = this.convertToWrapIn(jsonElement, Wi.class);
} catch (Exception e) {
check = false;
Exception exception = new ExceptionWrapInConvert(e, jsonElement);
......@@ -163,6 +163,10 @@ public class ActionListNextWithFilter extends BaseAction {
return result;
}
public static class Wi extends WrapInFilter{
}
public static class Wo extends AttendanceDetail {
private static final long serialVersionUID = -5076990764713538973L;
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListPrevWithFilter.java
浏览文件 @ 5f7b4922
......@@ -43,13 +43,13 @@ public class ActionListPrevWithFilter extends BaseAction {
List<String> unitNames = new ArrayList<String>();
List<String> topUnitNames_tmp = null;
List<String> unitNames_tmp = null;
WrapInFilter wrapIn = null;
Wi wrapIn = null;
AttendanceScheduleSetting scheduleSetting_top = null;
AttendanceScheduleSetting scheduleSetting = null;
Boolean check = true;
try {
wrapIn = this.convertToWrapIn(jsonElement, WrapInFilter.class);
wrapIn = this.convertToWrapIn(jsonElement, Wi.class);
} catch (Exception e) {
check = false;
Exception exception = new ExceptionWrapInConvert(e, jsonElement);
......@@ -162,6 +162,10 @@ public class ActionListPrevWithFilter extends BaseAction {
return result;
}
public static class Wi extends WrapInFilter{
}
public static class Wo extends AttendanceDetail {
private static final long serialVersionUID = -5076990764713538973L;
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithEmployee.java
浏览文件 @ 5f7b4922
......@@ -179,178 +179,7 @@ public class ActionListWithEmployee extends BaseAction {
return result;
}
public static class Wi extends GsonPropertyObject {
private String q_empName;
private List<String> topUnitNames;
private String q_topUnitName;
private List<String> unitNames;
private String q_unitName;
private String q_year;
private String q_month;
private String cycleYear;
private String cycleMonth;
private String q_date;
private int recordStatus = 999;
private Boolean isAbsent = null;
private Boolean isLate = null;
private Boolean isLeaveEarlier = null;
private Boolean isLackOfTime = null;
private String order = "DESC";
private String key;
public String getQ_empName() {
return q_empName;
}
public String getCycleYear() {
return cycleYear;
}
public void setCycleYear(String cycleYear) {
this.cycleYear = cycleYear;
}
public String getCycleMonth() {
return cycleMonth;
}
public void setCycleMonth(String cycleMonth) {
this.cycleMonth = cycleMonth;
}
public void setQ_empName(String q_empName) {
this.q_empName = q_empName;
}
public String getQ_year() {
return q_year;
}
public void setQ_year(String q_year) {
this.q_year = q_year;
}
public String getQ_month() {
return q_month;
}
public void setQ_month(String q_month) {
this.q_month = q_month;
}
public List<String> getTopUnitNames() {
return topUnitNames;
}
public void setTopUnitNames(List<String> topUnitNames) {
this.topUnitNames = topUnitNames;
}
public List<String> getUnitNames() {
return unitNames;
}
public void setUnitNames(List<String> unitNames) {
this.unitNames = unitNames;
}
public String getOrder() {
return order;
}
public void setOrder(String order) {
this.order = order;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getQ_date() {
return q_date;
}
public void setQ_date(String q_date) {
this.q_date = q_date;
}
public Boolean getIsAbsent() {
return isAbsent;
}
public void setIsAbsent(Boolean isAbsent) {
this.isAbsent = isAbsent;
}
public Boolean getIsLate() {
return isLate;
}
public void setIsLate(Boolean isLate) {
this.isLate = isLate;
}
public Boolean getIsLeaveEarlier() {
return isLeaveEarlier;
}
public void setIsLeaveEarlier(Boolean isLeaveEarlier) {
this.isLeaveEarlier = isLeaveEarlier;
}
public Boolean getIsLackOfTime() {
return isLackOfTime;
}
public void setIsLackOfTime(Boolean isLackOfTime) {
this.isLackOfTime = isLackOfTime;
}
public int getRecordStatus() {
return recordStatus;
}
public void setRecordStatus(int recordStatus) {
this.recordStatus = recordStatus;
}
public String getQ_topUnitName() {
return q_topUnitName;
}
public void setQ_topUnitName(String q_topUnitName) {
this.q_topUnitName = q_topUnitName;
}
public String getQ_unitName() {
return q_unitName;
}
public void setQ_unitName(String q_unitName) {
this.q_unitName = q_unitName;
}
public static class Wi extends WrapInFilter {
}
public static class Wo extends AttendanceDetail {
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithTopUnit.java
浏览文件 @ 5f7b4922
......@@ -175,178 +175,7 @@ public class ActionListWithTopUnit extends BaseAction {
return result;
}
public static class Wi extends GsonPropertyObject {
private String q_empName;
private List<String> topUnitNames;
private String q_topUnitName;
private List<String> unitNames;
private String q_unitName;
private String q_year;
private String q_month;
private String cycleYear;
private String cycleMonth;
private String q_date;
private int recordStatus = 999;
private Boolean isAbsent = null;
private Boolean isLate = null;
private Boolean isLeaveEarlier = null;
private Boolean isLackOfTime = null;
private String order = "DESC";
private String key;
public String getQ_empName() {
return q_empName;
}
public String getCycleYear() {
return cycleYear;
}
public void setCycleYear(String cycleYear) {
this.cycleYear = cycleYear;
}
public String getCycleMonth() {
return cycleMonth;
}
public void setCycleMonth(String cycleMonth) {
this.cycleMonth = cycleMonth;
}
public void setQ_empName(String q_empName) {
this.q_empName = q_empName;
}
public String getQ_year() {
return q_year;
}
public void setQ_year(String q_year) {
this.q_year = q_year;
}
public String getQ_month() {
return q_month;
}
public void setQ_month(String q_month) {
this.q_month = q_month;
}
public List<String> getTopUnitNames() {
return topUnitNames;
}
public void setTopUnitNames(List<String> topUnitNames) {
this.topUnitNames = topUnitNames;
}
public List<String> getUnitNames() {
return unitNames;
}
public void setUnitNames(List<String> unitNames) {
this.unitNames = unitNames;
}
public String getOrder() {
return order;
}
public void setOrder(String order) {
this.order = order;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getQ_date() {
return q_date;
}
public void setQ_date(String q_date) {
this.q_date = q_date;
}
public Boolean getIsAbsent() {
return isAbsent;
}
public void setIsAbsent(Boolean isAbsent) {
this.isAbsent = isAbsent;
}
public Boolean getIsLate() {
return isLate;
}
public void setIsLate(Boolean isLate) {
this.isLate = isLate;
}
public Boolean getIsLeaveEarlier() {
return isLeaveEarlier;
}
public void setIsLeaveEarlier(Boolean isLeaveEarlier) {
this.isLeaveEarlier = isLeaveEarlier;
}
public Boolean getIsLackOfTime() {
return isLackOfTime;
}
public void setIsLackOfTime(Boolean isLackOfTime) {
this.isLackOfTime = isLackOfTime;
}
public int getRecordStatus() {
return recordStatus;
}
public void setRecordStatus(int recordStatus) {
this.recordStatus = recordStatus;
}
public String getQ_topUnitName() {
return q_topUnitName;
}
public void setQ_topUnitName(String q_topUnitName) {
this.q_topUnitName = q_topUnitName;
}
public String getQ_unitName() {
return q_unitName;
}
public void setQ_unitName(String q_unitName) {
this.q_unitName = q_unitName;
}
public static class Wi extends WrapInFilter {
}
public static class Wo extends AttendanceDetail {
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithUnit.java
浏览文件 @ 5f7b4922
......@@ -174,178 +174,7 @@ public class ActionListWithUnit extends BaseAction {
return result;
}
public static class Wi extends GsonPropertyObject {
private String q_empName;
private List<String> topUnitNames;
private String q_topUnitName;
private List<String> unitNames;
private String q_unitName;
private String q_year;
private String q_month;
private String cycleYear;
private String cycleMonth;
private String q_date;
private int recordStatus = 999;
private Boolean isAbsent = null;
private Boolean isLate = null;
private Boolean isLeaveEarlier = null;
private Boolean isLackOfTime = null;
private String order = "DESC";
private String key;
public String getQ_empName() {
return q_empName;
}
public String getCycleYear() {
return cycleYear;
}
public void setCycleYear(String cycleYear) {
this.cycleYear = cycleYear;
}
public String getCycleMonth() {
return cycleMonth;
}
public void setCycleMonth(String cycleMonth) {
this.cycleMonth = cycleMonth;
}
public void setQ_empName(String q_empName) {
this.q_empName = q_empName;
}
public String getQ_year() {
return q_year;
}
public void setQ_year(String q_year) {
this.q_year = q_year;
}
public String getQ_month() {
return q_month;
}
public void setQ_month(String q_month) {
this.q_month = q_month;
}
public List<String> getTopUnitNames() {
return topUnitNames;
}
public void setTopUnitNames(List<String> topUnitNames) {
this.topUnitNames = topUnitNames;
}
public List<String> getUnitNames() {
return unitNames;
}
public void setUnitNames(List<String> unitNames) {
this.unitNames = unitNames;
}
public String getOrder() {
return order;
}
public void setOrder(String order) {
this.order = order;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getQ_date() {
return q_date;
}
public void setQ_date(String q_date) {
this.q_date = q_date;
}
public Boolean getIsAbsent() {
return isAbsent;
}
public void setIsAbsent(Boolean isAbsent) {
this.isAbsent = isAbsent;
}
public Boolean getIsLate() {
return isLate;
}
public void setIsLate(Boolean isLate) {
this.isLate = isLate;
}
public Boolean getIsLeaveEarlier() {
return isLeaveEarlier;
}
public void setIsLeaveEarlier(Boolean isLeaveEarlier) {
this.isLeaveEarlier = isLeaveEarlier;
}
public Boolean getIsLackOfTime() {
return isLackOfTime;
}
public void setIsLackOfTime(Boolean isLackOfTime) {
this.isLackOfTime = isLackOfTime;
}
public int getRecordStatus() {
return recordStatus;
}
public void setRecordStatus(int recordStatus) {
this.recordStatus = recordStatus;
}
public String getQ_topUnitName() {
return q_topUnitName;
}
public void setQ_topUnitName(String q_topUnitName) {
this.q_topUnitName = q_topUnitName;
}
public String getQ_unitName() {
return q_unitName;
}
public void setQ_unitName(String q_unitName) {
this.q_unitName = q_unitName;
}
public static class Wi extends WrapInFilter {
}
public static class Wo extends AttendanceDetail {
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/WrapInFilter.java
浏览文件 @ 5f7b4922
......@@ -2,28 +2,37 @@ package com.x.attendance.assemble.control.jaxrs.attendancedetail;
import java.util.List;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.gson.GsonPropertyObject;
public class WrapInFilter extends GsonPropertyObject {
@FieldDescribe("参与查询的员工标识，人员DistinguishedName")
private String q_empName;
private List<String> topUnitNames;
@FieldDescribe("参与查询的顶层组织（公司）标识，组织DistinguishedName")
private String q_topUnitName;
private List<String> unitNames;
@FieldDescribe("参与查询的组织（部门）标识，组织DistinguishedName")
private String q_unitName;
@FieldDescribe("查询数据的年份, yyyy")
private String q_year;
@FieldDescribe("查询数据的月份, mm")
private String q_month;
@FieldDescribe("查询数据的统计周期年份，一般与数据日期的年份一致")
private String cycleYear;
@FieldDescribe("查询数据的统计周期月份，一般与数据日期的月份一致")
private String cycleMonth;
@FieldDescribe("查询数据的具体日期，yyyy-mm-dd")
private String q_date;
private int recordStatus = 999;
......
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java
浏览文件 @ 5f7b4922
......@@ -471,7 +471,7 @@ public class UserManagerService {
* @throws Exception
*/
public String getReporterWithPerson(String personName) throws Exception {
if( personName == null || personName.isEmpty() ){
if( StringUtils.isEmpty( personName ) ){
throw new Exception( "personName is null!" );
}
Person person = null;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或