解决冲突

src/main/java/org/rcisoft/business/evaluate/team/controller/TeamAssessmentController.java

@@ -30,10 +30,11 @@ public class TeamAssessmentController {
 
     @ApiOperation(value="团队评估列表信息", notes="团队评估列表信息")
 
-    @ApiImplicitParams({@ApiImplicitParam(name = "proId", value = "项目主键", required = true, dataType = "字符串")})
+
+    @ApiImplicitParams({@ApiImplicitParam(name = "type", value = "团队类型", required = true, dataType = "字符串")})
     @GetMapping("/getTeamAssessmentInfo")
-    public Result TeamAssessmentInfo(String proId) {
-        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, teamAssessmentService.getTeamAssessmentInfo(proId));
+    public Result TeamAssessmentInfo(String type) {
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, teamAssessmentService.getTeamAssessmentInfo(type));
     }
 
     @ApiOperation(value="团队评估右侧信息", notes="团队评估右侧信息")

src/main/java/org/rcisoft/business/evaluate/team/dao/BusTeamRepository.java

@@ -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 `PRO_ID` = #{proId} GROUP BY TEAM_ID")
+    @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 `TEAM_TYPE` = #{type} GROUP BY TEAM_ID")
     @ResultMap(value = "BaseResultMap" )
-    List<BusTeam> selectByTeamId(String proId);
+    List<BusTeam> selectByTeamId(String type);
 
 
 

src/main/java/org/rcisoft/business/evaluate/team/service/TeamAssessmentService.java

@@ -13,7 +13,7 @@ public interface TeamAssessmentService {
 
 
 
-    List<BusTeam> getTeamAssessmentInfo(String proId);
+    List<BusTeam> getTeamAssessmentInfo(String type);
 
     SysPrincipal getTeamAssessmentRightInfo(String teamId);
 }

src/main/java/org/rcisoft/business/evaluate/team/service/impl/TeamAssessmentImpl.java

@@ -27,9 +27,9 @@ public class TeamAssessmentImpl implements TeamAssessmentService {
     SysPrincipalRepository sysPrincipalRepository;
 
     @Override
-    public List<BusTeam> getTeamAssessmentInfo(String proId) {
+    public List<BusTeam> getTeamAssessmentInfo(String type) {
 
-        return busTeamRepository.selectByTeamId(proId);
+        return busTeamRepository.selectByTeamId(type);
     }
 
 

src/main/resources/mapper/sys/evaluate/BusTeamMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.rcisoft.business.evaluate.team.dao.BusTeamRepository">
     <resultMap id="BaseResultMap" type="org.rcisoft.business.evaluate.team.entity.BusTeam">
         <id column="TEAM_ID" jdbcType="VARCHAR" property="teamId"/>
-        <result column="TEAM_NM" jdbcType="VARCHAR" property="teamId"/>
+        <result column="TEAM_NM" jdbcType="VARCHAR" property="teamNm"/>
         <result column="RESOURCE" jdbcType="VARCHAR" property="resource"/>
         <result column="ONLINE_DATE" jdbcType="VARCHAR" property="onlineDate"/>
         <result column="INTRODUCE" jdbcType="VARCHAR" property="intorduce"/>