diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java index cb5521e682..e41055f158 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java @@ -114,4 +114,15 @@ public class IssueApplicationDTO implements Serializable { */ private Date updatedTime; + //拓展属性 + /** + * 申请id + */ + private String issueApplicationId; + + /** + * 对应issue_application.UPDATED_TIME 对应的秒级时间戳 + */ + private Long time; + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java new file mode 100644 index 0000000000..92a475efb5 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java @@ -0,0 +1,45 @@ +package com.epmet.dto.form; + +import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 查询issue_application通用入参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2020/11/18 16:22 + */ +@Data +public class IssueAppQueryFormDTO implements Serializable { + public interface ApplicationList{} + + /** + * 网格id + */ + private String gridId; + + /** + * 小组id + */ + private String groupId; + + /** + * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回 + */ + private String applyStatus; + + /** + * 页码 + */ + @NotNull(message = "页码不能为空",groups = {ApplicationListFormDTO.ApplicationList.class}) + private Integer pageNo; + + /** + * 每页数量 + */ + @NotNull(message = "每页数量不能为空",groups = {ApplicationListFormDTO.ApplicationList.class}) + private Integer pageSize; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index f0bc89842e..7a107afd19 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -8,7 +8,9 @@ import com.epmet.dto.form.MyPubIssuesAuditingFormDTO; import com.epmet.dto.result.MyPartIssuesResultDTO; import com.epmet.dto.result.MyPubIssuesAuditingResultDTO; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.IssueSuggestionDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.UserIssueSuggestionFormDTO; import com.epmet.dto.result.SaveIssueSuggestionResultDTO; import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; @@ -125,4 +127,13 @@ public interface GovIssueOpenFeignClient { **/ @PostMapping(value = "/gov/issue/issuesuggestion/save", consumes = MediaType.APPLICATION_JSON_VALUE) Result saveIssueSuggestion(@RequestBody IssueSuggestionDTO issueSuggestionDTO); + + /** + * @param formDTO + * @author yinzuomei + * @description 分页按条件查询issue_application + * @Date 2020/11/18 16:40 + **/ + @PostMapping(value = "/gov/issue/issueapplication/listIssueApp",consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 4992cb285f..de39ff5035 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -11,7 +11,9 @@ import com.epmet.dto.result.MyPubIssuesAuditingResultDTO; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.IssueSuggestionDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.UserIssueSuggestionFormDTO; import com.epmet.dto.result.SaveIssueSuggestionResultDTO; import com.epmet.feign.GovIssueOpenFeignClient; @@ -112,4 +114,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result saveIssueSuggestion(IssueSuggestionDTO issueSuggestionDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "saveIssueSuggestion", issueSuggestionDTO); } + + /** + * @param formDTO + * @author yinzuomei + * @description 分页按条件查询issue_application + * @Date 2020/11/18 16:40 + **/ + @Override + public Result> listIssueApp(IssueAppQueryFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "listIssueApp", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java index 3793d3f1df..83e494111d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java @@ -18,19 +18,18 @@ package com.epmet.controller; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.service.IssueApplicationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -84,4 +83,17 @@ public class IssueApplicationController { return new Result(); } + /** + * @return com.epmet.commons.tools.utils.Result> + * @param formDTO + * @author yinzuomei + * @description 分页按条件查询issue_application + * @Date 2020/11/18 16:26 + **/ + @PostMapping("listIssueApp") + public Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + List list=issueApplicationService.listIssueApp(formDTO); + return new Result>().ok(list); + } } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java index ad9832f74c..c45efec552 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java @@ -18,9 +18,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.entity.IssueApplicationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 话题转议题申请表 * @@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IssueApplicationDao extends BaseDao { - + + /** + * @param formDTO + * @author yinzuomei + * @description 分页按条件查询issue_application + * @Date 2020/11/18 16:28 + **/ + List selectList(IssueAppQueryFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java index af43cabafd..ca1c383c2c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.entity.IssueApplicationEntity; import java.util.List; @@ -92,4 +93,13 @@ public interface IssueApplicationService extends BaseService + * @param formDTO + * @author yinzuomei + * @description 分页按条件查询issue_application + * @Date 2020/11/18 16:26 + **/ + List listIssueApp(IssueAppQueryFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index 68d0785d08..b65cc575eb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -20,13 +20,15 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IssueApplicationDao; import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.entity.IssueApplicationEntity; import com.epmet.service.IssueApplicationService; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -96,4 +98,17 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl + * @author yinzuomei + * @description 分页按条件查询issue_application + * @Date 2020/11/18 16:26 + **/ + @Override + public List listIssueApp(IssueAppQueryFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); + return baseDao.selectList(formDTO); + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index e2cf6cc9ee..3ffa8f5f97 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -3,5 +3,39 @@ - + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSuggestionDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSuggestionDao.xml index 0500ec26e8..c3bd6f3f31 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSuggestionDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSuggestionDao.xml @@ -19,7 +19,7 @@ SELECT ig.id AS suggestionId, ig.SUGGESTION, - ig.CREATED_TIME AS publishTime, + unix_timestamp(ig.CREATED_TIME)AS publishTime, ig.PUBLIC_FLAG AS publicFlag, '' AS headPhoto, '' AS userShowName, diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java index 2a56f9d48d..1bb03c5e6b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java @@ -1,7 +1,10 @@ package com.epmet.modules.group.service.impl; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.modules.group.service.GroupIssueService; import com.epmet.modules.topic.service.ResiTopicService; @@ -11,9 +14,11 @@ import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; import com.epmet.resi.group.dto.group.result.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -53,14 +58,20 @@ public class GroupIssueServiceImpl implements GroupIssueService { } /** - * @Description 待审核||已驳回 申请列表 + * @Description 待审核||已驳回 申请列表 * @Param applicationListFormDTO * @author zxc * @date 2020/11/17 10:45 上午 */ @Override public List applicationList(ApplicationListFormDTO applicationListFormDTO) { - return null; + IssueAppQueryFormDTO issueAppQueryFormDTO = ConvertUtils.sourceToTarget(applicationListFormDTO, IssueAppQueryFormDTO.class); + Result> result = govIssueOpenFeignClient.listIssueApp(issueAppQueryFormDTO); + if (result.success() && CollectionUtils.isNotEmpty(result.getData())) { + List list = ConvertUtils.sourceToTarget(result.getData(), ApplicationListResultDTO.class); + return list; + } + return new ArrayList<>(); } /**