农场 project/resource/resourceType/task/taskCate/workHour 假删除

2022-06-16 11:17:35 +08:00
parent 0ea7bf55b3
commit c43bf99629
43 changed files with 124 additions and 24 deletions
@@ -51,4 +51,6 @@ public class ProjectBaseVO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete;
+
 }
@@ -51,4 +51,6 @@ public class ProjectExcelVO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete;
+
 }
@@ -61,4 +61,6 @@ public class ProjectExportReqVO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete;
+
 }
@@ -62,4 +62,6 @@ public class ProjectPageReqVO extends PageParam {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete = false;
+
 }
@@ -68,4 +68,6 @@ public class ProjectSearchPageReqVO extends PageParam {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete;
+
 }
@@ -39,4 +39,6 @@ public class ResourceBaseVO {
    @ApiModelProperty(value = "唯一占用标识")
    private Boolean solo;

+    private Boolean pretendDelete;
+
 }
@@ -42,4 +42,6 @@ public class ResourceExcelVO {
    @ExcelProperty("")
    private Date createTime;

+    private Boolean pretendDelete;
+
 }
@@ -52,4 +52,6 @@ public class ResourceExportReqVO {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete;
+
 }
@@ -54,4 +54,6 @@ public class ResourcePageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete = false;
+
 }
@@ -15,4 +15,6 @@ public class ResourceTypeBaseVO {
    @ApiModelProperty(value = "")
    private String name;

+    private Boolean pretendDelete;
+
 }
@@ -23,4 +23,6 @@ public class ResourceTypeExcelVO {
    @ExcelProperty("")
    private Date createTime;

+    private Boolean pretendDelete;
+
 }
@@ -23,4 +23,6 @@ public class ResourceTypeExportReqVO {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete;
+
 }
@@ -25,4 +25,5 @@ public class ResourceTypePageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete = false;
 }
@@ -50,4 +50,6 @@ public class TaskBaseVO {

    @ApiModelProperty("草稿")
    private Boolean draft;
+
+    private Boolean pretendDelete;
 }
@@ -54,4 +54,6 @@ public class TaskExcelVO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete;
+
 }
@@ -61,4 +61,6 @@ public class TaskExportReqVO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete;
+
 }
@@ -63,4 +63,6 @@ public class TaskPageReqVO extends PageParam {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    private Boolean pretendDelete = false;
+
 }
@@ -23,4 +23,6 @@ public class TaskCateBaseVO {
    @NotNull(message = "不能为空")
    private String name;

+    private Boolean pretendDelete;
+
 }
@@ -26,4 +26,6 @@ public class TaskCateExcelVO {
    @ExcelProperty("")
    private Date createTime;

+    private Boolean pretendDelete;
+
 }
@@ -29,4 +29,6 @@ public class TaskCateExportReqVO {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete;
+
 }
@@ -31,4 +31,6 @@ public class TaskCatePageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete = false;
+
 }
@@ -27,4 +27,6 @@ public class WorkHourBaseVO {
    @NotNull(message = "不能为空")
    private Integer hour;

+    private Boolean pretendDelete;
+
 }
@@ -34,4 +34,6 @@ public class WorkHourExcelVO {
    @ExcelProperty("")
    private Date createTime;

+    private Boolean pretendDelete;
+
 }
@@ -34,4 +34,6 @@ public class WorkHourExportReqVO {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete;
+
 }
@@ -36,4 +36,6 @@ public class WorkHourPageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    private Boolean pretendDelete = false;
+
 }
@@ -72,4 +72,7 @@ public class ProjectDO extends BaseDO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.resource;

 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -56,4 +57,7 @@ public class ResourceDO extends BaseDO {
     */
    private Boolean solo;

+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.resourceType;

+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -29,4 +30,6 @@ public class ResourceTypeDO extends BaseDO {
     */
    private String name;

+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
 }
@@ -76,4 +76,7 @@ public class TaskDO extends BaseDO {
    @ApiModelProperty("草稿")
    private Boolean draft;

+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.taskCate;

+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -37,4 +38,7 @@ public class TaskCateDO extends BaseDO {
     */
    private String name;

+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.workHour;

+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -43,4 +44,7 @@ public class WorkHourDO extends BaseDO {
     */
    private Integer hour;

+    @ApiModelProperty("假装删除")
+    private Boolean pretendDelete;
+
 }
@@ -30,6 +30,7 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
                .betweenIfPresent(ProjectDO::getPlanEndTime, reqVO.getBeginPlanEndTime(), reqVO.getEndPlanEndTime())
                .eqIfPresent(ProjectDO::getWeight, reqVO.getWeight())
                .betweenIfPresent(ProjectDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(ProjectDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(ProjectDO::getId));
    }

@@ -45,6 +46,7 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
                .betweenIfPresent(ProjectDO::getPlanEndTime, reqVO.getBeginPlanEndTime(), reqVO.getEndPlanEndTime())
                .eqIfPresent(ProjectDO::getWeight, reqVO.getWeight())
                .betweenIfPresent(ProjectDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(ProjectDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(ProjectDO::getId));
    }

@@ -27,6 +27,7 @@ public interface ResourceMapper extends BaseMapperX<ResourceDO> {
                .betweenIfPresent(ResourceDO::getValidityEndTime, reqVO.getBeginValidityEndTime(), reqVO.getEndValidityEndTime())
                .eqIfPresent(ResourceDO::getSolo, reqVO.getSolo())
                .betweenIfPresent(ResourceDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(ResourceDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(ResourceDO::getId));
    }

@@ -40,6 +41,7 @@ public interface ResourceMapper extends BaseMapperX<ResourceDO> {
                .betweenIfPresent(ResourceDO::getValidityEndTime, reqVO.getBeginValidityEndTime(), reqVO.getEndValidityEndTime())
                .eqIfPresent(ResourceDO::getSolo, reqVO.getSolo())
                .betweenIfPresent(ResourceDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(ResourceDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(ResourceDO::getId));
    }

@@ -21,6 +21,7 @@ public interface ResourceTypeMapper extends BaseMapperX<ResourceTypeDO> {
        return selectPage(reqVO, new LambdaQueryWrapperX<ResourceTypeDO>()
                .likeIfPresent(ResourceTypeDO::getName, reqVO.getName())
                .betweenIfPresent(ResourceTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(ResourceTypeDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(ResourceTypeDO::getId));
    }

@@ -28,6 +29,7 @@ public interface ResourceTypeMapper extends BaseMapperX<ResourceTypeDO> {
        return selectList(new LambdaQueryWrapperX<ResourceTypeDO>()
                .likeIfPresent(ResourceTypeDO::getName, reqVO.getName())
                .betweenIfPresent(ResourceTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(ResourceTypeDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(ResourceTypeDO::getId));
    }

@@ -31,6 +31,7 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
                .betweenIfPresent(TaskDO::getPlanEndTime, reqVO.getBeginPlanEndTime(), reqVO.getEndPlanEndTime())
                .eqIfPresent(TaskDO::getWeight, reqVO.getWeight())
                .betweenIfPresent(TaskDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(TaskDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(TaskDO::getId));
    }

@@ -48,6 +49,7 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
                .betweenIfPresent(TaskDO::getPlanEndTime, reqVO.getBeginPlanEndTime(), reqVO.getEndPlanEndTime())
                .eqIfPresent(TaskDO::getWeight, reqVO.getWeight())
                .betweenIfPresent(TaskDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(TaskDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(TaskDO::getId));
    }

@@ -23,6 +23,7 @@ public interface TaskCateMapper extends BaseMapperX<TaskCateDO> {
                .eqIfPresent(TaskCateDO::getProjectId, reqVO.getProjectId())
                .likeIfPresent(TaskCateDO::getName, reqVO.getName())
                .betweenIfPresent(TaskCateDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(TaskCateDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(TaskCateDO::getId));
    }

@@ -32,6 +33,7 @@ public interface TaskCateMapper extends BaseMapperX<TaskCateDO> {
                .eqIfPresent(TaskCateDO::getProjectId, reqVO.getProjectId())
                .likeIfPresent(TaskCateDO::getName, reqVO.getName())
                .betweenIfPresent(TaskCateDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(TaskCateDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(TaskCateDO::getId));
    }

@@ -24,6 +24,7 @@ public interface WorkHourMapper extends BaseMapperX<WorkHourDO> {
                .eqIfPresent(WorkHourDO::getTaskId, reqVO.getTaskId())
                .eqIfPresent(WorkHourDO::getHour, reqVO.getHour())
                .betweenIfPresent(WorkHourDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(WorkHourDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(WorkHourDO::getId));
    }

@@ -34,6 +35,7 @@ public interface WorkHourMapper extends BaseMapperX<WorkHourDO> {
                .eqIfPresent(WorkHourDO::getTaskId, reqVO.getTaskId())
                .eqIfPresent(WorkHourDO::getHour, reqVO.getHour())
                .betweenIfPresent(WorkHourDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
+                .eqIfPresent(WorkHourDO::getPretendDelete, reqVO.getPretendDelete())
                .orderByDesc(WorkHourDO::getId));
    }

@@ -98,15 +98,18 @@ public class ProjectServiceImpl implements ProjectService {
    @Override
    public void deleteProject(Long id) {
        // 校验存在
-        this.validateProjectExists(id);
+        ProjectDO projectDO = this.validateProjectExists(id);
        // 删除
-        projectMapper.deleteById(id);
+        projectDO.setPretendDelete(true);
+        projectMapper.updateById(projectDO);
    }

-    private void validateProjectExists(Long id) {
-        if (projectMapper.selectById(id) == null) {
+    private ProjectDO validateProjectExists(Long id) {
+        ProjectDO projectDO = projectMapper.selectById(id);
+        if (projectDO == null) {
            throw exception(PROJECT_NOT_EXISTS);
        }
+        return projectDO;
    }

    @Override
@@ -48,15 +48,18 @@ public class ResourceServiceImpl implements ResourceService {
    @Override
    public void deleteResource(Long id) {
        // 校验存在
-        this.validateResourceExists(id);
+        ResourceDO resourceDO = this.validateResourceExists(id);
        // 删除
-        resourceMapper.deleteById(id);
+        resourceDO.setPretendDelete(true);
+        resourceMapper.updateById(resourceDO);
    }

-    private void validateResourceExists(Long id) {
-        if (resourceMapper.selectById(id) == null) {
+    private ResourceDO validateResourceExists(Long id) {
+        ResourceDO resourceDO = resourceMapper.selectById(id);
+        if (resourceDO == null) {
            throw exception(RESOURCE_NOT_EXISTS);
        }
+        return resourceDO;
    }

    @Override
@@ -48,15 +48,18 @@ public class ResourceTypeServiceImpl implements ResourceTypeService {
    @Override
    public void deleteResourceType(Long id) {
        // 校验存在
-        this.validateResourceTypeExists(id);
+        ResourceTypeDO resourceTypeDO = this.validateResourceTypeExists(id);
        // 删除
-        resourceTypeMapper.deleteById(id);
+        resourceTypeDO.setPretendDelete(true);
+        resourceTypeMapper.updateById(resourceTypeDO);
    }

-    private void validateResourceTypeExists(Long id) {
-        if (resourceTypeMapper.selectById(id) == null) {
+    private ResourceTypeDO validateResourceTypeExists(Long id) {
+        ResourceTypeDO resourceTypeDO = resourceTypeMapper.selectById(id);
+        if (resourceTypeDO == null) {
            throw exception(RESOURCE_TYPE_NOT_EXISTS);
        }
+        return resourceTypeDO;
    }

    @Override
@@ -96,15 +96,18 @@ public class TaskServiceImpl implements TaskService {
    @Override
    public void deleteTask(Long id) {
        // 校验存在
-        this.validateTaskExists(id);
+        TaskDO taskDO = this.validateTaskExists(id);
        // 删除
-        taskMapper.deleteById(id);
+        taskDO.setPretendDelete(true);
+        taskMapper.updateById(taskDO);
    }

-    private void validateTaskExists(Long id) {
-        if (taskMapper.selectById(id) == null) {
+    private TaskDO validateTaskExists(Long id) {
+        TaskDO taskDO = taskMapper.selectById(id);
+        if (taskDO == null) {
            throw exception(TASK_NOT_EXISTS);
        }
+        return taskDO;
    }

    @Override
@@ -48,15 +48,18 @@ public class TaskCateServiceImpl implements TaskCateService {
    @Override
    public void deleteTaskCate(Long id) {
        // 校验存在
-        this.validateTaskCateExists(id);
+        TaskCateDO taskCateDO = this.validateTaskCateExists(id);
        // 删除
-        taskCateMapper.deleteById(id);
+        taskCateDO.setPretendDelete(true);
+        taskCateMapper.updateById(taskCateDO);
    }

-    private void validateTaskCateExists(Long id) {
-        if (taskCateMapper.selectById(id) == null) {
+    private TaskCateDO validateTaskCateExists(Long id) {
+        TaskCateDO taskCateDO = taskCateMapper.selectById(id) ;
+        if (taskCateDO == null) {
            throw exception(TASK_CATE_NOT_EXISTS);
        }
+        return taskCateDO;
    }

    @Override
@@ -70,15 +70,18 @@ public class WorkHourServiceImpl implements WorkHourService {
    @Override
    public void deleteWorkHour(Long id) {
        // 校验存在
-        this.validateWorkHourExists(id);
+        WorkHourDO workHourDO = this.validateWorkHourExists(id);
        // 删除
-        workHourMapper.deleteById(id);
+        workHourDO.setPretendDelete(true);
+        workHourMapper.updateById(workHourDO);
    }

-    private void validateWorkHourExists(Long id) {
-        if (workHourMapper.selectById(id) == null) {
+    private WorkHourDO validateWorkHourExists(Long id) {
+        WorkHourDO workHourDO = workHourMapper.selectById(id);
+        if (workHourDO == null) {
            throw exception(WORK_HOUR_NOT_EXISTS);
        }
+        return workHourDO;
    }

    @Override