diff --git a/src/main/java/com/sa/zentao/service/impl/CarManageService.java b/src/main/java/com/sa/zentao/service/impl/CarManageService.java index dfb9d71..f1ebd91 100644 --- a/src/main/java/com/sa/zentao/service/impl/CarManageService.java +++ b/src/main/java/com/sa/zentao/service/impl/CarManageService.java @@ -11,6 +11,7 @@ import com.sa.zentao.entity.CarOperatingVehicleLevel; import com.sa.zentao.service.ICarDrivingLicenseService; import com.sa.zentao.service.ICarFiveTypeService; import com.sa.zentao.service.ICarOperatingVehicleLevelService; +import com.sa.zentao.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.*; @@ -21,6 +22,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import java.util.*; +import java.util.stream.Collectors; @Service public class CarManageService { @@ -50,7 +52,13 @@ public class CarManageService { } List list = carFiveTypeService.list(eq); if(!CollectionUtils.isEmpty(list)){ - return list.get(0); + CarFiveType carFiveType = list.get(0); + int i = DateUtils.daysBetween(carFiveType.getCreateTime(), new Date()); + if(i>90){ + carFiveTypeService.removeById(carFiveType.getId()); + }else{ + return carFiveType; + } } if(StringUtils.isEmpty(plate)){ @@ -108,18 +116,23 @@ public class CarManageService { List list = carDrivingLicenseService.list(eq); if(!CollectionUtils.isEmpty(list)){ CarDrivingLicense carDrivingLicense = list.get(0); - if(!StringUtils.isEmpty(owner)&&carDrivingLicense.getSyr().equals(owner)&&carDrivingLicense.getSyrFlag()!=null&&carDrivingLicense.getSyrFlag().equals(1)){ - return carDrivingLicense; - }else if(!StringUtils.isEmpty(owner)){ - carDrivingLicense.setOwner("不一致"); - carDrivingLicense.setSyr("不一致"); - carDrivingLicense.setSyrFlag(2); - return carDrivingLicense; + int i = DateUtils.getbetweenDays(carDrivingLicense.getCreateTime(), new Date()); + if(i>90){ + this.carDrivingLicenseService.removeById(carDrivingLicense.getId()); }else{ - carDrivingLicense.setOwner(""); - carDrivingLicense.setSyr(""); - carDrivingLicense.setSyrFlag(0); - return carDrivingLicense; + if(!StringUtils.isEmpty(owner)&&carDrivingLicense.getSyr().equals(owner)&&carDrivingLicense.getSyrFlag()!=null&&carDrivingLicense.getSyrFlag().equals(1)){ + return carDrivingLicense; + }else if(!StringUtils.isEmpty(owner)){ + carDrivingLicense.setOwner("不一致"); + carDrivingLicense.setSyr("不一致"); + carDrivingLicense.setSyrFlag(2); + return carDrivingLicense; + }else{ + carDrivingLicense.setOwner(""); + carDrivingLicense.setSyr(""); + carDrivingLicense.setSyrFlag(0); + return carDrivingLicense; + } } } String url ="http://api.chequan.cn/?a=vehicleLicenseInfo&user=dgkjshdxm&token=eab3335e2ffe15b8410553cedc1f589a&plate=" + plate +"&model=" + model; @@ -183,7 +196,13 @@ public class CarManageService { List list = carOperatingVehicleLevelService.list(eq); if(!CollectionUtils.isEmpty(list)){ - return list; + CarOperatingVehicleLevel carOperatingVehicleLevel = list.get(0); + int i = DateUtils.getbetweenDays(carOperatingVehicleLevel.getCreateTime(), new Date()); + if(i>90){ + this.carOperatingVehicleLevelService.removeBatchByIds(list.stream().map(o->o.getId()).collect(Collectors.toList())); + }else{ + return list; + } } diff --git a/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java index 068e2b0..0064df8 100644 --- a/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java +++ b/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java @@ -1939,13 +1939,6 @@ public class ZtProjectServiceImpl extends ServiceImpl(); } - //工时 - List efforts = this.effortService.list(new QueryWrapper().lambda() - .eq(ZtEffort::getObjecttype, "task") - .in(ZtEffort::getObjectid, list.stream().map(o -> o.getId()).collect(Collectors.toList())) - .gt(ZtEffort::getDate, new Date(firstDayOfMonth.getTime())).le(ZtEffort::getDate, lastDayOfMonth) - ); - List teams = this.teamService.list(new QueryWrapper().lambda().eq(ZtTeam::getType, "execution") diff --git a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java index 0161ba0..084aa0e 100644 --- a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java +++ b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java @@ -375,14 +375,14 @@ public class ZtTaskServiceImpl extends ServiceImpl impleme } else { if (task.getFinishedDate() == null) { //直接完成任务等待审核不需要管 - if (task.getFinishedFlag() == 1) { - //直接完成任务的不管 - } else { - //当前时间大于预计完成时间 - if (new Date().getTime() > DateUtils.getDayLast(task.getDeadline()).getTime()) { - delayList.add(task); - } - } +// if (task.getFinishedFlag() == 1) { +// //直接完成任务的不管 +// } else { +// //当前时间大于预计完成时间 +// if (new Date().getTime() > DateUtils.getDayLast(task.getDeadline()).getTime()) { +// delayList.add(task); +// } +// } } }