diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
index c01297586d664d3a5faf0a5bba0dc5a7a56e6de1..d79bcbc4b454ee9943fac545a19d97b1740e6a2b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
@@ -20,4 +20,10 @@ public class PerformAttendRecordVo extends BaseEntityLong {
/** 缁撴潫 鍒涘缓鏃堕棿 */
private String createTimeEnd;
+
+ /** 寮€濮� 寮傚父鏃堕棿 */
+ private String errorTimeStart;
+
+ /** 缁撴潫 寮傚父鏃堕棿 */
+ private String errorTimeEnd;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
index 51ab9b2c79abae1ed58eb939816c44160667f51c..2e5a3cd323e14797ec82748992d234a91d0250cf 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
@@ -20,4 +20,9 @@ public class PerformComplainRecordVo extends BaseEntityLong {
/** 缁撴潫 鍒涘缓鏃堕棿 */
private String createTimeEnd;
+ /** 寮€濮� 鎶曡瘔鏃堕棿 */
+ private String complainTimeStart;
+
+ /** 缁撴潫 鎶曡瘔鏃堕棿 */
+ private String complainTimeEnd;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
index 8c773e200888384cd7d5a447c3d241685f63042a..ce4b21a9003dbb71ec047ef14164ab5c39793b89 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
@@ -20,4 +20,9 @@ public class PerformEffectRecordVo extends BaseEntityLong {
/** 缁撴潫 鍒涘缓鏃堕棿 */
private String createTimeEnd;
+ /** 寮€濮� 鍙戠敓鏃堕棿 */
+ private String happenTimeStart;
+
+ /** 缁撴潫 鍙戠敓鏃堕棿 */
+ private String happenTimeEnd;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
index acaeae45745f08b778a8ca1d2b86d97e1b278cc4..4b37a65578b0201ebe56b63786064a1fac800096 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
@@ -20,4 +20,9 @@ public class PerformGoworkRecordVo extends BaseEntityLong {
/** 缁撴潫 鍒涘缓鏃堕棿 */
private String createTimeEnd;
+ /** 寮€濮� 鍔炵悊鏃堕棿 */
+ private String goworkTimeStart;
+
+ /** 缁撴潫 鍔炵悊鏃堕棿 */
+ private String goworkTimeEnd;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
index e69dd841c0b1b12240cf3c7ad98566d8d0413e91..d6fa40acf569e7a4246252976de0f5394ab82130 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
@@ -20,4 +20,9 @@ public class PerformOtherRecordVo extends BaseEntityLong {
/** 缁撴潫 鍒涘缓鏃堕棿 */
private String createTimeEnd;
+ /** 寮€濮� 鍙戠敓鏃堕棿 */
+ private String happenTimeStart;
+
+ /** 缁撴潫 鍙戠敓鏃堕棿 */
+ private String happenTimeEnd;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
index 790994f8e2f6355c4a24e9997c6be38750c2e809..7ec6bfb0b83a247dc02a4a8e7ceb67b668de4110 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
@@ -20,4 +20,9 @@ public class PerformReviewRecordVo extends BaseEntityLong {
/** 缁撴潫 鍒涘缓鏃堕棿 */
private String createTimeEnd;
+ /** 寮€濮� 璇勪环鏃堕棿 */
+ private String reviewTimeStart;
+
+ /** 缁撴潫 璇勪环鏃堕棿 */
+ private String reviewTimeEnd;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
index ef9236c410827469436e4ead32e760c4b178e811..4ef58ee31c6a1ed288de2f97efdf2cae07d1024e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -74,14 +76,16 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
protected void doListBefore(PerformAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context);
if (ObjectUtils.isEmpty(query.getOrderColList())) {
- query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ query.setOrderColList(Arrays.asList(new OrderCol("errorTime", OrderCol.DESCENDING)));
} else {
- query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ query.getOrderColList().add(new OrderCol("errorTime", OrderCol.DESCENDING));
}
- if(!ObjectUtils.isEmpty(query.getCreateTime())){
- query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
- query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+ if(ObjectUtils.isEmpty(query.getErrorTimeStart())){
+ LocalDateTime currentDate = LocalDateTime.now();
+ LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+ query.setErrorTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+ //query.setErrorTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
index 85e98c4bbb98980062a897383c2d7b1b9a732c76..937f1df27a44345961493533331499b367e90d04 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
@@ -18,6 +18,7 @@ import com.mortals.framework.model.Context;
import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
+import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Map;
import java.util.stream.Collectors;
@@ -66,15 +67,16 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
@Override
protected void doListBefore(PerformComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) {
- query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ query.setOrderColList(Arrays.asList(new OrderCol("complainTime", OrderCol.DESCENDING)));
} else {
- query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ query.getOrderColList().add(new OrderCol("complainTime", OrderCol.DESCENDING));
}
- if(!ObjectUtils.isEmpty(query.getCreateTime())){
- query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
- query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+ if(ObjectUtils.isEmpty(query.getComplainTimeStart())){
+ LocalDateTime currentDate = LocalDateTime.now();
+ LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+ query.setComplainTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+ //query.setComplainTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
-
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
index 9fdbff1afcd61e59ee6189bdffaa756dae331806..105003b3796c81ecf98955f4b6130cfbc4a13212 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
import com.mortals.xhx.module.perform.service.PerformEffectRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -73,14 +75,16 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
@Override
protected void doListBefore(PerformEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) {
- query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
} else {
- query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
}
- if(!ObjectUtils.isEmpty(query.getCreateTime())){
- query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
- query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+ if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
+ LocalDateTime currentDate = LocalDateTime.now();
+ LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+ query.setHappenTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+ //query.setHappenTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
index 2175dfe88ae4b83f4a9bc1e869073d2950a5318a..f37bdde01ec3e225cba58ac36c626502ad83f4d9 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
import com.mortals.xhx.module.perform.service.PerformGoworkRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -73,14 +75,20 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
@Override
protected void doListBefore(PerformGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) {
- query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ query.setOrderColList(Arrays.asList(new OrderCol("goworkTime", OrderCol.DESCENDING)));
} else {
- query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ query.getOrderColList().add(new OrderCol("goworkTime", OrderCol.DESCENDING));
}
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
+ if(ObjectUtils.isEmpty(query.getGoworkTimeStart())){
+ LocalDateTime currentDate = LocalDateTime.now();
+ LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+ query.setGoworkTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+ //query.setGoworkTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+ }
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
index 30b786f709d785195c9120983b28dfd5357065a3..6b119c99433d11ca1901e77db2803260d726319d 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
import com.mortals.xhx.module.perform.service.PerformOtherRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -74,14 +76,16 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
@Override
protected void doListBefore(PerformOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) {
- query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
} else {
- query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
}
- if(!ObjectUtils.isEmpty(query.getCreateTime())){
- query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
- query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+ if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
+ LocalDateTime currentDate = LocalDateTime.now();
+ LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+ query.setHappenTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+ //query.setHappenTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
index 42febdc3f25a3bbda74634f939a8f0d2f3713a19..de7c1e66fce823bdad68fe8623eccc840415ea2b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
import com.mortals.xhx.module.perform.service.PerformReviewRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -81,10 +83,12 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
-
- if(!ObjectUtils.isEmpty(query.getCreateTime())){
- query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
- query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+ if(ObjectUtils.isEmpty(query.getReviewTimeStart())){
+ LocalDateTime currentDate = LocalDateTime.now();
+ LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+ query.setReviewTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+ //query.setReviewTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
+
}
}
\ No newline at end of file