Commit 66731b34 authored by yuanshuo's avatar yuanshuo

修改接口

1./review/scene/change/task/getKeyPointList修改传参和response关于数字的类型
2./review/scene/change/task/getDetailsList修改传参和response关于数字的类型
3./review/scene/change/task/getKeypointListAll修改传参和response关于数字的类型
4./review/scene/change/task/deleteKeypointListAll修改传参和response关于数字的类
5./review/scene/change/task/getSceneListAll修改传参和response关于数字的类型
parent 61f3a4f6
...@@ -42,14 +42,14 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R ...@@ -42,14 +42,14 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R
List<KeypointList> keypointLists = reviewStandardMapper.getKeypointListByIdList(idList); List<KeypointList> keypointLists = reviewStandardMapper.getKeypointListByIdList(idList);
// 将要点列表按reviewStandardId分组 // 将要点列表按reviewStandardId分组
Map<Long, List<KeypointList>> groupKeypoint = keypointLists.stream() Map<String, List<KeypointList>> groupKeypoint = keypointLists.stream()
.collect(Collectors.groupingBy(KeypointList::getReviewStandardId)); .collect(Collectors.groupingBy(KeypointList::getReviewStandardId));
// 创建返回结果列表 // 创建返回结果列表
List<DeleteDetailsResponse> deleteDetailsResponseList = new ArrayList<>(); List<DeleteDetailsResponse> deleteDetailsResponseList = new ArrayList<>();
for (Map.Entry<Long, List<KeypointList>> entry : groupKeypoint.entrySet()) { for (Map.Entry<String, List<KeypointList>> entry : groupKeypoint.entrySet()) {
// 获取标准信息 // 获取标准信息
ReviewStandardResponseNew reviewStandardResponseNew = reviewStandardMapper.selectReviewStandardById(entry.getKey()); ReviewStandardResponseNew reviewStandardResponseNew = reviewStandardMapper.selectReviewStandardById(Long.valueOf(entry.getKey()));
// 处理标准信息为null的情况 // 处理标准信息为null的情况
if (reviewStandardResponseNew == null) { if (reviewStandardResponseNew == null) {
...@@ -73,7 +73,7 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R ...@@ -73,7 +73,7 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R
deleteDetailsList.setReviewStandardId(keypoint.getReviewStandardId()); deleteDetailsList.setReviewStandardId(keypoint.getReviewStandardId());
// 获取与 KeypointList 关联的 DeleteDetails // 获取与 KeypointList 关联的 DeleteDetails
List<DeleteDetails> deleteDetails = reviewStandardMapper.getDeleteDetailsByKeypointId(keypoint.getId()); List<DeleteDetails> deleteDetails = reviewStandardMapper.getDeleteDetailsByKeypointId(Long.valueOf(keypoint.getId()));
deleteDetailsList.setDeleteDetailsList(deleteDetails); deleteDetailsList.setDeleteDetailsList(deleteDetails);
deleteDetailsLists.add(deleteDetailsList); deleteDetailsLists.add(deleteDetailsList);
......
...@@ -520,13 +520,13 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper, ...@@ -520,13 +520,13 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
List<KeypointList> keypointLists = reviewStandardMapper.getKeypointListByIdList(idList); List<KeypointList> keypointLists = reviewStandardMapper.getKeypointListByIdList(idList);
//按reviewStandard 分组 //按reviewStandard 分组
Map<Long,List<KeypointList>> groupKeypoint = keypointLists.stream() Map<String,List<KeypointList>> groupKeypoint = keypointLists.stream()
.collect(Collectors.groupingBy(KeypointList::getReviewStandardId)); .collect(Collectors.groupingBy(KeypointList::getReviewStandardId));
//创建返回结果列表 //创建返回结果列表
List<AddDetailsResponse> addDetailsResponseList = new ArrayList<>(); List<AddDetailsResponse> addDetailsResponseList = new ArrayList<>();
for (Map.Entry<Long,List<KeypointList>> entry : groupKeypoint.entrySet()) { for (Map.Entry<String,List<KeypointList>> entry : groupKeypoint.entrySet()) {
//获取标准信息 //获取标准信息
ReviewStandardResponseNew reviewStandardResponseNew = reviewStandardMapper.selectReviewStandardById(entry.getKey()); ReviewStandardResponseNew reviewStandardResponseNew = reviewStandardMapper.selectReviewStandardById(Long.valueOf(entry.getKey()));
//处理标准信息为null的情况 //处理标准信息为null的情况
if(reviewStandardResponseNew == null){ if(reviewStandardResponseNew == null){
......
...@@ -49,9 +49,9 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService { ...@@ -49,9 +49,9 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
// 组装 GetUseCaseResponse 对象 // 组装 GetUseCaseResponse 对象
GetUseCaseResponse getUseCaseResponse = new GetUseCaseResponse(); GetUseCaseResponse getUseCaseResponse = new GetUseCaseResponse();
getUseCaseResponse.setId(reviewStandardResponse.getId()); getUseCaseResponse.setId(Long.valueOf(reviewStandardResponse.getId()));
getUseCaseResponse.setText(reviewStandardResponse.getText()); getUseCaseResponse.setText(reviewStandardResponse.getText());
getUseCaseResponse.setStandardId(reviewStandardResponse.getStandardId()); getUseCaseResponse.setStandardId(Long.valueOf(reviewStandardResponse.getStandardId()));
getUseCaseResponse.setStandardNo(reviewStandardResponse.getStandardNo()); getUseCaseResponse.setStandardNo(reviewStandardResponse.getStandardNo());
getUseCaseResponse.setUseCaseResponseDTOList(entry.getValue()); getUseCaseResponse.setUseCaseResponseDTOList(entry.getValue());
......
...@@ -186,7 +186,8 @@ public class ReviewSceneChangeTaskController extends BaseController { ...@@ -186,7 +186,8 @@ public class ReviewSceneChangeTaskController extends BaseController {
@Log(title = "发起评审-新增审查场景-获取要点列表", businessType = BusinessType.UPDATE) @Log(title = "发起评审-新增审查场景-获取要点列表", businessType = BusinessType.UPDATE)
@RequestMapping(method = RequestMethod.POST, value = "/getKeyPointList") @RequestMapping(method = RequestMethod.POST, value = "/getKeyPointList")
public R<List<ReviewKeyPointListResponse>> getKeyPointList(@Validated @RequestBody ReviewKeyPointListRequest request){ public R<List<ReviewKeyPointListResponse>> getKeyPointList(@Validated @RequestBody ReviewKeyPointListRequest request){
List<ReviewKeyPointListResponse> list = reviewSceneChangeTaskService.getKeyPointList(request.getStandardId()); Long id = Long.parseLong(request.getStandardId());
List<ReviewKeyPointListResponse> list = reviewSceneChangeTaskService.getKeyPointList(id);
return R.ok(list); return R.ok(list);
} }
...@@ -199,7 +200,8 @@ public class ReviewSceneChangeTaskController extends BaseController { ...@@ -199,7 +200,8 @@ public class ReviewSceneChangeTaskController extends BaseController {
@Log(title = "发起评审-新增审查场景-获取细则列表", businessType = BusinessType.UPDATE) @Log(title = "发起评审-新增审查场景-获取细则列表", businessType = BusinessType.UPDATE)
@RequestMapping(method = RequestMethod.POST, value = "/getDetailsList") @RequestMapping(method = RequestMethod.POST, value = "/getDetailsList")
public R<List<ReviewDetailsListResponse>> getKeyPointList(@Validated @RequestBody ReviewDetailsListRequest request){ public R<List<ReviewDetailsListResponse>> getKeyPointList(@Validated @RequestBody ReviewDetailsListRequest request){
List<ReviewDetailsListResponse> list = reviewSceneChangeTaskService.getDetailsList(request.getKeyPointId()); Long id = Long.parseLong(request.getKeypointId());
List<ReviewDetailsListResponse> list = reviewSceneChangeTaskService.getDetailsList(id);
return R.ok(list); return R.ok(list);
} }
......
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
@Data @Data
@ApiModel(value = "DeleteDetailsRequest" ,description = "获取细则列表请求request") @ApiModel(value = "DeleteDetailsRequest" ,description = "获取细则列表请求request")
public class DeleteDetailsRequest { public class DeleteDetailsRequest {
private Long standardId; private String standardId;
private String standardNo; private String standardNo;
......
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
@Data @Data
@ApiModel(value = "GetKeypointListRequest" ,description = "获取要点列表请求request") @ApiModel(value = "GetKeypointListRequest" ,description = "获取要点列表请求request")
public class GetKeypointListRequest { public class GetKeypointListRequest {
private Long standardId; private String standardId;
private String standardNo; private String standardNo;
......
...@@ -9,5 +9,5 @@ import lombok.Data; ...@@ -9,5 +9,5 @@ import lombok.Data;
public class ReviewDetailsListRequest { public class ReviewDetailsListRequest {
@ApiModelProperty("标准要求id") @ApiModelProperty("标准要求id")
private Long keyPointId; private String keypointId;
} }
...@@ -9,5 +9,5 @@ import lombok.Data; ...@@ -9,5 +9,5 @@ import lombok.Data;
public class ReviewKeyPointListRequest { public class ReviewKeyPointListRequest {
@ApiModelProperty("标准要求id") @ApiModelProperty("标准要求id")
private Long standardId; private String standardId;
} }
...@@ -11,13 +11,13 @@ import java.util.List; ...@@ -11,13 +11,13 @@ import java.util.List;
public class AddDetailsResponse { public class AddDetailsResponse {
@ApiModelProperty("id") @ApiModelProperty("id")
private Long id; private String id;
@ApiModelProperty("章节") @ApiModelProperty("章节")
private String chapter; private String chapter;
@ApiModelProperty("标准内容") @ApiModelProperty("标准内容")
private String text; private String text;
@ApiModelProperty("标准id") @ApiModelProperty("标准id")
private Long standardId; private String standardId;
@ApiModelProperty("标准编号") @ApiModelProperty("标准编号")
private String standardNo; private String standardNo;
@ApiModelProperty("标准下keypoint集合") @ApiModelProperty("标准下keypoint集合")
......
...@@ -8,11 +8,11 @@ import lombok.Data; ...@@ -8,11 +8,11 @@ import lombok.Data;
@Data @Data
public class DeleteDetails { public class DeleteDetails {
@ApiModelProperty("要点id") @ApiModelProperty("要点id")
private Long id; private String id;
@ApiModelProperty("要点内容") @ApiModelProperty("要点内容")
private String text; private String text;
@ApiModelProperty("标准id") @ApiModelProperty("标准id")
private Long reviewKeypointId; private String reviewKeypointId;
} }
...@@ -10,13 +10,13 @@ import java.util.List; ...@@ -10,13 +10,13 @@ import java.util.List;
@Data @Data
public class DeleteDetailsList { public class DeleteDetailsList {
@ApiModelProperty("要点id") @ApiModelProperty("要点id")
private Long id; private String id;
@ApiModelProperty("要点内容") @ApiModelProperty("要点内容")
private String text; private String text;
@ApiModelProperty("标准id") @ApiModelProperty("标准id")
private Long reviewStandardId; private String reviewStandardId;
@ApiModelProperty("细则集合") @ApiModelProperty("细则集合")
private List<DeleteDetails> deleteDetailsList; private List<DeleteDetails> deleteDetailsList;
......
...@@ -10,13 +10,13 @@ import java.util.List; ...@@ -10,13 +10,13 @@ import java.util.List;
@Data @Data
public class DeleteDetailsResponse { public class DeleteDetailsResponse {
@ApiModelProperty("id") @ApiModelProperty("id")
private Long id; private String id;
@ApiModelProperty("章节") @ApiModelProperty("章节")
private String chapter; private String chapter;
@ApiModelProperty("标准内容") @ApiModelProperty("标准内容")
private String text; private String text;
@ApiModelProperty("标准id") @ApiModelProperty("标准id")
private Long standardId; private String standardId;
@ApiModelProperty("标准编号") @ApiModelProperty("标准编号")
private String standardNo; private String standardNo;
......
...@@ -9,7 +9,7 @@ import lombok.Data; ...@@ -9,7 +9,7 @@ import lombok.Data;
public class GetSceneListResponse { public class GetSceneListResponse {
@ApiModelProperty("id") @ApiModelProperty("id")
private Long id; private String id;
@ApiModelProperty("文本内容") @ApiModelProperty("文本内容")
private String text; private String text;
......
...@@ -9,11 +9,11 @@ import lombok.Data; ...@@ -9,11 +9,11 @@ import lombok.Data;
public class KeypointList { public class KeypointList {
@ApiModelProperty("要点id") @ApiModelProperty("要点id")
private Long id; private String id;
@ApiModelProperty("要点内容") @ApiModelProperty("要点内容")
private String text; private String text;
@ApiModelProperty("标准id") @ApiModelProperty("标准id")
private Long reviewStandardId; private String reviewStandardId;
} }
...@@ -9,7 +9,7 @@ import lombok.Data; ...@@ -9,7 +9,7 @@ import lombok.Data;
public class ReviewDetailsListResponse { public class ReviewDetailsListResponse {
@ApiModelProperty("主键-要点id") @ApiModelProperty("主键-要点id")
private Long id; private String id;
@ApiModelProperty("要点文本内容") @ApiModelProperty("要点文本内容")
private String text; private String text;
......
...@@ -9,7 +9,7 @@ import lombok.Data; ...@@ -9,7 +9,7 @@ import lombok.Data;
public class ReviewKeyPointListResponse { public class ReviewKeyPointListResponse {
@ApiModelProperty("主键-要点id") @ApiModelProperty("主键-要点id")
private Long id; private String id;
@ApiModelProperty("要点文本内容") @ApiModelProperty("要点文本内容")
private String text; private String text;
......
...@@ -10,7 +10,7 @@ import lombok.Data; ...@@ -10,7 +10,7 @@ import lombok.Data;
public class ReviewStandardResponseNew { public class ReviewStandardResponseNew {
@ApiModelProperty("ID") @ApiModelProperty("ID")
@JsonFormat(shape = JsonFormat.Shape.STRING) @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id; private String id;
/** /**
* 章节 * 章节
...@@ -37,5 +37,5 @@ public class ReviewStandardResponseNew { ...@@ -37,5 +37,5 @@ public class ReviewStandardResponseNew {
private String standardNo; private String standardNo;
@ApiModelProperty("标准id") @ApiModelProperty("标准id")
private Long standardId; private String standardId;
} }
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