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

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -182,7 +182,7 @@
       </div>
     </el-dialog>
 
-    <drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" />
+    <drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" :currentNode="currentNode"/>
   </div>
 </template>
 
@@ -248,6 +248,7 @@ export default {
     },
 
     handleNodeClick(node) {
+      console.log(node,123123);
       this.currentNode = node;
       this.query = { deptId: node.id };
       this.getData();

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

@@ -91,7 +91,7 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
                query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-               query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+               query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
         super.doListBefore(query, model, context);
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java

@@ -84,7 +84,7 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java

@@ -95,7 +95,7 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java

@@ -82,7 +82,7 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         }
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
 
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java

@@ -83,7 +83,7 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java

@@ -96,7 +96,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java

@@ -120,7 +120,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
         config.protocol = "https";
         config.regionId = "central";
-        config.endpoint = domain;
+        config.endpoint = domain.replace("http://","");
         return new com.aliyun.dingtalkworkflow_1_0.Client(config);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java

@@ -98,7 +98,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         }
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java

@@ -81,7 +81,7 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java

@@ -73,7 +73,7 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
 
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java

@@ -80,7 +80,7 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java

@@ -80,7 +80,7 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java

@@ -81,7 +81,7 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java

@@ -84,7 +84,7 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -20,7 +20,7 @@
 
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="false" />
+			<property name="showSql" value="true" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file