Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafetyTaskController.java

@@ -3,6 +3,7 @@ package com.xunmei.core.safetyCheck.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xunmei.common.core.vo.IdNameVo;
@@ -56,10 +57,18 @@ public class CoreSafetyTaskController extends BaseController {
         return coreSafetyTaskService.selectPage(coreSafetyTask);
     }
 
+    @ApiOperation(value = "删除任务")
+    @RequiresPermissions("core:task:list")
+    @DeleteMapping("/task/{taskId}")
+    public AjaxResult remove(@PathVariable @NotNull Long taskId) {
+        boolean b = coreSafetyTaskService.removeById(taskId);
+        return success(b);
+    }
+
     @ApiOperation(value = "履职计划下拉框")
     @GetMapping("/plan")
     public AjaxResult plan(Long orgId) {
-        List<CoreSafecheckPlan> list = planService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getCheckOrg,orgId));
+        List<CoreSafecheckPlan> list = planService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getCheckOrg, orgId));
         return success(list);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -1,16 +1,20 @@
 package com.xunmei.core.safetyCheck.service.impl;
 
+import java.io.Serializable;
 import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.vo.IdNameVo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
 import com.xunmei.core.safetyCheck.enums.SafetyTaskSourceType;
 import com.xunmei.core.safetyCheck.mapper.CoreSafecheckPlanToRoleMapper;
@@ -20,6 +24,7 @@ import com.xunmei.core.safetyCheck.vo.CheckNfcRecord;
 import com.xunmei.core.safetyCheck.vo.plan.SafetyPlanRoleVo;
 import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteRoleService;
+import org.ehcache.config.ResourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -143,6 +148,16 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         return coreSafetyTaskMapper.selectList(new QueryWrapper<>(coreSafetyTask));
     }
 
+    @Override
+    public boolean removeById(Serializable taskId) {
+        LambdaUpdateWrapper<CoreSafetyTask> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CoreSafetyTask::getId, taskId)
+                .eq(CoreSafetyTask::getSourceType, 1)
+                .eq(CoreSafetyTask::getSubmitorId, SecurityUtils.getUserId());
+
+        return baseMapper.delete(wrapper) > 0;
+    }
+
     /**
      * 新增【请填写功能名称】
      *

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -208,6 +208,7 @@
         t.start_time,
         t.end_time,
         t.`status`,
+        t.submitor_id,
         t.submit_by,
         t.submit_time,
         t.exception_count,