Browse Source

接口测试问题修改

master
sunyuchao 5 years ago
parent
commit
41b1e7d345
  1. 4
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java
  2. 1
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
  3. 4
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
  4. 4
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java

4
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java

@ -43,11 +43,11 @@ public class MyPartProjectsResultDTO implements Serializable {
/** /**
* 议题Id用户数据整合使用(项目出自哪个网格"组织-网格") * 议题Id用户数据整合使用(项目出自哪个网格"组织-网格")
*/ */
@JsonIgnore //@JsonIgnore
private String issueId; private String issueId;
/** /**
* 项目状态(待处理 pending结案closed)用于查询当前处理部门信息 * 项目状态(待处理 pending结案closed)用于查询当前处理部门信息
*/ */
@JsonIgnore //@JsonIgnore
private String status; private String status;
} }

1
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@ -97,6 +97,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
@Autowired @Autowired
ResiGroupMemberDao resiGroupMemberDao; ResiGroupMemberDao resiGroupMemberDao;
@Autowired
ResiTopicDao resiTopicdDao; ResiTopicDao resiTopicdDao;
@Value("${openapi.scan.server.url}") @Value("${openapi.scan.server.url}")

4
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@ -460,8 +460,8 @@
<select id="selectIssueList" resultType="com.epmet.resi.group.dto.topic.result.IssueGridResultDTO"> <select id="selectIssueList" resultType="com.epmet.resi.group.dto.topic.result.IssueGridResultDTO">
SELECT SELECT
rt.issue_id AS "gridId", rt.issue_id AS "issueId",
rg.grid_id AS "issueId" rg.grid_id AS "gridId"
FROM FROM
resi_topic rt resi_topic rt
INNER JOIN resi_group rg ON rt.group_id = rg.id INNER JOIN resi_group rg ON rt.group_id = rg.id

4
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java

@ -46,9 +46,9 @@ public class IssueController {
* @author sun * @author sun
*/ */
@PostMapping("my-part-projects") @PostMapping("my-part-projects")
public Result<List<MyPartProjectsResultDTO>> myPartProjects(@RequestBody MyPartProjectsFormDTO formDTO) { public Result<List<MyPartProjectsResultDTO>> myPartProjects(@LoginUser TokenDto tokenDTO, @RequestBody MyPartProjectsFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, MyPartProjectsFormDTO.MyProject.class); ValidatorUtils.validateEntity(formDTO, MyPartProjectsFormDTO.MyProject.class);
formDTO.setUserId(loginUserUtil.getLoginUserId()); formDTO.setUserId(tokenDTO.getUserId());
return new Result<List<MyPartProjectsResultDTO>>().ok(issueService.myPartProjects(formDTO)); return new Result<List<MyPartProjectsResultDTO>>().ok(issueService.myPartProjects(formDTO));
} }

Loading…
Cancel
Save