Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/Home.vue

@@ -76,7 +76,7 @@
                     出勤率<el-tooltip
                       class="item"
                       effect="dark"
-                      content="昨日缺卡人数与考勤总人数比值"
+                      content="昨日考勤人数与考勤总人数比值"
                       placement="top-start"
                     >
                       <i

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

@@ -190,7 +190,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择异常时间",
             fuzzy: false,
           },
           {

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

@@ -197,7 +197,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择投诉时间",
             fuzzy: false,
           },
           {

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

@@ -192,7 +192,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择发生时间",
             fuzzy: false,
           },
           {

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

@@ -191,7 +191,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择办理时间",
             fuzzy: false,
           },
           {
@@ -209,7 +209,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/other/record/list.vue

@@ -190,7 +190,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择发生时间",
             fuzzy: false,
           },
           {

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

@@ -196,7 +196,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择评价时间",
             fuzzy: false,
           },
           {

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

@@ -99,7 +99,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择登记年月",
             fuzzy: false,
           },
           {

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

@@ -100,7 +100,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择登记年月",
             fuzzy: false,
           },
           {

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

@@ -198,7 +198,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择异常时间",
             fuzzy: false,
           },
           {

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

@@ -204,7 +204,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择投诉时间",
             fuzzy: false,
           },
           {

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

@@ -200,7 +200,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择发生时间",
             fuzzy: false,
           },
           {

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

@@ -198,7 +198,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择办理时间",
             fuzzy: false,
           },
           {

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

@@ -198,7 +198,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择发生时间",
             fuzzy: false,
           },
           {

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

@@ -204,7 +204,7 @@ export default {
           {
             name: "createTimeMonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择评价时间",
             fuzzy: false,
           },
           {

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

@@ -59,7 +59,13 @@
       </el-col>
       <el-col :span="18" :xs="12">
         <el-row>
-          <LayoutTable notDel notAdd :data="tableData" :config="tableConfig">
+          <LayoutTable
+            notDel
+            notAdd
+            :data="tableData"
+            :config="tableConfig"
+            ref="layoutTable"
+          >
             <el-button
               type="primary"
               @click="doExport"
@@ -184,8 +190,8 @@
         </el-checkbox>
       </el-checkbox-group>
       <div class="mt20" style="text-align:right">
-        <el-button>取消</el-button>
-        <el-button type="primary">确定</el-button>
+        <el-button @click="() => (isdialog = falsle)">取消</el-button>
+        <el-button type="primary" @click="handleOk">确定</el-button>
       </div>
     </el-dialog>
 
@@ -218,11 +224,30 @@ export default {
     });
   },
   methods: {
+    handleOk() {
+      this.config.columns.forEach((v) => {
+        v.prop ? (v.show = false) : (v.show = true);
+        this.checkList.forEach((val) => {
+          if (val == v.label) {
+            v.show = true;
+          }
+        });
+      });
+      console.log(this.config.columns);
+      this.$forceUpdate(this.config.columns);
+      this.isdialog = false;
+    },
     // 自定义字段
     SelectEXport() {
       this.setcolum = this.config.columns.filter(
         (item) => item.label && item.prop
       );
+      console.log(this.config.columns);
+      this.checkList = this.setcolum.map((v) => {
+        if (v.show) {
+          return v.label;
+        }
+      });
       this.isdialog = true;
     },
     /** 同步 */
@@ -268,8 +293,10 @@ export default {
     },
 
     handleNodeClick(node) {
+      delete this.$route.query.page;
       this.currentNode = node;
       this.query = Object.assign({}, this.query, { deptId: node.id });
+      this.query.page = 1;
       this.getData();
     },
     doExport() {
@@ -319,6 +346,7 @@ export default {
         this.tableData.staff.refreshDate,
         6
       );
+      this.$refs.layoutTable.showType = "tableSelect";
     },
   },
   data() {
@@ -340,6 +368,7 @@ export default {
         url: process.env.VUE_APP_API_BASE_URL + "/staff/importData",
       },
       config: {
+        showType: "tableSelect",
         search: [
           {
             name: "name",
@@ -355,27 +384,45 @@ export default {
           },
         ],
         columns: [
-          { type: "selection", width: 60 },
-          { type: "index", label: "序号", width: 50 },
-          { label: "员工姓名", prop: "name" },
-          { label: "工号", prop: "workNum" },
-          { label: "部门", prop: "deptName" },
-          { label: "职位", prop: "positionName", formatter: this.formatters },
+          { type: "selection", width: 60, show: true },
+          { type: "index", label: "序号", width: 50, show: true },
+          { label: "员工姓名", prop: "name", show: true },
+          { label: "工号", prop: "workNum", show: true },
+          { label: "部门", prop: "deptName", show: true },
+          {
+            label: "职位",
+            prop: "positionName",
+            formatter: this.formatters,
+            show: true,
+          },
           {
             label: "员工类型",
             prop: "staffType",
             formatter: this.formatterType,
+            show: true,
+          },
+          {
+            label: "员工状态",
+            prop: "status",
+            formatter: this.formatter,
+            show: true,
           },
-          { label: "员工状态", prop: "status", formatter: this.formatter },
           {
             label: "是否在政务中心",
             prop: "source",
             formatter: this.formatterSource,
+            show: true,
           }, //未对
-          { label: "手机号", prop: "phoneNumber", formatter: this.formatters },
+          {
+            label: "手机号",
+            prop: "phoneNumber",
+            formatter: this.formatters,
+            show: true,
+          },
           {
             label: "操作",
             width: 240,
+            show: true,
             formatter: (row) => {
               return (
                 // <table-buttons

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

@@ -99,9 +99,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTimeMonth",
+            name: "yearmonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择登记年月",
             fuzzy: false,
           },
           {

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

@@ -97,9 +97,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTimeMonth",
+            name: "yearmonth",
             type: "month",
-            label: "请选择月份",
+            label: "请选择登记年月",
             fuzzy: false,
           },
           {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java

@@ -201,6 +201,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
                     leaveRecord.setRemark(process);
                     leaveRecord.setStaffId(item.getCustomerId());
                     waitSyncLeaveRecords.add(leaveRecord);
+
+                    log.info("更新记录成功==>"+process);
                 }
             } else {
                 nextToken = DataUtil.converStr2Long(rest.getData().getNextToken(), 0L);

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

@@ -219,7 +219,16 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
                 List<AttendanceStaffStatEntity> attendanceStaffStatEntities = item.getAttendanceStaffStatEntities();
                 Map<Integer, String> collect = new HashMap<>();
                 if (!ObjectUtils.isEmpty(attendanceStaffStatEntities)) {
-                    collect = attendanceStaffStatEntities.stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary(),(o,n)->n));
+                    for(AttendanceStaffStatEntity staffStat:attendanceStaffStatEntities){
+                        Integer key = staffStat.getYear() + staffStat.getMonth() + staffStat.getDay();
+                        if(collect.containsKey(key)){
+                            String value = collect.get(key)+";"+staffStat.getAttendanceSummary();
+                            collect.put(key,value);
+                        }else {
+                            collect.put(key,staffStat.getAttendanceSummary());
+                        }
+                    }
+                    //collect = attendanceStaffStatEntities.stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary(),(o,n)->n));
                 }
                 List<Map<String, Object>> mapList = new ArrayList<>();
                 for (int i = 0; i <= subDay.intValue(); i++) {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/AbstractDingTalkService.java

@@ -94,7 +94,7 @@ public abstract class AbstractDingTalkService implements IDingPersonService {
                 if (rsp.getErrcode() == 0) {
                     cacheService.setnx(RedisKey.KEY_DINGTALK_ACCESSTOKEN_CACHE, rsp.getAccessToken(), 7200);
 
-                   log.info("redis dingding token:{}",cacheService.get(RedisKey.KEY_DINGTALK_ACCESSTOKEN_CACHE));
+                  // log.info("redis dingding token:{}",cacheService.get(RedisKey.KEY_DINGTALK_ACCESSTOKEN_CACHE));
                     return rsp.getAccessToken();
                 } else {
                     throw new AppException(String.format("code:{},errorMsg:{}", rsp.getErrcode(), rsp.getErrmsg()));

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

@@ -223,7 +223,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             listProcessInstanceIdsHeaders.xAcsDingtalkAccessToken = getToken();
             HashMap<String, String> map = new HashMap<>();
             listProcessInstanceIdsHeaders.setCommonHeaders(map);
-            log.info("oaUrl===>{}",oaUrl);
+           // log.info("oaUrl===>{}",oaUrl);
             if(!ObjectUtils.isEmpty(oaUrl)){
                 listProcessInstanceIdsHeaders.getCommonHeaders().put("host", oaUrl);
             }

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml

@@ -70,7 +70,7 @@
         s.deptName,
         s.staffId,
         s.staffName
-        ) AS a ORDER BY a.salaName,a.deptName,a.staffName
+        ) AS a ORDER BY CONVERT(a.salaName USING gbk),CONVERT(a.deptName USING gbk),CONVERT(a.staffName USING gbk)
     </select>
 
     <select id="getListCountExt" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="int">

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

@@ -107,8 +107,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "startTimeStart":"2024-03-04",
-  "endTimeEnd":"2024-03-04"
+  "startTimeStart":"2024-03-12",
+  "endTimeEnd":"2024-03-12"
 }