Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/service/SysPluginService.java

@@ -95,7 +95,12 @@ public class SysPluginService implements ISysPluginService{
      */
     @Override
     public List<PluginVo.PluginByTaskAdded> findPluginOfAdded(PluginDto.FindPluginByTask param) {
-        List<PluginVo.PluginByTaskAdded> plugins = taskPluginDao.findPluginOfAdded(param.getTaskId(),param.getRoleId(),param.getPluginName(),param.getPluginType());
+        //查找分解任务,通过分级任务找到任务详情
+        ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId());
+        if (ObjectUtil.isNull(proTaskSubTime)){
+            throw new BaseException("获取任务信息错误");
+        }
+        List<PluginVo.PluginByTaskAdded> plugins = taskPluginDao.findPluginOfAdded(proTaskSubTime.getTaskDetailId(),param.getRoleId(),param.getPluginName(),param.getPluginType());
         plugins.forEach(plugin -> {
             if (plugin.getFileIdList().contains(",")){
                 String[] split = plugin.getFileIdList().split(",");
@@ -143,8 +148,14 @@ public class SysPluginService implements ISysPluginService{
      */
     @Override
     public PageInfo<PluginVo.PluginByTaskAdded> findPluginOfNoAdded(PluginDto.FindPluginByTaskNo param) {
+        //查找分解任务,通过分级任务找到任务详情
+        ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId());
+        if (ObjectUtil.isNull(proTaskSubTime)){
+            throw new BaseException("获取任务信息错误");
+        }
+
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
-        List<PluginVo.PluginByTaskAdded> plugins = taskPluginDao.findPluginOfNoAdded(param.getTaskId(),param.getRoleId(),param.getPluginName(),param.getPluginType());
+        List<PluginVo.PluginByTaskAdded> plugins = taskPluginDao.findPluginOfNoAdded(proTaskSubTime.getTaskDetailId(),param.getRoleId(),param.getPluginName(),param.getPluginType());
         plugins.forEach(plugin -> {
             if (plugin.getFileIdList().contains(",")){
                 String[] split = plugin.getFileIdList().split(",");
@@ -277,8 +288,10 @@ public class SysPluginService implements ISysPluginService{
             ProTaskPluginExample taskPluginExample = new ProTaskPluginExample();
             taskPluginExample.createCriteria().andPluginIdEqualTo(param.getPluginId())
                                               .andTaskDetailIdEqualTo(taskDetail.getId())
-                                              .andMemberRoleIdNotEqualTo(param.getRoleId());
+                                              .andMemberRoleIdEqualTo(param.getRoleId());
-            taskPluginDao.deleteByExample(taskPluginExample);
+            ProTaskPlugin taskPlugin = new ProTaskPlugin();
+            taskPlugin.setRecStatus((byte)2);
+            taskPluginDao.updateByExampleSelective(taskPlugin,taskPluginExample);
         }else {
             throw new BaseException("权限不足");
         }