Merge remote-tracking branch 'origin/master'

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceReportController.java

@@ -124,12 +124,12 @@ public class AttendanceReportController {
	@ResponseBody
	@RequestMapping("/queryAttendanceDetailReport")
	public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(@ModelAttribute AttendanceReport attendanceReport) throws Exception {
	public CommonResponse<? extends Object> queryAttendanceDetailReport(@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		Map<String, Object> params = new HashMap<>();
		params.put("beginDay",attendanceReport.getBeginDay());
		params.put("endDay",attendanceReport.getEndDay());
		params.put("id",attendanceReport.getId());
		CommonResponse<List<Map<String, Object>>> commonResponse = attendanceReportService.queryAttendanceDetailReport(params);
		CommonResponse<? extends Object> commonResponse = attendanceReportService.queryAttendanceDetailReport(params);
		return commonResponse;

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

@@ -2,14 +2,20 @@ package com.ai.bss.security.protection.service.impl;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.worker.service.api.AttendanceStatusQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -21,16 +27,48 @@ import java.util.Map;
@Service
public class AttendanceReportServiceImpl implements AttendanceReportService {
    @Autowired
    CharSpecService charSpecService;
    @Autowired
    AttendanceStatusQuery attendanceStatusQuery;
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize) {
        //在特征表获取职务值
        List<CharacteristicSpecValue> mainjobpositionList = charSpecService.getCharSpecList(EbcConstant.MAINJOBPOSITION);
        CommonResponse<PageBean<Map<String,Object>>>  attendanceReport = null;
        try {
            attendanceReport = attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
            List<Map<String, Object>> dailyAttendanceList = attendanceReport.getData().getData();
            Map<String, Object> dailyAttendanceMap = dailyAttendanceList.get(0);
            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
            Map<String, String> paramap= new HashMap<>();
            paramap.put("beginDay",formatter.format((Date) dailyAttendanceMap.get("beginDay")));
            paramap.put("endDay",formatter.format((Date) dailyAttendanceMap.get("endDay")));
           /* for(Map<String, Object> dailyAttendance:dailyAttendanceList ){
                dailyAttendance.put("beginDay",paramap.get("beginDay"));
                dailyAttendance.put("endDay",paramap.get("endDay"));
                mainjobpositionList.forEach((mainjobposition) -> {
                    if (mainjobposition.getCode().equals(dailyAttendance.get("mainJobPositionId"))) {
                        dailyAttendance.put("mainJobPositionId", mainjobposition.getValue());
                    }
                });
            }*/
           dailyAttendanceList.forEach((dailyAttendance)-> {
                dailyAttendance.put("beginDay",paramap.get("beginDay"));
                dailyAttendance.put("endDay",paramap.get("endDay"));
                mainjobpositionList.forEach((mainjobposition) -> {
                    if (mainjobposition.getCode().equals(dailyAttendance.get("mainJobPositionId"))) {
                        dailyAttendance.put("mainJobPositionId", mainjobposition.getValue());
                    }
                });
            });
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -40,9 +78,27 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(Map<String, Object> params, int pageNumber, int pageSize) {
        params.put("statusType", EbcConstant.ATTENDANCE_STATUSTYPE_ABNORMAL);
        //在特征表获取职务值
        List<CharacteristicSpecValue> mainjobpositionList = charSpecService.getCharSpecList(EbcConstant.MAINJOBPOSITION);
        CommonResponse<PageBean<Map<String,Object>>>  attendanceReport = null;
        try {
            attendanceReport = attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
            List<Map<String, Object>> dailyAttendanceList = attendanceReport.getData().getData();
            Map<String, Object> dailyAttendanceMap = dailyAttendanceList.get(0);
            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
            Map<String, String> paramap= new HashMap<>();
            paramap.put("beginDay",formatter.format((Date) dailyAttendanceMap.get("beginDay")));
            paramap.put("endDay",formatter.format((Date) dailyAttendanceMap.get("endDay")));
            dailyAttendanceList.forEach((dailyAttendance)-> {
                dailyAttendance.put("beginDay",paramap.get("beginDay"));
                dailyAttendance.put("endDay",paramap.get("endDay"));
                mainjobpositionList.forEach((mainjobposition) -> {
                    if (mainjobposition.getCode().equals(dailyAttendance.get("mainJobPositionId"))) {
                        dailyAttendance.put("mainJobPositionId", mainjobposition.getValue());
                    }
                });
            });
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -51,24 +107,168 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
    @Override
    public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(Map<String, Object> params) {
    public CommonResponse<? extends Object> queryAttendanceDetailReport(Map<String, Object> params) {
        //在特征表获取考勤状态
        List<CharacteristicSpecValue> clockingStatusList = charSpecService.getCharSpecList(EbcConstant.CLOCKING_STATUS);
        CommonResponse<List<Map<String, Object>>> result =null;
        CommonResponse<List<Map<String, Object>>> attendanceReportResponse =  null;
        try {
            attendanceReportResponse = attendanceStatusQuery.queryAttendanceDetailReport(new CommonRequest<>(params,1,10));
            List<Map<String, Object>> attendanceReportList = attendanceReportResponse.getData();
            attendanceReportList.forEach((dailyAttendance)->{
                clockingStatusList.forEach((clockingStatus)->{
                    if(dailyAttendance.get("goToWorkStatus").equals(clockingStatus.getCode())){
                        dailyAttendance.put("goToWorkStatus", clockingStatus.getValue());
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals(clockingStatus.getCode())){
                        dailyAttendance.put("goOffWorkStatus", clockingStatus.getValue());
                    }
                });
                String[] attendanceStatusArray = new String[2];
                dailyAttendance.put("date",dailyAttendance.get("workDay"));
                dailyAttendance.put("isAbnormal",true);
                if(dailyAttendance.get("goToWorkStatus").equals("正常")&&dailyAttendance.get("goOffWorkStatus").equals("正常")){
                    //上下班都正常
                    dailyAttendance.put("isAbnormal",false);
                    attendanceStatusArray[0]="正常";
                    dailyAttendance.put("descr",attendanceStatusArray);
                }else if(!dailyAttendance.get("goToWorkStatus").equals("正常")&&!dailyAttendance.get("goOffWorkStatus").equals("正常")){
                    attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    attendanceStatusArray[1]= (String) dailyAttendance.get("goOffWorkStatus");
                    //上下班都不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("迟到")){
                        attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals("早退")){
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goToWorkStatus").equals("旷工")){
                        attendanceStatusArray[1]=null;
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
                    }
                    if(dailyAttendance.get("goToWorkStatus").equals("倒休")||dailyAttendance.get("goToWorkStatus").equals("事假")||dailyAttendance.get("goToWorkStatus").equals("年假")||dailyAttendance.get("goToWorkStatus").equals("放假")){
                        attendanceStatusArray[1]=null;
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("descr",attendanceStatusArray);
                }else{
                    //上下班一个正常一个不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("正常")){
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goOffWorkStatus");
                    }else{
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("descr",attendanceStatusArray);
                }
            });
            List<Map<String, Object>> dataList = attendanceReportResponse.getData();
            dataList.forEach((data)->{
                String[] attendanceStatus = (String[]) data.get("descr");
                String[] attendanceStatusArray = new String[1];
                if(null==attendanceStatus[1]){
                    attendanceStatusArray[0]=attendanceStatus[0];
                    data.put("descr",attendanceStatusArray);
                }
            });
            HashMap<String, Object> attendanceReportMap = new HashMap<>();
            attendanceReportMap.put("userId",params.get("id"));
            attendanceReportMap.put("avatar",null);
            attendanceReportMap.put("detail",attendanceReportResponse.getData());
            if(attendanceReportResponse.isSuccess()){
                CommonResponse<HashMap<String, Object>> ok1 = CommonResponse.ok(attendanceReportMap);
                return ok1;
            }
           
        } catch (ParseException e) {
            e.printStackTrace();
        }
        
        return attendanceReportResponse;
    }
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize) {
        //在特征表获取职务值
        List<CharacteristicSpecValue> mainjobpositionList = charSpecService.getCharSpecList(EbcConstant.MAINJOBPOSITION);
        //在特征表获取考勤状态
        List<CharacteristicSpecValue> clockingStatusList = charSpecService.getCharSpecList(EbcConstant.CLOCKING_STATUS);
        //查询日报
        CommonResponse<PageBean<Map<String,Object>>>  attendanceReport = null;
        try {
            attendanceReport = attendanceStatusQuery.queryDailyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
            List<Map<String, Object>> dailyAttendanceList = attendanceReport.getData().getData();
            dailyAttendanceList.forEach((dailyAttendance)->{
                mainjobpositionList.forEach((mainjobposition)->{
                    if(dailyAttendance.get("mainJobPositionId").equals(mainjobposition.getCode())){
                        dailyAttendance.put("mainJobPositionId", mainjobposition.getValue());
                    }
                });
                clockingStatusList.forEach((clockingStatus)->{
                    if(dailyAttendance.get("goToWorkStatus").equals(clockingStatus.getCode())){
                        dailyAttendance.put("goToWorkStatus", clockingStatus.getValue());
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals(clockingStatus.getCode())){
                        dailyAttendance.put("goOffWorkStatus", clockingStatus.getValue());
                    }
                });
                String[] attendanceStatusArray = new String[2];
                if(dailyAttendance.get("goToWorkStatus").equals("正常")&&dailyAttendance.get("goOffWorkStatus").equals("正常")){
                    //上下班都正常
                    attendanceStatusArray[0]="正常";
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
                }else if(!dailyAttendance.get("goToWorkStatus").equals("正常")&&!dailyAttendance.get("goOffWorkStatus").equals("正常")){
                    attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    attendanceStatusArray[1]= (String) dailyAttendance.get("goOffWorkStatus");
                    //上下班都不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("迟到")){
                        attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals("早退")){
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goToWorkStatus").equals("旷工")){
                        attendanceStatusArray[1]=null;
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
                    }
                    if(dailyAttendance.get("goToWorkStatus").equals("倒休")||dailyAttendance.get("goToWorkStatus").equals("事假")||dailyAttendance.get("goToWorkStatus").equals("年假")||dailyAttendance.get("goToWorkStatus").equals("放假")){
                        attendanceStatusArray[1]=null;
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
                }else{
                    //上下班一个正常一个不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("正常")){
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goOffWorkStatus");
                    }else{
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
                }
            });
        } catch (ParseException e) {
            e.printStackTrace();
        }
        List<Map<String, Object>> dataList = attendanceReport.getData().getData();
        dataList.forEach((data)->{
            String[] attendanceStatus = (String[]) data.get("attendanceStatus");
            String[] attendanceStatusArray = new String[1];
            if(null==attendanceStatus[1]){
                attendanceStatusArray[0]=attendanceStatus[0];
                data.put("attendanceStatus",attendanceStatusArray);
            }
        });
        return attendanceReport;
    }
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceReportService.java

@@ -12,7 +12,7 @@ public interface AttendanceReportService {
    CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(Map<String, Object> params, int pageNumber, int pageSize);
    CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(Map<String, Object> params);
    CommonResponse<? extends Object> queryAttendanceDetailReport(Map<String, Object> params);
    CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize);
}

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java

@@ -18,6 +18,12 @@ public class EbcConstant {
	// 异常考勤查询常量正常取值normal
	public static final String ATTENDANCE_STATUSTYPE_NORMAL = "NORMAL";
	// 特征表获得职务code
	public static final String MAINJOBPOSITION = "mainJobPosition";
	// 特征表获得职务打卡状态code
	public static final String CLOCKING_STATUS = "CLOCKING_STATUS";
	// 轨迹回放单次查询条数
	public static final int TRACK_PLAYBACK_SIZE = 100;