绩效管理

blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java

@@ -94,10 +94,7 @@ public class BsEfficiencyTaskController extends BladeController {
     public R approval(@Valid @RequestBody BsEfficiencyTaskEntity bsEfficiencyTask) {
         BsEfficiencyTaskEntity task = bsEfficiencyTaskService.getById(bsEfficiencyTask.getId());
         if (task == null) {
-            R.fail("绩效任务查询失败");
-        }
-        if(task.getIsDeleted() != 0){
-            R.fail("当前绩效任务已删除");
+            R.fail("绩效任务不存在");
         }
         if (!"1".equals(task.getType())) {
             R.fail("绩效任务类型检查失败");
@@ -122,10 +119,7 @@ public class BsEfficiencyTaskController extends BladeController {
     public R reject(@Valid @RequestBody BsEfficiencyTaskEntity bsEfficiencyTask) {
         BsEfficiencyTaskEntity task = bsEfficiencyTaskService.getById(bsEfficiencyTask.getId());
         if (task == null) {
-            R.fail("绩效任务查询失败");
-        }
-        if(task.getIsDeleted() != 0){
-            R.fail("当前绩效任务已删除");
+            R.fail("绩效任务不存在");
         }
         if (!"1".equals(task.getType())) {
             R.fail("绩效任务类型检查失败");
@@ -151,14 +145,11 @@ public class BsEfficiencyTaskController extends BladeController {
     public R subReport(@Valid @RequestBody BsEfficiencyTaskEntity bsEfficiencyTask) {
         BsEfficiencyTaskEntity subTask = bsEfficiencyTaskService.getById(bsEfficiencyTask.getId());
         if (subTask == null) {
-            R.fail("绩效任务明细查询失败");
+            R.fail("绩效任务明细不存在");
         }
         if (bsEfficiencyTask.getAttachId() == null) {
             R.fail("请先上传附件");
         }
-        if(subTask.getIsDeleted() != 0){
-            R.fail("当前绩效任务明细已删除");
-        }
         if (!"2".equals(subTask.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -184,10 +175,7 @@ public class BsEfficiencyTaskController extends BladeController {
     public R subReset(@Valid @RequestBody BsEfficiencyTaskEntity bsEfficiencyTask) {
         BsEfficiencyTaskEntity subTask = bsEfficiencyTaskService.getById(bsEfficiencyTask.getId());
         if (subTask == null) {
-            R.fail("绩效任务明细查询失败");
-        }
-        if(subTask.getIsDeleted() != 0){
-            R.fail("当前绩效任务明细已删除");
+            R.fail("绩效任务明细不存在");
         }
         if (!"2".equals(subTask.getType())) {
             R.fail("绩效任务类型检查失败");
@@ -305,14 +293,11 @@ public class BsEfficiencyTaskController extends BladeController {
     public R report(@Valid @RequestBody BsEfficiencyTaskVO bsEfficiencyTask) {
         BsEfficiencyTaskEntity task = bsEfficiencyTaskService.getById(bsEfficiencyTask.getId());
         if (task == null) {
-            R.fail("绩效任务查询失败");
+            R.fail("绩效任务不存在");
         }
         if (bsEfficiencyTask.getAttachId() == null) {
             R.fail("请先上传附件");
         }
-        if(task.getIsDeleted() != 0){
-            R.fail("当前绩效任务已删除");
-        }
         if (!"1".equals(task.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -399,12 +384,9 @@ public class BsEfficiencyTaskController extends BladeController {
     public R<BsEfficiencyTaskVO> detail(BsEfficiencyTaskDTO bsEfficiencyTask) {
         List<BsEfficiencyTaskVO> list = bsEfficiencyTaskService.selectBsEfficiencyTaskList(bsEfficiencyTask);
         if (CollectionUtils.isEmpty(list) || list.size() > 1) {
-            return R.fail("绩效填报详情查询失败");
+            return R.fail("绩效填报详情不存在");
         }
         BsEfficiencyTaskVO task = list.get(0);
-        if(task.getIsDeleted() != 0){
-            R.fail("当前绩效任务已删除");
-        }
         BsEfficiencyTaskDTO sub = new BsEfficiencyTaskDTO();
         sub.setParentId(task.getId());
         sub.setType("2");

blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java

@@ -44,10 +44,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
     public R taskAssignment(Long id) {
         BsEfficiencyTempEntity bsEfficiencyTemp = this.getById(id);
         if (bsEfficiencyTemp == null) {
-            return R.fail("绩效模板查询失败");
-        }
-        if (bsEfficiencyTemp.getIsDeleted() != 0) {
-            return R.fail("绩效模板已删除");
+            return R.fail("绩效模板不存在");
         }
         LocalDate lastMonthDate = LocalDate.now().minusMonths(1);
         String year = String.valueOf(lastMonthDate.getYear());