wbs表插件名支持逗号分隔

game/src/main/java/com/ccsens/game/api/ClientController.java

@@ -96,9 +96,9 @@ public class ClientController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "task", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<ScreenVo.RecordInfo> getRecordByTaskId(@ApiParam @RequestParam Long taskId) throws Exception {
+    public JsonResponse<ScreenVo.RecordInfo> getRecordByTaskId(@ApiParam @RequestParam Long taskId,String gameType) throws Exception {
         log.info("根据游戏id获取分组信息：{}",taskId);
-        ScreenVo.RecordInfo recordInfo = screenService.getRecordByTaskId(taskId);
+        ScreenVo.RecordInfo recordInfo = screenService.getRecordByTaskId(taskId,gameType);
         return JsonResponse.newInstance().ok(recordInfo);
     }
 }

game/src/main/java/com/ccsens/game/service/IScreenService.java

@@ -40,5 +40,5 @@ public interface IScreenService {
 
     List<ScreenVo.Group> getGroupByRecordId(Long recordId);
 
-    ScreenVo.RecordInfo getRecordByTaskId(Long taskId);
+    ScreenVo.RecordInfo getRecordByTaskId(Long taskId,String gameType);
 }

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -109,14 +109,16 @@ public class ScreenService implements IScreenService{
             gameUserPayDao.insertSelective(gameUserPay);
         }
         //查询该任务下的游戏记录信息
-        GameRecordExample recordExample = new GameRecordExample();
-        recordExample.createCriteria().andTaskIdEqualTo(memberGame.getTaskId());
-        recordExample.setOrderByClause("created_at DESC");
-        List<GameRecord> recordList = gameRecordDao.selectByExample(recordExample);
-        if(CollectionUtil.isNotEmpty(recordList)){
-            GameRecord record = recordList.get(0);
-            if(record.getGameStatus() != GameConstant.GAME_COMPLETED){
-                throw new BaseException(CodeEnum.GAME_NO_END);
+        if(ObjectUtil.isNotNull(memberGame.getTaskId())) {
+            GameRecordExample recordExample = new GameRecordExample();
+            recordExample.createCriteria().andTaskIdEqualTo(memberGame.getTaskId());
+            recordExample.setOrderByClause("created_at DESC");
+            List<GameRecord> recordList = gameRecordDao.selectByExample(recordExample);
+            if (CollectionUtil.isNotEmpty(recordList)) {
+                GameRecord record = recordList.get(0);
+                if (record.getGameStatus() != GameConstant.GAME_COMPLETED) {
+                    throw new BaseException(CodeEnum.GAME_NO_END);
+                }
             }
         }
 
@@ -138,7 +140,7 @@ public class ScreenService implements IScreenService{
             GameGroup gameGroupBlue = new GameGroup();
             gameGroupBlue.setId(snowflake.nextId());
             gameGroupBlue.setRecordId(gameRecord.getId());
-            gameGroupBlue.setName(memberGame.getFirstTeam());
+            gameGroupBlue.setName(memberGame.getSecondTeam());
             gameGroupDao.insertSelective(gameGroupBlue);
         }
 
@@ -863,7 +865,7 @@ public class ScreenService implements IScreenService{
     }
 
     @Override
-    public ScreenVo.RecordInfo getRecordByTaskId(Long taskId) {
+    public ScreenVo.RecordInfo getRecordByTaskId(Long taskId,String gameType) {
         ScreenVo.RecordInfo recordInfo = new ScreenVo.RecordInfo();
 
         GameRecordExample recordExample = new GameRecordExample();
@@ -871,8 +873,22 @@ public class ScreenService implements IScreenService{
         recordExample.setOrderByClause("created_at DESC");
         List<GameRecord> gameRecordList = gameRecordDao.selectByExample(recordExample);
         if(CollectionUtil.isNotEmpty(gameRecordList)){
-            recordInfo.setId(gameRecordList.get(0).getId());
-            recordInfo.setGameStatus(gameRecordList.get(0).getGameStatus());
+            if(StrUtil.isNotEmpty(gameType)) {
+                for (GameRecord record : gameRecordList) {
+                    GameUserPay gameUserPay = gameUserPayDao.selectByPrimaryKey(record.getUserPayId());
+                    if (ObjectUtil.isNotNull(gameUserPay)) {
+                        GameType gameType1 = gameTypeDao.selectByPrimaryKey(gameUserPay.getGameTypeId());
+                        if (ObjectUtil.isNotNull(gameType1) && gameType.equalsIgnoreCase(gameType1.getCode())) {
+                            recordInfo.setId(record.getId());
+                            recordInfo.setGameStatus(record.getGameStatus());
+                            break;
+                        }
+                    }
+                }
+            }else {
+                recordInfo.setId(gameRecordList.get(0).getId());
+                recordInfo.setGameStatus(gameRecordList.get(0).getGameStatus());
+            }
         }
         return recordInfo;
     }

tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@@ -105,11 +105,12 @@ public class ProjectVo {
         private boolean mine;
         @ApiModelProperty("是否是当前角色的奖惩干系人")
         private boolean stakeholder;
+        @ApiModelProperty("该角色是否显示")
+        private Boolean isShow;
         @ApiModelProperty("成员信息")
         private List<ProMemberVo> members;
         @JsonIgnore
         private Long parentId; //一级角色Id
-
         @JsonIgnore
         private String proRoleName;    //一级角色名
         @JsonIgnore

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

@@ -1129,8 +1129,9 @@ public class ExcelService implements IExcelService {
                     }
 
                     for (int a = 2; a < roleRow.getLastCellNum(); a++) {
-                        String plugin = ExcelUtil.getCellValue(pluginRow.getCell(a));
+                        String plugin = StringUtil.replaceComma(ExcelUtil.getCellValue(pluginRow.getCell(a)));
                         if (StrUtil.isNotEmpty(plugin)) {
+                            String[] plugins = plugin.split(",");
                             //获取memberRoleId
                             String roleCell = ExcelUtil.getCellValue(roleRow.getCell(a));
                             if (StrUtil.isNotEmpty(roleCell) && CollectionUtil.isNotEmpty(proRoles)) {
@@ -1141,34 +1142,36 @@ public class ExcelService implements IExcelService {
                                     }
                                 }
                             }
-
-                            Long sysPluginId = null;
-                            for (SysPlugin sysPlugin : sysPluginList) {
-                                if (plugin.equalsIgnoreCase(sysPlugin.getName())) {
-                                    sysPluginId = sysPlugin.getId();
-                                    break;
+                            for(int p = 0 ; p < plugins.length; p++){
+                                Long sysPluginId = null;
+                                for (SysPlugin sysPlugin : sysPluginList) {
+                                    if (plugins[p].equalsIgnoreCase(sysPlugin.getName())) {
+                                        sysPluginId = sysPlugin.getId();
+                                        break;
+                                    }
                                 }
-                            }
-                            if (ObjectUtil.isNull(sysPluginId)) {
-                                throw new BaseException(CodeEnum.WBS_NOT_PLUGIN.addMsg(sheet.getSheetName() + i));
-                            }
-                            if (CollectionUtil.isNotEmpty(taskNameList)) {
-                                for (ProTaskDetail taskName : taskNameList) {
+                                if (ObjectUtil.isNull(sysPluginId)) {
+                                    throw new BaseException(CodeEnum.WBS_NOT_PLUGIN.addMsg(sheet.getSheetName() + i));
+                                }
+                                if (CollectionUtil.isNotEmpty(taskNameList)) {
+                                    for (ProTaskDetail taskName : taskNameList) {
+                                        ProTaskPlugin taskPlugin = new ProTaskPlugin();
+                                        taskPlugin.setId(snowflake.nextId());
+                                        taskPlugin.setTaskDetailId(taskName.getId());
+                                        taskPlugin.setPluginId(sysPluginId);
+                                        taskPlugin.setMemberRoleId(memberRoleId);
+                                        taskPluginService.savePlugin(taskPlugin);
+                                    }
+                                } else {
                                     ProTaskPlugin taskPlugin = new ProTaskPlugin();
                                     taskPlugin.setId(snowflake.nextId());
-                                    taskPlugin.setTaskDetailId(taskName.getId());
+                                    taskPlugin.setTaskDetailId(taskId);
                                     taskPlugin.setPluginId(sysPluginId);
                                     taskPlugin.setMemberRoleId(memberRoleId);
                                     taskPluginService.savePlugin(taskPlugin);
                                 }
-                            } else {
-                                ProTaskPlugin taskPlugin = new ProTaskPlugin();
-                                taskPlugin.setId(snowflake.nextId());
-                                taskPlugin.setTaskDetailId(taskId);
-                                taskPlugin.setPluginId(sysPluginId);
-                                taskPlugin.setMemberRoleId(memberRoleId);
-                                taskPluginService.savePlugin(taskPlugin);
                             }
+
                         }
                     }
                 }

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

@@ -95,15 +95,17 @@ public class ProRoleService implements IProRoleService {
                 //是否mine(若是用户是关注者，则所有角色都暂时属于关注者)
                 for (ProjectVo.RoleInfo memberRole : memberRoleList) {
                     if(isAttention){
-                        memberRole.setMine(true);
+                        memberRole.setIsShow(true);
                         continue;
                     }
                     for (ProRole role : roleList) {
                         if (memberRole.getId().equals(role.getId())) {
                             memberRole.setMine(true);
+                            memberRole.setIsShow(true);
                             break;
                         } else {
                             memberRole.setMine(false);
+                            memberRole.setIsShow(false);
                         }
                     }
                 }

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

@@ -144,7 +144,7 @@ public class ProjectService implements IProjectService {
         Map<String, Long> timeMap = new HashMap<>();
         timeMap = DateUtil.projectFormatDateTime(date);
         Long startMillisTime = timeMap.get("startMillisTime");
-        Long endMillisTime = timeMap.get("endMillisTime");
+        Long endMillisTime = timeMap.get("endMillisTime")+1;
         //查找此用户关注的项目
         List<SysProject> projectList = sysProjectDao.findProjectIdByUserId(currentUserId, startMillisTime, endMillisTime);
         projectInfoList = projectInfoByProject(projectList, currentUserId);

tall/src/main/resources/mapper_dao/SysProjectDao.xml

@@ -47,6 +47,8 @@
           (p.begin_time <= #{startTime} and p.end_time >= #{endTime})
           OR
           (p.begin_time >= #{startTime} and p.begin_time <= #{endTime})
+          OR
+          (p.end_time >= #{startTime} and p.end_time <= #{endTime})
         )
       </if>
     </if>