|
@@ -2,6 +2,7 @@ package org.jeecg.modules.fbsAbnormalWorkingHours.service.impl;
|
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
|
|
|
import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
|
|
|
import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursType;
|
|
@@ -145,14 +146,32 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
|
|
|
public FbsAbnormalWorkingHours getAbnormalWorkingHoursReport() {
|
|
|
FbsAbnormalWorkingHours fbsAbnormalWorkingHoursResult=new FbsAbnormalWorkingHours();
|
|
|
|
|
|
+ Calendar cale = Calendar.getInstance();
|
|
|
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ String firstday, lastday;
|
|
|
+
|
|
|
+ cale = Calendar.getInstance();
|
|
|
+ cale.add(Calendar.MONTH, 0);
|
|
|
+ cale.set(Calendar.DAY_OF_MONTH, 1);
|
|
|
+ firstday = format.format(cale.getTime());
|
|
|
+
|
|
|
+ cale = Calendar.getInstance();
|
|
|
+ cale.add(Calendar.MONTH, 1);
|
|
|
+ cale.set(Calendar.DAY_OF_MONTH, 0);
|
|
|
+ lastday = format.format(cale.getTime());
|
|
|
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- String startTime = fmt.format(new Date().getTime()-14*24*60*60*1000);
|
|
|
- String endTime = fmt.format(new Date());
|
|
|
+
|
|
|
+
|
|
|
+ String startTime = firstday;
|
|
|
+ String endTime = lastday;
|
|
|
|
|
|
List<Date> dateList=startDateAndEndDate(startTime,endTime);
|
|
|
|
|
|
- LambdaQueryWrapper<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursLambdaQueryWrapper=new LambdaQueryWrapper<>();
|
|
|
- fbsAbnormalWorkingHoursLambdaQueryWrapper.eq(FbsAbnormalWorkingHours::getDelFlag,"0");
|
|
|
+ QueryWrapper<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursLambdaQueryWrapper=new QueryWrapper<>();
|
|
|
+ fbsAbnormalWorkingHoursLambdaQueryWrapper.lambda().eq(FbsAbnormalWorkingHours::getDelFlag,"0");
|
|
|
+ SimpleDateFormat fmts = new SimpleDateFormat("yyyy-MM");
|
|
|
+ String now=fmts.format(new Date());
|
|
|
+ fbsAbnormalWorkingHoursLambdaQueryWrapper.eq("DATE_FORMAT(date,'%Y-%m')",now);
|
|
|
List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=iFbsAbnormalWorkingHoursService.list(fbsAbnormalWorkingHoursLambdaQueryWrapper);
|
|
|
|
|
|
List<String> hourIdList=new ArrayList<>();
|
|
@@ -164,6 +183,9 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
|
|
|
|
|
|
LambdaQueryWrapper<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper=new LambdaQueryWrapper<>();
|
|
|
fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper.eq(FbsAbnormalWorkingHoursDescribe::getDelFlag,"0");
|
|
|
+ if(hourIdList.size()<=0){
|
|
|
+ hourIdList=null;
|
|
|
+ }
|
|
|
fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper.in(FbsAbnormalWorkingHoursDescribe::getAbnormalWorkingHoursId,hourIdList);
|
|
|
List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeList=iFbsAbnormalWorkingHoursDescribeService.list(fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper);
|
|
|
getDescribeList(fbsAbnormalWorkingHoursList,fbsAbnormalWorkingHoursDescribeList);
|