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
@@ -8,29 +8,29 @@ import java.util.List; public class TargetMngDto implements Serializable { private Long id; //安全目标指标 private String name; //目标指标编号 //安全目标指标 private String qName; //目标指标编号 private String indexNum; //年度 //年度 private String year; //指标值 //指标值 private String value; //指标级别 1:公司级 2:部门分厂级 3:工段班组级 //指标级别 1:公司级 2:部门分厂级 3:工段班组级 private Integer level; //完成期限 //完成期限 private Timestamp completeDate; //备注信息 //备注信息 private String memo; //指标类型 1:年指标 2:月指标 //指标类型 1:年指标 2:月指标 private Integer targetType; //分解状态 1:已分解 2:未分解 //分解状态 1:已分解 2:未分解 private Integer divideStatus; private Timestamp createTime; private Timestamp updateTime; //目标指标分解列表 @@ -51,15 +51,16 @@ 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; } @@ -67,7 +68,7 @@ public void setIndexNum(String indexNum) { this.indexNum = indexNum; } //年度 //年度 public String getYear() { return year; } @@ -75,7 +76,7 @@ public void setYear(String year) { this.year = year; } //指标值 //指标值 public String getValue() { return value; } @@ -83,7 +84,7 @@ public void setValue(String value) { this.value = value; } //指标级别 1:公司级 2:部门分厂级 3:工段班组级 //指标级别 1:公司级 2:部门分厂级 3:工段班组级 public Integer getLevel() { return level; } @@ -91,7 +92,7 @@ public void setLevel(Integer level) { this.level = level; } //完成期限 //完成期限 public Timestamp getCompleteDate() { return completeDate; } @@ -99,7 +100,7 @@ public void setCompleteDate(Timestamp completeDate) { this.completeDate = completeDate; } //备注信息 //备注信息 public String getMemo() { return memo; } @@ -107,7 +108,7 @@ public void setMemo(String memo) { this.memo = memo; } //指标类型 1:年指标 2:月指标 //指标类型 1:年指标 2:月指标 public Integer getTargetType() { return targetType; } @@ -115,7 +116,7 @@ public void setTargetType(Integer targetType) { this.targetType = targetType; } //分解状态 1:已分解 2:未分解 //分解状态 1:已分解 2:未分解 public Integer getDivideStatus() { return divideStatus; } @@ -123,7 +124,7 @@ public void setDivideStatus(Integer divideStatus) { this.divideStatus = divideStatus; } public Timestamp getCreateTime() { return createTime; } @@ -131,7 +132,7 @@ public void setCreateTime(Timestamp createTime) { this.createTime = createTime; } public Timestamp getUpdateTime() { return updateTime; } @@ -139,4 +140,4 @@ public void setUpdateTime(Timestamp updateTime) { this.updateTime = updateTime; } } }
