diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 2b2fe265c..5bccd509a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -76,6 +76,11 @@ public class IssueServiceImpl implements IssueService { IssueDetailByUserIdFormDTO userIdDto = new IssueDetailByUserIdFormDTO(); userIdDto.setUserId(userDetail.getUserId()); // 查询当前时间前10分钟内的数据 + if("1".equals(formDto.getIsCreateCity())){ + userIdDto.setIsCreateCity("1"); + }else{ + userIdDto.setIsCreateCity("0"); + } Result r = issueFeignClient.getIssueMaxNew(userIdDto); IssueDetailResultDTO d = r.getData(); if (d != null && !StringUtils.isBlank(d.getId())) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueDetailByUserIdFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueDetailByUserIdFormDTO.java index e42993de8..e54667582 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueDetailByUserIdFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueDetailByUserIdFormDTO.java @@ -18,4 +18,9 @@ public class IssueDetailByUserIdFormDTO implements Serializable { */ @NotBlank(message = "用户ID不能为空") private String userId; + + /** + * 是否为创城提交(0:其他;1:创城) + */ + private String isCreateCity; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 889db08e9..b4493bd27 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -354,6 +354,9 @@ event.DEL_FLAG = '0' and event.CREATED_TIME >= CURRENT_TIMESTAMP - INTERVAL 10 MINUTE AND event.USER_ID = #{userId} + + and event.IS_CREATE_CITY = #{isCreateCity} + limit 1