#6724

禅道任务排期修改

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<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,6 +116,10 @@ public class CarManageService {
         List<CarDrivingLicense> list = carDrivingLicenseService.list(eq);
         if(!CollectionUtils.isEmpty(list)){
             CarDrivingLicense carDrivingLicense = list.get(0);
+            int i = DateUtils.getbetweenDays(carDrivingLicense.getCreateTime(), new Date());
+            if(i>90){
+                this.carDrivingLicenseService.removeById(carDrivingLicense.getId());
+            }else{
                 if(!StringUtils.isEmpty(owner)&&carDrivingLicense.getSyr().equals(owner)&&carDrivingLicense.getSyrFlag()!=null&&carDrivingLicense.getSyrFlag().equals(1)){
                     return carDrivingLicense;
                 }else if(!StringUtils.isEmpty(owner)){
@@ -122,6 +134,7 @@ public class CarManageService {
                     return carDrivingLicense;
                 }
             }
+        }
         String url ="http://api.chequan.cn/?a=vehicleLicenseInfo&user=dgkjshdxm&token=eab3335e2ffe15b8410553cedc1f589a&plate=" + plate +"&model=" + model;
         if(!StringUtils.isEmpty(owner)){
             url+="&owner=" + owner;
@@ -183,8 +196,14 @@ public class CarManageService {
 
         List<CarOperatingVehicleLevel> list = carOperatingVehicleLevelService.list(eq);
         if(!CollectionUtils.isEmpty(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;
             }
+        }
 
 
         HttpHeaders headers = new HttpHeaders();

src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java

@@ -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")

src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java

@@ -375,14 +375,14 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
             } else {
                 if (task.getFinishedDate() == null) {
                     //直接完成任务等待审核不需要管
-                    if (task.getFinishedFlag() == 1) {
+//                    if (task.getFinishedFlag() == 1) {
-                        //直接完成任务的不管
+//                        //直接完成任务的不管
-                    } else {
+//                    } else {
-                        //当前时间大于预计完成时间
+//                        //当前时间大于预计完成时间
-                        if (new Date().getTime() > DateUtils.getDayLast(task.getDeadline()).getTime()) {
+//                        if (new Date().getTime() > DateUtils.getDayLast(task.getDeadline()).getTime()) {
-                            delayList.add(task);
+//                            delayList.add(task);
-                        }
+//                        }
-                    }
+//                    }
                 }
             }