From 866cb2f4676708331dcbdb81fb3de43a79fcff95 Mon Sep 17 00:00:00 2001 From: gaofan Date: Fri, 7 Jul 2023 13:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E5=8A=A8=E5=85=9A=E5=91=98=E6=8A=A5?= =?UTF-8?q?=E9=81=93=E3=80=81=E5=9C=A8=E8=81=8C=E5=85=9A=E5=91=98=E6=8A=A5?= =?UTF-8?q?=E9=81=93=E3=80=81=E5=9F=8E=E5=B8=82=E8=A7=82=E5=AF=9F=E5=91=98?= =?UTF-8?q?=E3=80=81=E7=BA=A2=E8=89=B2=E5=BF=97=E6=84=BF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=98=9F=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=A0=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/user/dto/party/FlowPartyDTO.java | 5 +++++ .../epdc/user/dto/party/KnightPionnerDTO.java | 11 +++++++++++ .../epdc/user/dto/party/RedSpearheadDTO.java | 10 ++++++++++ .../epdc/user/dto/party/ReportPartyDTO.java | 10 ++++++++++ .../epdc/party/entity/FlowPartyEntity.java | 5 +++++ .../epdc/party/entity/KnightPionnerEntity.java | 18 ++++++++++++++---- .../epdc/party/entity/RedSpearheadEntity.java | 10 ++++++++++ .../epdc/party/entity/ReportPartyEntity.java | 11 +++++++++++ .../service/impl/FlowPartyServiceImpl.java | 4 ++++ .../service/impl/KnightPionnerServiceImpl.java | 5 +++++ .../service/impl/RedSpearheadServiceImpl.java | 5 +++++ .../service/impl/ReportPartyServiceImpl.java | 15 ++++++++++++++- 12 files changed, 104 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java index af72d08a6..092fcb12f 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java @@ -90,4 +90,9 @@ public class FlowPartyDTO implements Serializable { */ private String partyName; + /** + * 审核意见 + */ + private String examineMsg; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java index 6f6702f00..4e2c76047 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java @@ -98,4 +98,15 @@ public class KnightPionnerDTO implements Serializable { */ private String allDeptNames; + /** + * 审核状态 0、待审核 1、审核通过 + */ + private Integer status; + + /** + * 审核意见 + */ + private String examineMsg; + + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/RedSpearheadDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/RedSpearheadDTO.java index c173c6345..6b511e3fc 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/RedSpearheadDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/RedSpearheadDTO.java @@ -93,4 +93,14 @@ public class RedSpearheadDTO implements Serializable { */ private String allDeptNames; + /** + * 审核状态 0、待审核 1、审核通过 + */ + private Integer status; + + /** + * 审核意见 + */ + private String examineMsg; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java index c9a886bb5..62b46d5ad 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java @@ -133,4 +133,14 @@ public class ReportPartyDTO implements Serializable { * 所有部门名称 */ private String allDeptNames; + + /** + * 审核状态 0、待审核 1、审核通过 + */ + private Integer status; + + /** + * 审核信息 + */ + private String examineMsg; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java index 3a58e39a9..1001f1847 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java @@ -82,4 +82,9 @@ public class FlowPartyEntity extends DeptScope { */ private String partyName; + /** + * 审核意见 + */ + private String examineMsg; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java index 3db1d05f4..f541c513a 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java @@ -66,14 +66,24 @@ public class KnightPionnerEntity extends DeptScope { */ private Integer courier; - /** - * 其它类型的补充名称 - */ - private String courierText; +// /** +// * 其它类型的补充名称 +// */ +// private String courierText; /** * 居住网格id */ private String deptId; + /** + * 审核状态 0、待审核 1、审核通过 + */ + private Integer status; + + /** + * 审核意见 + */ + private String examineMsg; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/RedSpearheadEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/RedSpearheadEntity.java index d99b4ef31..2becaed8b 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/RedSpearheadEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/RedSpearheadEntity.java @@ -70,4 +70,14 @@ public class RedSpearheadEntity extends DeptScope { */ private String specialty; + /** + * 审核状态 0、待审核 1、审核通过 + */ + private Integer status; + + /** + * 审核意见 + */ + private String examineMsg; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java index d98eb7625..9477b5f13 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java @@ -110,4 +110,15 @@ public class ReportPartyEntity extends DeptScope { */ private Integer owners; + /** + * 审核状态 0、待审核 1、审核通过 + */ + private Integer status; + + /** + * 审核信息 + */ + private String examineMsg; + + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java index 8779ec17c..c91a79715 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java @@ -41,6 +41,7 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 流动党员报道表 @@ -155,6 +156,9 @@ public class FlowPartyServiceImpl extends BaseServiceImpl result = getPageData(page, ReportPartyDTO.class); + page.getRecords().forEach(entity -> { + result.getList().forEach(dto -> { + if (entity.getId().equals(dto.getId())) { + dto.setAllDeptIds(entity.getAllDeptIds().split(",")); + } + }); + }); + return result; } @Override @@ -116,6 +125,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl