Merge remote-tracking branch 'origin/master'

ebc-middle-platform/src/modules/attendance/attendance.vue

@@ -168,6 +168,7 @@ export default {
      // }
      this.queryCondition.singleDateVal = this.getTime(2)
      this.queryCondition.dateType = !(index === 2)
      this.table.pager.currentPage = 1
      this.getList()
    },
    onChangeDate(value) {
@@ -266,9 +267,9 @@ export default {
      }
      this.modalData.date = this.getBeforeDate(6, data) + ' ~ ' + data
      var beginDay = this.getBeforeDate(6, data)
      this.modalData.userName = row.userName
      this.modalData.duty = row.duty
      this.modalData.days = row.gateDays
      this.modalData.userName = row.name
      this.modalData.duty = row.mainJobPositionId
      this.modalData.days = row.clockingDays
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, {
          data:{
@@ -282,7 +283,12 @@ export default {
        })
        .then((res) => {
          // 请求成功处理...
          this.modalData.table = res.data
          var arr = []
          res.data.forEach(e => {
            if (e.goToWorkTime)
              arr.push(e)
          })
          this.modalData.table = arr
        })
        .catch((res) => {
          // 请求失败处理...
@@ -295,24 +301,31 @@ export default {
      } else {
        this.monthModalData.date = this.queryCondition.singleDateVal
      }
      this.monthModalData.userName = row.userName
      this.monthModalData.duty = row.duty
      this.monthModalData.days = row.gateDays
      this.monthModalData.userName = row.name
      this.monthModalData.duty = row.mainJobPositionId
      this.monthModalData.days = row.clockingDays
      this.monthModalData.EMPLOYEE_ID = row.EMPLOYEE_ID
      var lastDay = this.getLastDay(this.queryCondition.singleDateVal+'-01')
      debugger
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, {
          data:{
            id:row.id+"",
            mark:'month',
            beginDay:this.queryCondition.singleDateVal,
            endDay:this.queryCondition.singleDateVal
            beginDay:this.queryCondition.singleDateVal + '-01',
            endDay:lastDay
          },
          pageNumber:0,
          pageSize:0
        })
        .then((res) => {
          // 请求成功处理...
          this.monthModalData.table.data = res.data
          var arr = []
          res.data.forEach(e => {
            if (e.goToWorkTime)
              arr.push(e)
          })
          this.monthModalData.table.data = arr
          // this.monthModalData.table.pager.total = res.data.total
        })
        .catch((res) => {
@@ -333,6 +346,16 @@ export default {
      // )
    },
    getLastDay(d) {
      var now = Date.parse(d)
      var seperator1 = "-"
      var date=new Date(now)
      var new_month = date.getMonth()+1
      var new_year = date.getFullYear()
      var new_date = new Date(new_year,new_month,1)
      var currentdate = new_year + seperator1 + new_month + seperator1 +(new Date(new_date.getTime()-1000*60*60*24)).getDate()
      return currentdate
    },
    getTime(type) {
      var date = new Date()
      var year = date.getFullYear()

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/AttendanceManageServiceImpl.java

@@ -44,6 +44,7 @@ public class AttendanceManageServiceImpl implements AttendanceManageService {
                    paramMap.put("workDay", data.get("currentDate"));
                    paramMap.put("nameAsLike", data.get("userName"));
                    paramMap.put("orgId", data.get("orgId"));
                    paramMap.put("attendanceStatusType","'NOR','LAT'");
                    //查询日考勤
                    attendanceReport = attendanceStatusQuery.queryDailyAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
@@ -52,6 +53,7 @@ public class AttendanceManageServiceImpl implements AttendanceManageService {
                    paramMap.put("endTime", data.get("currentDate"));
                    paramMap.put("nameAsLike", data.get("userName"));
                    paramMap.put("orgId", data.get("orgId"));
                    paramMap.put("attendanceStatusType","'NOR','LAT'");
                    //查询周考勤
                    attendanceReport = attendanceStatusQuery.queryCustomAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
@@ -59,6 +61,7 @@ public class AttendanceManageServiceImpl implements AttendanceManageService {
                    paramMap.put("month", data.get("currentDate"));
                    paramMap.put("nameAsLike", data.get("userName"));
                    paramMap.put("orgId", data.get("orgId"));
                    paramMap.put("attendanceStatusType","'NOR','LAT'");
                    //查询月考勤
                    attendanceReport= attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
                }

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

@@ -148,11 +148,13 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
                    }
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[1]=null;
                        //attendanceStatusArray[1]=null;
                        attendanceStatusArray[1]="旷工"+dailyAttendance.get("goOffWorkTime") +"天";
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
                    }
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[1]=null;
                        //attendanceStatusArray[1]=null;
                        attendanceStatusArray[1]=(String) dailyAttendance.get("goOffWorkStatus");
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("descr",attendanceStatusArray);
@@ -242,11 +244,13 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
                    }
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[1]=null;
                        //attendanceStatusArray[1]=null;
                        attendanceStatusArray[1]="旷工"+dailyAttendance.get("goOffWorkTime") +"天";
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
                    }
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[1]=null;
                        //attendanceStatusArray[1]=null;
                        attendanceStatusArray[1]=(String) dailyAttendance.get("goOffWorkStatus");
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
                    }