OA/zentao
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#6724

Browse Source 
禅道任务排期修改
This commit is contained in:
郭其兵
2025-06-30 15:14:47 +08:00
parent fdafd0841c
commit 19a4e73998
3 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/sa/zentao/service/impl/CarManageService.java
View File

@ -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<CarFiveType> 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<CarDrivingLicense> 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<CarOperatingVehicleLevel> 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;
}
}

7
src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java
View File

@ -1939,13 +1939,6 @@ public class ZtProjectServiceImpl extends ServiceImpl<ZtProjectMapper, ZtProject
if (CollectionUtils.isEmpty(list)) {
return new PageInfo<>();
}
//工时
List<ZtEffort> efforts = this.effortService.list(new QueryWrapper<ZtEffort>().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<ZtTeam> teams = this.teamService.list(new QueryWrapper<ZtTeam>().lambda().eq(ZtTeam::getType, "execution")

16
src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
View File

@ -375,14 +375,14 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> 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);
// }
// }
}
}