Commit 805d57b7 authored by curryft's avatar curryft

修改团队评估

parent 76db7553
...@@ -35,8 +35,8 @@ public class TeamAssessmentController { ...@@ -35,8 +35,8 @@ public class TeamAssessmentController {
@ApiOperation(value="团队评估列表信息", notes="团队评估列表信息") @ApiOperation(value="团队评估列表信息", notes="团队评估列表信息")
@ApiImplicitParams({@ApiImplicitParam(name = "teamId", value = "团队主键", required = true, dataType = "字符串")}) @ApiImplicitParams({@ApiImplicitParam(name = "teamId", value = "团队主键", required = true, dataType = "字符串")})
@RequestMapping("/getTeamAssessmentInfo") @RequestMapping("/getTeamAssessmentInfo")
public Result TeamAssessmentInfo(@RequestParam String teamId) { public Result TeamAssessmentInfo() {
return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, teamAssessmentService.getTeamAssessmentInfo(teamId)); return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, teamAssessmentService.getTeamAssessmentInfo());
} }
@ApiOperation(value="团队评估右侧信息", notes="团队评估右侧信息") @ApiOperation(value="团队评估右侧信息", notes="团队评估右侧信息")
......
...@@ -16,9 +16,9 @@ public interface BusTeamRepository extends BaseMapper<BusTeam>{ ...@@ -16,9 +16,9 @@ public interface BusTeamRepository extends BaseMapper<BusTeam>{
@Select("select a.*,count(b.TEAM_ID) as teamNumber,sum(b.BLD_AREA) as area from `bus_team` a join `bus_project` b on a.`TEAM_ID`=b.`TEAM_ID` where a.`TEAM_ID`=#{teamId} ") @Select("select a.*,count(b.TEAM_ID) as teamNumber,sum(b.BLD_AREA) as area from `bus_team` a join `bus_project` b on a.`TEAM_ID`=b.`TEAM_ID` GROUP BY TEAM_ID")
@ResultMap(value = "BaseResultMap" ) @ResultMap(value = "BaseResultMap" )
BusTeam selectByTeamId(String teamId); List<BusTeam> selectByTeamId();
......
...@@ -13,7 +13,7 @@ public interface TeamAssessmentService { ...@@ -13,7 +13,7 @@ public interface TeamAssessmentService {
BusTeam getTeamAssessmentInfo(String teamId); List<BusTeam> getTeamAssessmentInfo();
SysPrincipal getTeamAssessmentRightInfo(String teamId); SysPrincipal getTeamAssessmentRightInfo(String teamId);
} }
...@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -26,11 +27,13 @@ public class TeamAssessmentImpl implements TeamAssessmentService { ...@@ -26,11 +27,13 @@ public class TeamAssessmentImpl implements TeamAssessmentService {
SysPrincipalRepository sysPrincipalRepository; SysPrincipalRepository sysPrincipalRepository;
@Override @Override
public BusTeam getTeamAssessmentInfo(String teamId) { public List<BusTeam> getTeamAssessmentInfo() {
return busTeamRepository.selectByTeamId(teamId); return busTeamRepository.selectByTeamId();
} }
@Override @Override
public SysPrincipal getTeamAssessmentRightInfo(String priId) { public SysPrincipal getTeamAssessmentRightInfo(String priId) {
return sysPrincipalRepository.selectByPriId(priId); return sysPrincipalRepository.selectByPriId(priId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment