emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -7,6 +7,7 @@ import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamMemberReqDTO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamMemberRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; import com.gkhy.safePlatform.emergency.service.EmergencyTeamService; @@ -68,6 +69,14 @@ } /** * 应急队伍修改(应急人员列表) */ @RequestMapping(value = "/memberList/{teamId}",method = RequestMethod.GET) public ResultVO getEmergencyTeamMemberByTeamId(@PathVariable("teamId")Long teamId){ return emergencyTeamService.getEmergencyTeamMemberByTeamId(teamId); } /** * 应急队伍修改(应急人员新增) */ @RequestMapping(value = "/addMember",method = RequestMethod.POST) emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -6,6 +6,7 @@ import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamMemberReqDTO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamMemberRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; @@ -30,4 +31,6 @@ ResultVO getEmergencyTeamMemberById(Long id); ResultVO batchDeleteEmergencyTeam(String ids); ResultVO getEmergencyTeamMemberByTeamId(Long teamId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -257,6 +257,13 @@ } } @Override public ResultVO getEmergencyTeamMemberByTeamId(Long teamId) { List<EmergencyTeamMemberInfoDO> emergencyTeamMemberInfoDOList = emergencyTeamMemberInfoService.selectByEmergencyTeamId(teamId); List<EmergencyTeamMemberRespDTO> emergencyTeamMemberRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamMemberInfoDOList , EmergencyTeamMemberRespDTO.class); return new ResultVO<>(ResultCodes.OK,emergencyTeamMemberRespDTOList); } private void deleteEmergencyTeam(Long id) { //查询是否存在 EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id); goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
@@ -11,7 +11,7 @@ private Long id; //安全目标指标 private String name; private String qName; //目标指标编号 private String indexNum; //年度 @@ -51,14 +51,15 @@ public void setId(Long id) { this.id = id; } //安全目标指标 public String getName() { return name; public String getqName() { return qName; } public void setName(String name) { this.name = name; public void setqName(String qName) { this.qName = qName; } //目标指标编号 public String getIndexNum() { return indexNum;