Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

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

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

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

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

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

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()));
         }
     }
 

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

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

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

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

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