修改日报bug

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

package com.ai.bss.security.protection.controller;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * 获取字典表属性
 */
@Controller
@RequestMapping("/charSpec")
public class CharSpecController {
	Logger logger = LoggerFactory.getLogger(CharSpecController.class);
	@Autowired
	CharSpecService charSpecService;
	/**
	 * 根据特征属性编码获取对应的属性值
	 * @param charSpecCode 特征属性编码
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getCharSpecList")
	public List<CharacteristicSpecValue> getCharSpecList(@RequestParam("charSpecCode") String charSpecCode) throws Exception {
		List<CharacteristicSpecValue> charSpecList = charSpecService.getCharSpecList(charSpecCode);
		return charSpecList;
	}
	/**
	 * 根据特征属性编码获取对应的属性值，并以code—>value的形式存放到Map中
	 * @param charSpecCode 特征属性编码
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getCharSpecMap")
	public Map<String, String> getCharSpecMap(@RequestParam("charSpecCode") String charSpecCode){
		Map<String, String> charSpecMap = charSpecService.getCharSpecMap(charSpecCode);
		return charSpecMap;
	}
}

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

package com.ai.bss.security.protection.controller;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import java.util.Map;
/**
 * 假勤管理
 */
@Controller
@RequestMapping("/vacationAttendanceManage")
public class vacationAttendanceManageController {
	Logger logger = LoggerFactory.getLogger(vacationAttendanceManageController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析
	 */
	@ResponseBody
	@RequestMapping("/queryPageAttendanceCount")
	public PageInfo queryPageAttendanceCount(Map params) throws Exception {
		// 当前页数
		int pageNum = (int)params.get("pageNum") < 1 ? 1 : (int)params.get("pageNum");
		// 每页条数
		int pageSize = (int)params.get("pageSize") < 1 ? 1: (int)params.get("pageSize");
		if(params.get("currentDate")==null|| params.get("currentDate").equals("")){
			params.put("currentDate",new Date());
		}
		PageInfo pageInfo = areaInRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
		return pageInfo;
	}
}

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

            attendanceReportList.forEach((dailyAttendance)->{
                clockingStatusList.forEach((clockingStatus)->{
                    if(dailyAttendance.get("goToWorkStatus").equals(clockingStatus.getCode())){
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goToWorkStatus"))){
                        dailyAttendance.put("goToWorkStatus", clockingStatus.getValue());
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals(clockingStatus.getCode())){
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goOffWorkStatus"))){
                        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("正常")){
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
                    //上下班都正常
                    dailyAttendance.put("isAbnormal",false);
                    attendanceStatusArray[0]="正常";
                    dailyAttendance.put("descr",attendanceStatusArray);
                }else if(!dailyAttendance.get("goToWorkStatus").equals("正常")&&!dailyAttendance.get("goOffWorkStatus").equals("正常")){
                }else if(!"正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
                    attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    attendanceStatusArray[1]= (String) dailyAttendance.get("goOffWorkStatus");
                    //上下班都不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("迟到")){
                    if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals("早退")){
                    if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goToWorkStatus").equals("旷工")){
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
                        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("放假")){
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[1]=null;
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("descr",attendanceStatusArray);
                }else{
                    //上下班一个正常一个不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("正常")){
                    if("正常".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goOffWorkStatus");
                    }else{
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                });
                clockingStatusList.forEach((clockingStatus)->{
                    if(dailyAttendance.get("goToWorkStatus").equals(clockingStatus.getCode())){
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goToWorkStatus"))){
                        dailyAttendance.put("goToWorkStatus", clockingStatus.getValue());
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals(clockingStatus.getCode())){
                    if(clockingStatus.getCode().equals(dailyAttendance.get("goOffWorkStatus"))){
                        dailyAttendance.put("goOffWorkStatus", clockingStatus.getValue());
                    }
                });
                String[] attendanceStatusArray = new String[2];
                if(dailyAttendance.get("goToWorkStatus").equals("正常")&&dailyAttendance.get("goOffWorkStatus").equals("正常")){
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
                    //上下班都正常
                    dailyAttendance.put("isAbnormal",false);
                    attendanceStatusArray[0]="正常";
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
                }else if(!dailyAttendance.get("goToWorkStatus").equals("正常")&&!dailyAttendance.get("goOffWorkStatus").equals("正常")){
                    dailyAttendance.put("descr",attendanceStatusArray);
                }else if(!"正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
                    attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    attendanceStatusArray[1]= (String) dailyAttendance.get("goOffWorkStatus");
                    //上下班都不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("迟到")){
                    if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goOffWorkStatus").equals("早退")){
                    if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
                    }
                    if(dailyAttendance.get("goToWorkStatus").equals("旷工")){
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
                        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("放假")){
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[1]=null;
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
                    dailyAttendance.put("descr",attendanceStatusArray);
                }else{
                    //上下班一个正常一个不正常
                    if(dailyAttendance.get("goToWorkStatus").equals("正常")){
                    if("正常".equals(dailyAttendance.get("goToWorkStatus"))){
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goOffWorkStatus");
                    }else{
                        attendanceStatusArray[0]= (String) dailyAttendance.get("goToWorkStatus");
                    }
                    dailyAttendance.put("attendanceStatus",attendanceStatusArray);
                    dailyAttendance.put("descr",attendanceStatusArray);
                }
            });
        } catch (ParseException e) {