修改考勤规则查询接口

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

@@ -194,30 +194,36 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
            attendanceRuleDto.setPlanCycleType(workTaskSpecPlan.getPlanCycleType());
            attendanceRuleDto.setPlanMemo(workTaskSpecPlan.getPlanMemo());
            attendanceRuleDto.setWorkTaskSpecPlanId(workTaskSpecPlan.getWorkTaskSpecPlanId());
            Map monthStartMap = new HashMap();
            Map monthEndMap = new HashMap();
            if(!workTaskSpecPlan.getPlanCycleType().equals(WorkTaskSpecPlan.PLAN_CYCLE_TYPE_NATURE_MONTH)){
                String beginTime =DateUtil.formatDate(workTaskSpecPlan.getBeginTime(),DateUtil.NORM_YYYY_MM_PATTERN);
                String endTime =DateUtil.formatDate(workTaskSpecPlan.getEndTime(),DateUtil.NORM_YYYY_MM_PATTERN);
                String beginDay =DateUtil.formatDate(workTaskSpecPlan.getBeginTime(),DateUtil.NORM_DAY_PATTERN);
                String endDay =DateUtil.formatDate(workTaskSpecPlan.getEndTime(),DateUtil.NORM_DAY_PATTERN);
                Map monthStartMap = new HashMap();
                Map monthEndMap = new HashMap();
                if(beginTime.equals(DateUtil.getThisMonth())){
                    monthStartMap.put("type","0");//本月类型
                    monthStartMap.put("type",0);//本月类型
                }else{
                    monthStartMap.put("type","-1");//上个月类型
                    monthStartMap.put("type",-1);//上个月类型
                }
                monthStartMap.put("day",beginDay);
                monthStartMap.put("day",Integer.parseInt(beginDay));
                if(endTime.equals(DateUtil.getNextMonth())){
                    monthEndMap.put("type","1");//下个月类型
                    monthEndMap.put("type",1);//下个月类型
                }else{
                    monthEndMap.put("type","0");//本月类型
                    monthEndMap.put("type",0);//本月类型
                }
                monthEndMap.put("day",endDay);
                attendanceRuleDto.setMonthStart(monthStartMap);
                attendanceRuleDto.setMonthEnd(monthEndMap);
                monthEndMap.put("day",Integer.parseInt(endDay));
            }else{
                //自然月返回本月第一天和本月最后一天
                monthStartMap.put("type",0);
                monthStartMap.put("day",1);
                monthEndMap.put("type",0);
                monthEndMap.put("day",DateUtil.getThisMonthLastDay(DateUtil.NORM_DAY_PATTERN));
            }
            attendanceRuleDto.setMonthStart(monthStartMap);
            attendanceRuleDto.setMonthEnd(monthEndMap);
            workTaskSpecPlan.setBeginTime(workTaskSpecPlan.getBeginTime());
            workTaskSpecPlan.setEndTime(workTaskSpecPlan.getEndTime());
            attendanceRuleDto.setName(attendanceTaskSpec.getName());

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

@@ -69,7 +69,7 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		Map<String, String> allTypeMap = charSpecService.getCharSpecMap(EbcConstant.BUSINESS_SPEC_WORK_ORDER_TYPE);
		for (Map<String, Object> map : list) {
			map.put("approvalTypeName", allTypeMap.get(map.get("appovalSubType").toString()));
			map.put("approvalTypeName", allTypeMap.get(map.get("appovalSubType")==null?"":map.get("appovalSubType").toString()));
			JSONObject charValueJsonObj = JSONObject.parseObject(map.get("charValueSet").toString());
			map.put("reclockingTime", charValueJsonObj.getString("reclockingTime"));

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

@@ -517,4 +517,20 @@ public class DateUtil {
		return accDate;
	}
	/**
	 * 获取当月最后一天
	 * @return
	 */
	public static int getThisMonthLastDay(String pattern){
		//设置时间格式
		SimpleDateFormat format = new SimpleDateFormat(pattern);
		//获得实体类
		Calendar ca = Calendar.getInstance();
		//设置最后一天
		ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
		//最后一天格式化
		String lastDay = format.format(ca.getTime());
		return Integer.parseInt(lastDay);
	}
}