From c899840b0a9ac5fa0f216a18b157a10d328846ae Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 19 Nov 2020 13:33:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?+=E5=B7=B2=E9=A9=B3=E5=9B=9E=E6=8E=A5=E5=8F=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=BA2=E4=B8=AA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/IssueConstant.java | 14 ++++++++ .../controller/IssueAuditController.java | 33 +++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index 8987746d81..9d0ac9efd7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -98,4 +98,18 @@ public interface IssueConstant { String AUDIT_SWITCH_NAME = "议题发布前经网格员审核"; String GRID = "grid"; + /** + * 审核状态:待审核 + */ + String UNDER_AUDITING="under_auditing"; + + /** + * 审核状态:通过 + */ + String APPROVED="approved"; + + /** + * 审核状态:驳回 + */ + String REJECTED="rejected"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java index af99ad3e74..1defc33d48 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.IssueConstant; import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.IssueApplicationIdFormDTO; import com.epmet.dto.result.ApplicationHistoryResDTO; @@ -33,15 +34,41 @@ public class IssueAuditController { /** * @param formDTO * @author yinzuomei - * @description 待审核|| 已驳回 列表 + * @description 待审核列表 + * @Date 2020/11/18 17:28 + **/ + @PostMapping("underauditinglist") + public Result> queryUnderAuditingList(@RequestBody IssueAppQueryFormDTO formDTO) { + formDTO.setApplyStatus(IssueConstant.UNDER_AUDITING); + ValidatorUtils.validateEntity(formDTO,IssueAppQueryFormDTO.Required.class,IssueAppQueryFormDTO.GovFormDTO.class); + return new Result>().ok(issueApplicationService.listIssueApp(formDTO)); + } + + /** + * @param formDTO + * @author yinzuomei + * @description 已驳回 列表 * @Date 2020/11/18 17:28 **/ - @PostMapping("applicationlist") - public Result> queryIssueAppliationList(@RequestBody IssueAppQueryFormDTO formDTO) { + @PostMapping("rejectedlist") + public Result> queryRejectedList(@RequestBody IssueAppQueryFormDTO formDTO) { + formDTO.setApplyStatus(IssueConstant.REJECTED); ValidatorUtils.validateEntity(formDTO,IssueAppQueryFormDTO.Required.class,IssueAppQueryFormDTO.GovFormDTO.class); return new Result>().ok(issueApplicationService.listIssueApp(formDTO)); } + /** + * @return com.epmet.commons.tools.utils.Result> + * @param formDTO + * @author yinzuomei + * @description 通用查询列表接口，对其他服务开放 + * @Date 2020/11/19 13:30 + **/ + @PostMapping("applicationlist") + public Result> queryIssueAppliationList(@RequestBody IssueAppQueryFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,IssueAppQueryFormDTO.Required.class); + return new Result>().ok(issueApplicationService.listIssueApp(formDTO)); + } /** * @param formDTO From c38dc8b867c8385596be3518e1bffe44742a03e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 19 Nov 2020 13:52:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?+=E5=B7=B2=E9=A9=B3=E5=9B=9E=E6=8E=A5=E5=8F=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=BA2=E4=B8=AA=E3=80=82v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IssueApplicationDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3aec4d75bc..20a25f9f90 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 @@ -20,7 +20,7 @@ SELECT ia.id AS issueApplicationId, ia.ISSUE_TITLE, - unix_timestamp( ia.UPDATED_TIME ) AS latestTime + unix_timestamp( ia.UPDATED_TIME ) AS latestTime, ia.SUGGESTION, ia.APPLY_STATUS FROM From 133db38da4ddca31dcdd559df626d351851ca88f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 19 Nov 2020 14:24:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?selectListByIssueApplicationId=20sql?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IssueApplicationHistoryDao.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml index e3bc84fc2a..cee15d1297 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml @@ -5,18 +5,18 @@ \ No newline at end of file