Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -183,8 +183,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -208,7 +208,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue

@@ -184,8 +184,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -224,7 +224,7 @@ export default {
             prop: "complainTitle",
             formatter: this.formatter,
           },
-          
+
           {
             label: "投诉内容",
             prop: "complainContent",

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -184,8 +184,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
 
@@ -210,7 +210,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue

@@ -184,8 +184,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -183,8 +183,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -208,7 +208,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue

@@ -183,8 +183,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -214,7 +214,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -86,8 +86,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -128,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -87,8 +87,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -129,7 +129,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -177,22 +177,22 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
-          {
-            name: "salaId",
-            type: "selectSalaId",
-            label: "大厅",
-            fuzzy: false,
-          },
           {
             name: "processStatus",
             type: "select",
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -215,7 +215,7 @@ export default {
           { label: "姓名", prop: "staffName", formatter: this.formatter },
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue

@@ -191,8 +191,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -192,8 +192,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
 
@@ -218,7 +218,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue

@@ -191,8 +191,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue

@@ -191,8 +191,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

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

@@ -269,7 +269,7 @@ export default {
 
     handleNodeClick(node) {
       this.currentNode = node;
-      this.query = Object.assign({}, { deptId: node.id }, this.query);
+      this.query = Object.assign({}, this.query, { deptId: node.id });
       this.getData();
     },
     doExport() {

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

@@ -93,8 +93,8 @@ export default {
 
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
 
@@ -115,7 +115,7 @@ export default {
 
           { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
           {

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

@@ -88,8 +88,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/window/workman/perform/list.vue

@@ -86,8 +86,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -128,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager/pom.xml

@@ -21,6 +21,7 @@
 			<properties>
 				<profiles.active>develop</profiles.active>
 				<profiles.server.port>17500</profiles.server.port>
+				<profiles.server.debug.port>51750</profiles.server.debug.port>
 				<profiles.server.path>/attendance</profiles.server.path>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
@@ -57,6 +58,7 @@
 			<properties>
 				<profiles.active>test</profiles.active>
 				<profiles.server.port>17500</profiles.server.port>
+				<profiles.server.debug.port>51750</profiles.server.debug.port>
 				<profiles.server.path>/attendance</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
@@ -90,6 +92,7 @@
 			<properties>
 				<profiles.active>product</profiles.active>
 				<profiles.server.port>17500</profiles.server.port>
+				<profiles.server.debug.port>51750</profiles.server.debug.port>
 				<profiles.server.path>/attendance</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
@@ -122,6 +125,7 @@
 			<properties>
 				<profiles.active>yibin</profiles.active>
 				<profiles.server.port>17500</profiles.server.port>
+				<profiles.server.debug.port>51750</profiles.server.debug.port>
 				<profiles.server.path>/attendance</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
@@ -156,6 +160,7 @@
 			<properties>
 				<profiles.active>reg</profiles.active>
 				<profiles.server.port>17500</profiles.server.port>
+				<profiles.server.debug.port>51750</profiles.server.debug.port>
 				<profiles.server.path>/attendance</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
@@ -190,6 +195,7 @@
 			<properties>
 				<profiles.active>pengxi</profiles.active>
 				<profiles.server.port>17500</profiles.server.port>
+				<profiles.server.debug.port>51750</profiles.server.debug.port>
 				<profiles.server.path>/attendance</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr>

attendance-performance-manager/src/main/bin/shutdown.sh

@@ -22,5 +22,6 @@ fi
 echo "stoping application $PROJECT_NAME......"
 
 kill -15 ${pid}
+sleep 5
 
 echo "Send shutdown request to Server $PROJECT_NAME OK"

attendance-performance-manager/src/main/bin/start.sh

 #!/bin/sh
 PORT="@profiles.server.port@"
+DEBUG_PORT=@profiles.server.debug.port@
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
@@ -60,7 +61,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
 				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=51750 \
+				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -68,7 +68,6 @@ Content-Type: application/json
 
 ###海康考勤打卡记录原始记录同步
 POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -79,10 +78,9 @@ Content-Type: application/json
 
 ###考勤汇总计算
 POST {{baseUrl}}//attendance/stat/summary
-Authorization: {{authToken}}
 Content-Type: application/json
 
-{"summaryTimeStart":"2024-01-01","summaryTimeEnd":"2024-12-30"}
+{"summaryTimeStart":"2024-02-01","summaryTimeEnd":"2024-02-29"}
 
 
 ###短信设置编辑