市北党建引领小程序

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserMaTokenFormDTO.java

@@ -23,6 +23,11 @@ public class EpdcAppUserMaTokenFormDTO implements Serializable {
     @NotBlank(message = "微信code不能为空")
     private String wxCode;
 
+    /**
+     * APP识别不能为空 1、识别 不为Null即识别
+     */
+    private String reg;
+
     /*@NotBlank(message = "用户信息不能为空")
     private String encryptedData;
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -73,8 +73,6 @@ public class AppUserServiceImpl implements AppUserService {
 
     private static final Logger logger = LoggerFactory.getLogger(AppUserServiceImpl.class);
 
-    private static final String WXCODE = "0b34C80w3YMmU03jsv3w3VFO5734C804";
-
     @Autowired
     private AppUserRedis appUserRedis;
 
@@ -124,12 +122,12 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMpToken(EpdcAppUserTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()));
+        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode(), "0"));
     }
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMaToken(EpdcAppUserMaTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()));
+        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode(), formDto.getReg()));
     }
 
     @Override
@@ -144,7 +142,7 @@ public class AppUserServiceImpl implements AppUserService {
 
         EpdcUserSaveWxFormIdFormDTO saveFormId = new EpdcUserSaveWxFormIdFormDTO();
         saveFormId.setWxFormId(formDto.getWxFormId());
-        saveFormId.setWxOpenId(this.getWxMaUser(formDto.getWxCode()).getOpenid());
+        saveFormId.setWxOpenId(this.getWxMaUser(formDto.getWxCode(), "0").getOpenid());
 
         return this.userFeignClient.saveWxFormId(saveFormId);
     }
@@ -276,7 +274,7 @@ public class AppUserServiceImpl implements AppUserService {
 
         this.verifyUserRegisterData(formDto);
 
-        WxMaJscode2SessionResult wxMaUser = this.getWxMaUser(formDto.getWxCode());
+        WxMaJscode2SessionResult wxMaUser = this.getWxMaUser(formDto.getWxCode(), "0");
         UserDTO userDto = this.packageUserDto(formDto, null, wxMaUser);
         // IP地址
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
@@ -345,7 +343,7 @@ public class AppUserServiceImpl implements AppUserService {
      */
     private EpdcGridLeaderRegisterDTO packageGridLeaderWhileRegister(SysUserDTO sysUser, String wxCode) {
 
-        WxMaJscode2SessionResult wxMaUser = this.getWxMaUser(wxCode);
+        WxMaJscode2SessionResult wxMaUser = this.getWxMaUser(wxCode, "0");
         Date now = new Date();
         String mobile = sysUser.getMobile();
 
@@ -576,10 +574,10 @@ public class AppUserServiceImpl implements AppUserService {
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:32
      */
-    private WxMaJscode2SessionResult getWxMaUser(String wxCode) {
+    private WxMaJscode2SessionResult getWxMaUser(String wxCode, String reg) {
         WxMaJscode2SessionResult wxMaJscode2SessionResult = null;
         try {
-            if (wxCode.equals(WXCODE)) {
+            if (StringUtils.isNotEmpty(reg)) {
                 wxMaJscode2SessionResult = wxMaServiceUtils.analysisWxMaService().jsCode2SessionInfo(wxCode);
             } else {
                 wxMaJscode2SessionResult = wxMaServiceUtils.normalWxMaService().jsCode2SessionInfo(wxCode);
@@ -704,7 +702,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMaV2Token(EpdcAppUserRegisterFormDTO formDto) {
-        WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode());
+        WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode(), "0");
         String openId = wxMaResult.getOpenid();
         String unionId = wxMaResult.getUnionid();
 
@@ -913,7 +911,7 @@ public class AppUserServiceImpl implements AppUserService {
         String encryptedData = infoDto.getEncryptedData();
         if (StringUtils.isNotBlank(wxCode)) {
             // 解析微信用户openid
-            WxMaJscode2SessionResult maJscode2SessionResult = getWxMaUser(wxCode);
+            WxMaJscode2SessionResult maJscode2SessionResult = getWxMaUser(wxCode, "0");
             userDto.setWxOpenId(maJscode2SessionResult.getOpenid());
             // 解析微信用户加密数据
             if (StringUtils.isNotBlank(iv) && StringUtils.isNotBlank(encryptedData)) {

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java

@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.user.dto.party;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+public class ActivityPartyDTO implements Serializable {
+
+    private static final long serialVersionUID = 8627064190462881427L;
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 党员ID
+     */
+	private String[] reportPartyIds;
+
+    /**
+     * 活动名称
+     */
+	private String title;
+
+    /**
+     * 活动内容
+     */
+	private String content;
+
+    /**
+     * 活动开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private String startDate;
+
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private String endDate;
+
+    /**
+     * 活动地址
+     */
+	private String address;
+
+    /**
+     * 活动图片
+     */
+	private String imgs;
+
+    /**
+     * 社区id
+     */
+	private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+	private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.user.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Data
+public class FlowPartyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流动党员ID
+     */
+	private String id;
+
+    /**
+     * 党员姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 是否自由职业 0、否  1、是
+     */
+	private Integer freelance;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 工作单位地址
+     */
+	private String workAddr;
+
+    /**
+     * 居住网格id
+     */
+	private Long deptId;
+
+	private String[] allDeptIds;
+
+    /***
+     *父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 审核状态  0、待审核  1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 现属党支部
+     */
+    private String partyName;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/IntoPartyDTO.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.user.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@Data
+public class IntoPartyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号码
+     */
+	private String idCard;
+
+    /**
+     * 电话
+     */
+	private String mobile;
+
+    /**
+     * 是否自由职业者 0、否 1、是
+     */
+	private Integer freelance;
+
+    /**
+     * 工作单位名称
+     */
+	private String workUnit;
+
+    /**
+     * 工作单位地址
+     */
+	private String workAddr;
+
+    /**
+     * 隶属社区
+     */
+	private String agencyId;
+
+    /**
+     * 审核状态  0、待审核  1、审核通过
+     */
+	private Integer status;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.user.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+public class KnightPionnerDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 骑士ID
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 证件号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 是否党员 0、否  1、是
+     */
+	private Integer party;
+
+    /**
+     * 是否外卖员、快递员 0、否  1、是
+     */
+    private Integer courier;
+
+    /**
+     * 居住网格id
+     */
+	private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+	private String[] allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/RedSpearheadDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.user.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+public class RedSpearheadDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 5092769899043712642L;
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 证件号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 所属社区
+     */
+	private Long deptId;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 服务类型
+     */
+	private String serviceType;
+
+    /**
+     * 特长
+     */
+	private String specialty;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+	private String[] allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java

@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.user.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Data
+public class ReportPartyDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 6947865008331192851L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 党员姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 社区id
+     */
+	private String deptId;
+
+    /**
+     * 居住小区名称
+     */
+	private String homeName;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 工作单位性质
+     */
+	private String workType;
+
+    /**
+     * 工作单位行业
+     */
+	private String workIndustry;
+
+    /**
+     * 特长
+     */
+	private String specialty;
+
+    /**
+     * 是否党员 0、否  1、是
+     */
+	private Integer party;
+
+    /**
+     * 是否愿意加入志愿者 0、否  1、是
+     */
+	private Integer volunteer;
+
+    /**
+     * 是否愿意加入网格员 0、否 1、是
+     */
+	private Integer gridStaff;
+
+    /**
+     * 是否愿意加入业务委员会 0、否  1、是
+     */
+	private Integer owners;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+	private String[] allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/form/IntoPartyFormDTO.java

@@ -0,0 +1,60 @@
+package com.elink.esua.epdc.user.dto.party.form;
+
+import lombok.Data;
+
+/**
+ * @author yan Lu
+ * @description 描述
+ * @create 2023/6/29 14:39
+ */
+@Data
+public class IntoPartyFormDTO {
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 是否自由职业者 0、否 1、是
+     */
+    private Integer freelance;
+
+    /**
+     * 工作单位名称
+     */
+    private String workUnit;
+
+    /**
+     * 工作单位地址
+     */
+    private String workAddr;
+
+    /**
+     * 审核状态  0、待审核  1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 街道或者社区ID
+     */
+    private String deptId;
+
+    private String[] allDeptIds;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/result/IntoPartyResultDTO.java

@@ -0,0 +1,82 @@
+package com.elink.esua.epdc.user.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yan Lu
+ * @description 入党申请
+ * @create 2023/6/29 15:02
+ */
+@Data
+public class IntoPartyResultDTO implements Serializable {
+    private static final long serialVersionUID = 3714021689660950552L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 是否自由职业者 0、否 1、是
+     */
+    private Integer freelance;
+
+    /**
+     * 工作单位名称
+     */
+    private String workUnit;
+
+    /**
+     * 工作单位地址
+     */
+    private String workAddr;
+
+    /**
+     * 审核状态  0、待审核  1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 街道或者社区ID
+     */
+    private String deptId;
+
+    private String deptName;
+
+    /***
+     *所有部门名称
+     */
+    private String allDeptNames;
+
+    /***
+     *所有部门ID
+     */
+    private String allDeptIds;
+
+    /***
+     *父所有部门
+     */
+    private String parentDeptNames;
+
+    /***
+     *父所有部门
+     */
+    private String parentDeptIds;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.party.excel.ActivityPartyExcel;
+import com.elink.esua.epdc.party.service.ActivityPartyService;
+import com.elink.esua.epdc.user.dto.party.ActivityPartyDTO;
+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;
+
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@RestController
+@RequestMapping("activityparty")
+public class ActivityPartyController {
+
+    @Autowired
+    private ActivityPartyService activityPartyService;
+
+    @GetMapping("page")
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<ActivityPartyDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<ActivityPartyDTO> page = activityPartyService.page(params);
+        return new Result<PageData<ActivityPartyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ActivityPartyDTO> get(@PathVariable("id") String id) {
+        ActivityPartyDTO data = activityPartyService.get(id);
+        return new Result<ActivityPartyDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ActivityPartyDTO dto) {
+        //效验数据
+        UserDetail user = SecurityUser.getUser();
+        dto.setDeptId(user.getDeptId());
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        activityPartyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ActivityPartyDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        UserDetail user = SecurityUser.getUser();
+        dto.setDeptId(user.getDeptId());
+        activityPartyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        activityPartyService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ActivityPartyDTO> list = activityPartyService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ActivityPartyExcel.class);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/FlowPartyController.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.party.excel.FlowPartyExcel;
+import com.elink.esua.epdc.party.service.FlowPartyService;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+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;
+
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@RestController
+@RequestMapping("flowparty")
+public class FlowPartyController {
+
+    @Autowired
+    private FlowPartyService flowPartyService;
+
+    @GetMapping("page")
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<FlowPartyDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<FlowPartyDTO> page = flowPartyService.page(params);
+        return new Result<PageData<FlowPartyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<FlowPartyDTO> get(@PathVariable("id") String id) {
+        FlowPartyDTO data = flowPartyService.get(id);
+        return new Result<FlowPartyDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody FlowPartyDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        flowPartyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody FlowPartyDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        flowPartyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        flowPartyService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<FlowPartyDTO> list = flowPartyService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, FlowPartyExcel.class);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/IntoPartyController.java

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.party.excel.IntoPartyExcel;
+import com.elink.esua.epdc.party.service.IntoPartyService;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
+import com.elink.esua.epdc.user.dto.party.result.IntoPartyResultDTO;
+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;
+
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@RestController
+@RequestMapping("intoparty")
+public class IntoPartyController {
+
+    @Autowired
+    private IntoPartyService intoPartyService;
+
+    @GetMapping("page")
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<IntoPartyResultDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<IntoPartyResultDTO> page = intoPartyService.page(params);
+        return new Result<PageData<IntoPartyResultDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IntoPartyResultDTO> get(@PathVariable("id") String id) {
+        IntoPartyResultDTO data = intoPartyService.get(id);
+        return new Result<IntoPartyResultDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IntoPartyFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        intoPartyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IntoPartyFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        intoPartyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        intoPartyService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IntoPartyResultDTO> list = intoPartyService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IntoPartyExcel.class);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/KnightPionnerController.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.party.excel.KnightPionnerExcel;
+import com.elink.esua.epdc.party.service.KnightPionnerService;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+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;
+
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@RestController
+@RequestMapping("knightpionner")
+public class KnightPionnerController {
+
+    @Autowired
+    private KnightPionnerService knightPionnerService;
+
+    @GetMapping("page")
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<KnightPionnerDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<KnightPionnerDTO> page = knightPionnerService.page(params);
+        return new Result<PageData<KnightPionnerDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<KnightPionnerDTO> get(@PathVariable("id") String id) {
+        KnightPionnerDTO data = knightPionnerService.get(id);
+        return new Result<KnightPionnerDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody KnightPionnerDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        knightPionnerService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody KnightPionnerDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        knightPionnerService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        knightPionnerService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<KnightPionnerDTO> list = knightPionnerService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, KnightPionnerExcel.class);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/RedSpearheadController.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.party.excel.RedSpearheadExcel;
+import com.elink.esua.epdc.party.service.RedSpearheadService;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+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;
+
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@RestController
+@RequestMapping("redspearhead")
+public class RedSpearheadController {
+
+    @Autowired
+    private RedSpearheadService redSpearheadService;
+
+    @GetMapping("page")
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<RedSpearheadDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<RedSpearheadDTO> page = redSpearheadService.page(params);
+        return new Result<PageData<RedSpearheadDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<RedSpearheadDTO> get(@PathVariable("id") String id){
+        RedSpearheadDTO data = redSpearheadService.get(id);
+        return new Result<RedSpearheadDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody RedSpearheadDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        redSpearheadService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody RedSpearheadDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        redSpearheadService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        redSpearheadService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<RedSpearheadDTO> list = redSpearheadService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, RedSpearheadExcel.class);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.party.excel.ReportPartyExcel;
+import com.elink.esua.epdc.party.service.ReportPartyService;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+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;
+
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@RestController
+@RequestMapping("reportparty")
+public class ReportPartyController {
+
+    @Autowired
+    private ReportPartyService reportPartyService;
+
+    @GetMapping("page")
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<ReportPartyDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<ReportPartyDTO> page = reportPartyService.page(params);
+        return new Result<PageData<ReportPartyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ReportPartyDTO> get(@PathVariable("id") String id) {
+        ReportPartyDTO data = reportPartyService.get(id);
+        return new Result<ReportPartyDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ReportPartyDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        reportPartyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ReportPartyDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        reportPartyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        reportPartyService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ReportPartyDTO> list = reportPartyService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ReportPartyExcel.class);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ActivityPartyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.party.entity.ActivityPartyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Mapper
+public interface ActivityPartyDao extends BaseDao<ActivityPartyEntity> {
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/FlowPartyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.party.entity.FlowPartyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Mapper
+public interface FlowPartyDao extends BaseDao<FlowPartyEntity> {
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/IntoPartyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.party.entity.IntoPartyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@Mapper
+public interface IntoPartyDao extends BaseDao<IntoPartyEntity> {
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/KnightPionnerDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.party.entity.KnightPionnerEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Mapper
+public interface KnightPionnerDao extends BaseDao<KnightPionnerEntity> {
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/RedSpearheadDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.party.entity.RedSpearheadEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Mapper
+public interface RedSpearheadDao extends BaseDao<RedSpearheadEntity> {
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ReportPartyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.party.entity.ReportPartyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Mapper
+public interface ReportPartyDao extends BaseDao<ReportPartyEntity> {
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ActivityPartyEntity.java

@@ -0,0 +1,79 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("activity_party")
+public class ActivityPartyEntity extends DeptScope {
+
+	private static final long serialVersionUID = 1179730791253578254L;
+	/**
+     * 党员ID
+     */
+	private String reportPartyIds;
+
+    /**
+     * 活动名称
+     */
+	private String title;
+
+    /**
+     * 活动内容
+     */
+	private String content;
+
+    /**
+     * 活动开始时间
+     */
+	private Date startDate;
+
+    /**
+     * 活动结束时间
+     */
+	private Date endDate;
+
+    /**
+     * 活动地址
+     */
+	private String address;
+
+    /**
+     * 活动图片
+     */
+	private String imgs;
+
+    /**
+     * 社区id
+     */
+	private String deptId;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("flow_party")
+public class FlowPartyEntity extends DeptScope {
+
+	private static final long serialVersionUID = 6728231988052417884L;
+
+	/**
+     * 党员姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 是否自由职业 0、否  1、是
+     */
+	private Integer freelance;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 工作单位地址
+     */
+	private String workAddr;
+
+    /**
+     * 居住网格id
+     */
+	private String deptId;
+
+	private String allDeptIds;
+
+	/**
+	 * 审核状态  0、待审核  1、审核通过
+	 */
+	private Integer status;
+
+	/**
+	 * 现属党支部
+	 */
+	private String partyName;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/IntoPartyEntity.java

@@ -0,0 +1,78 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("into_party")
+public class IntoPartyEntity extends DeptScope {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 是否自由职业者 0、否 1、是
+     */
+    private Integer freelance;
+
+    /**
+     * 工作单位名称
+     */
+    private String workUnit;
+
+    /**
+     * 工作单位地址
+     */
+    private String workAddr;
+
+    /**
+     * 审核状态  0、待审核  1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 隶属社区
+     */
+    private Long deptId;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java

@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("knight_pionner")
+public class KnightPionnerEntity extends DeptScope {
+
+
+	private static final long serialVersionUID = -8212390585108800235L;
+
+	/**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 证件号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 是否党员 0、否  1、是
+     */
+	private Integer party;
+
+	/**
+	 * 是否外卖员、快递员 0、否  1、是
+	 */
+	private Integer courier;
+
+    /**
+     * 居住网格id
+     */
+	private String deptId;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/RedSpearheadEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("red_spearhead")
+public class RedSpearheadEntity extends DeptScope {
+
+
+	private static final long serialVersionUID = -7134444541655351950L;
+	/**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 证件号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 所属社区
+     */
+	private String deptId;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 服务类型
+     */
+	private String serviceType;
+
+    /**
+     * 特长
+     */
+	private String specialty;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java

@@ -0,0 +1,103 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("report_party")
+public class ReportPartyEntity extends DeptScope {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 党员姓名
+     */
+	private String name;
+
+    /**
+     * 身份证号码
+     */
+	private String idCard;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 社区id
+     */
+	private String deptId;
+
+    /**
+     * 居住小区名称
+     */
+	private String homeName;
+
+    /**
+     * 现工作单位
+     */
+	private String workUnit;
+
+    /**
+     * 工作单位性质
+     */
+	private String workType;
+
+    /**
+     * 工作单位行业
+     */
+	private String workIndustry;
+
+    /**
+     * 特长
+     */
+	private String specialty;
+
+    /**
+     * 是否党员 0、否  1、是
+     */
+	private Integer party;
+
+    /**
+     * 是否愿意加入志愿者 0、否  1、是
+     */
+	private Integer volunteer;
+
+    /**
+     * 是否愿意加入网格员 0、否 1、是
+     */
+	private Integer gridStaff;
+
+    /**
+     * 是否愿意加入业务委员会 0、否  1、是
+     */
+	private Integer owners;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/ActivityPartyExcel.java

@@ -0,0 +1,64 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+public class ActivityPartyExcel {
+
+    @Excel(name = "党员ID")
+    private String reportPartyIds;
+
+    @Excel(name = "活动名称")
+    private String title;
+
+    @Excel(name = "活动内容")
+    private String content;
+
+    @Excel(name = "活动开始时间")
+    private Date startDate;
+
+    @Excel(name = "活动结束时间")
+    private Date endDate;
+
+    @Excel(name = "活动地址")
+    private String address;
+
+    @Excel(name = "活动图片")
+    private String imgs;
+
+    @Excel(name = "社区id")
+    private Long deptId;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptNames;
+
+    @Excel(name = "所有部门名称")
+    private String allDeptNames;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/FlowPartyExcel.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Data
+public class FlowPartyExcel {
+
+    @Excel(name = "党员姓名")
+    private String name;
+
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    @Excel(name = "联系电话")
+    private String mobile;
+
+    @Excel(name = "是否自由职业者", replace = {"否_0", "是_1"})
+    private Integer freelance;
+
+    @Excel(name = "现工作单位")
+    private String workUnit;
+
+    @Excel(name = "现属党支部")
+    private String partyName;
+
+    @Excel(name = "工作单位地址")
+    private String workAddr;
+
+    @Excel(name = "审核状态", replace = {"待审核_0", "审核通过_1"})
+    private Integer status;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptNames;
+
+    @Excel(name = "所有部门名称")
+    private String allDeptNames;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/IntoPartyExcel.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@Data
+public class IntoPartyExcel {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    @Excel(name = "电话")
+    private String mobile;
+
+    @Excel(name = "是否自由职业者", replace = {"否_0", "是_1"})
+    private Integer freelance;
+
+    @Excel(name = "工作单位名称")
+    private String workUnit;
+
+    @Excel(name = "工作单位地址")
+    private String workAddr;
+
+    @Excel(name = "隶属社区")
+    private String agencyId;
+
+    @Excel(name = "审核状态", replace = {"待审核_0", "审核通过_1"})
+    private Integer status;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptNames;
+
+    @Excel(name = "所有部门名称")
+    private String allDeptNames;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/KnightPionnerExcel.java

@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+public class KnightPionnerExcel {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "证件号码")
+    private String idCard;
+
+    @Excel(name = "联系电话")
+    private String mobile;
+
+    @Excel(name = "现工作单位")
+    private String workUnit;
+
+    @Excel(name = "是否党员 0、否  1、是")
+    private Integer party;
+
+    @Excel(name = "是否外卖员、快递员 0、否  1、是")
+    private Integer courier;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptNames;
+
+    @Excel(name = "所有部门名称")
+    private String allDeptNames;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/RedSpearheadExcel.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Data
+public class RedSpearheadExcel {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "证件号码")
+    private String idCard;
+
+    @Excel(name = "联系电话")
+    private String mobile;
+
+    @Excel(name = "所属社区")
+    private Long deptId;
+
+    @Excel(name = "现工作单位")
+    private String workUnit;
+
+    @Excel(name = "服务类型")
+    private String serviceType;
+
+    @Excel(name = "特长")
+    private String specialty;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptNames;
+
+    @Excel(name = "所有部门名称")
+    private String allDeptNames;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/ReportPartyExcel.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Data
+public class ReportPartyExcel {
+
+    @Excel(name = "党员姓名")
+    private String name;
+
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    @Excel(name = "联系电话")
+    private String mobile;
+
+    @Excel(name = "社区id")
+    private Long deptId;
+
+    @Excel(name = "居住小区名称")
+    private String homeName;
+
+    @Excel(name = "现工作单位")
+    private String workUnit;
+
+    @Excel(name = "工作单位性质")
+    private String workType;
+
+    @Excel(name = "工作单位行业")
+    private String workIndustry;
+
+    @Excel(name = "特长")
+    private String specialty;
+
+    @Excel(name = "是否党员 0、否  1、是")
+    private Integer party;
+
+    @Excel(name = "是否愿意加入志愿者 0、否  1、是")
+    private Integer volunteer;
+
+    @Excel(name = "是否愿意加入网格员 0、否 1、是")
+    private Integer gridStaff;
+
+    @Excel(name = "是否愿意加入业务委员会 0、否  1、是")
+    private Integer owners;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/redis/ActivityPartyRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Component
+public class ActivityPartyRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/redis/FlowPartyRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Component
+public class FlowPartyRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/redis/IntoPartyRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@Component
+public class IntoPartyRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/redis/KnightPionnerRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Component
+public class KnightPionnerRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/redis/RedSpearheadRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Component
+public class RedSpearheadRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/redis/ReportPartyRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Component
+public class ReportPartyRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ActivityPartyService.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.party.entity.ActivityPartyEntity;
+import com.elink.esua.epdc.user.dto.party.ActivityPartyDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+public interface ActivityPartyService extends BaseService<ActivityPartyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ActivityPartyDTO>
+     * @author generator
+     * @date 2023-07-01
+     */
+    PageData<ActivityPartyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ActivityPartyDTO>
+     * @author generator
+     * @date 2023-07-01
+     */
+    List<ActivityPartyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ActivityPartyDTO
+     * @author generator
+     * @date 2023-07-01
+     */
+    ActivityPartyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void save(ActivityPartyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void update(ActivityPartyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/FlowPartyService.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.party.entity.FlowPartyEntity;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+public interface FlowPartyService extends BaseService<FlowPartyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FlowPartyDTO>
+     * @author generator
+     * @date 2023-06-30
+     */
+    PageData<FlowPartyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FlowPartyDTO>
+     * @author generator
+     * @date 2023-06-30
+     */
+    List<FlowPartyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FlowPartyDTO
+     * @author generator
+     * @date 2023-06-30
+     */
+    FlowPartyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-06-30
+     */
+    void save(FlowPartyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-06-30
+     */
+    void update(FlowPartyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-06-30
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/IntoPartyService.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.party.entity.IntoPartyEntity;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
+import com.elink.esua.epdc.user.dto.party.result.IntoPartyResultDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+public interface IntoPartyService extends BaseService<IntoPartyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IntoPartyDTO>
+     * @author generator
+     * @date 2023-06-29
+     */
+    PageData<IntoPartyResultDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IntoPartyDTO>
+     * @author generator
+     * @date 2023-06-29
+     */
+    List<IntoPartyResultDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IntoPartyDTO
+     * @author generator
+     * @date 2023-06-29
+     */
+    IntoPartyResultDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-06-29
+     */
+    void save(IntoPartyFormDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-06-29
+     */
+    void update(IntoPartyFormDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-06-29
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/KnightPionnerService.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.party.entity.KnightPionnerEntity;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+public interface KnightPionnerService extends BaseService<KnightPionnerEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<KnightPionnerDTO>
+     * @author generator
+     * @date 2023-07-01
+     */
+    PageData<KnightPionnerDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<KnightPionnerDTO>
+     * @author generator
+     * @date 2023-07-01
+     */
+    List<KnightPionnerDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return KnightPionnerDTO
+     * @author generator
+     * @date 2023-07-01
+     */
+    KnightPionnerDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void save(KnightPionnerDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void update(KnightPionnerDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/RedSpearheadService.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.party.entity.RedSpearheadEntity;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+public interface RedSpearheadService extends BaseService<RedSpearheadEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<RedSpearheadDTO>
+     * @author generator
+     * @date 2023-07-01
+     */
+    PageData<RedSpearheadDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<RedSpearheadDTO>
+     * @author generator
+     * @date 2023-07-01
+     */
+    List<RedSpearheadDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return RedSpearheadDTO
+     * @author generator
+     * @date 2023-07-01
+     */
+    RedSpearheadDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void save(RedSpearheadDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void update(RedSpearheadDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-07-01
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ReportPartyService.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.party.entity.ReportPartyEntity;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+public interface ReportPartyService extends BaseService<ReportPartyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ReportPartyDTO>
+     * @author generator
+     * @date 2023-06-30
+     */
+    PageData<ReportPartyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ReportPartyDTO>
+     * @author generator
+     * @date 2023-06-30
+     */
+    List<ReportPartyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ReportPartyDTO
+     * @author generator
+     * @date 2023-06-30
+     */
+    ReportPartyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-06-30
+     */
+    void save(ReportPartyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2023-06-30
+     */
+    void update(ReportPartyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2023-06-30
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java

@@ -0,0 +1,187 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.party.dao.ActivityPartyDao;
+import com.elink.esua.epdc.party.entity.ActivityPartyEntity;
+import com.elink.esua.epdc.party.service.ActivityPartyService;
+import com.elink.esua.epdc.user.dto.party.ActivityPartyDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员活动
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Service
+public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao, ActivityPartyEntity> implements ActivityPartyService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<ActivityPartyDTO> page(Map<String, Object> params) {
+        IPage<ActivityPartyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        PageData<ActivityPartyDTO> result = getPageData(page, ActivityPartyDTO.class);
+        result.getList().forEach(dto -> {
+            page.getRecords().forEach(entity -> {
+                if (dto.getId().equals(entity.getId())) {
+                    if (null != entity.getStartDate()) {
+                        dto.setStartDate(DateUtil.formatDate(entity.getStartDate()));
+                    }
+                    if (null != entity.getEndDate()) {
+                        dto.setEndDate(DateUtil.formatDate(entity.getEndDate()));
+                    }
+                }
+            });
+        });
+        return result;
+    }
+
+    @Override
+    public List<ActivityPartyDTO> list(Map<String, Object> params) {
+        List<ActivityPartyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ActivityPartyDTO.class);
+    }
+
+    private QueryWrapper<ActivityPartyEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ActivityPartyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ActivityPartyDTO get(String id) {
+        ActivityPartyEntity entity = baseDao.selectById(id);
+        ActivityPartyDTO result = ConvertUtils.sourceToTarget(entity, ActivityPartyDTO.class);
+        if (StringUtils.isNotEmpty(entity.getReportPartyIds())) {
+            result.setReportPartyIds(entity.getReportPartyIds().split(","));
+        }
+        if (null != entity.getStartDate()) {
+            result.setStartDate(DateUtil.formatDate(entity.getStartDate()));
+        }
+        if (null != entity.getEndDate()) {
+            result.setEndDate(DateUtil.formatDate(entity.getEndDate()));
+        }
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ActivityPartyDTO dto) {
+        ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
+        if (null != dto.getReportPartyIds()) {
+            String[] partyIds = dto.getReportPartyIds();
+            String temp = "";
+            for (String id : partyIds) {
+                temp += id.concat(",");
+            }
+            entity.setReportPartyIds(temp.substring(0, temp.length() - 1));
+        }
+        if (StringUtils.isNotEmpty(dto.getStartDate())) {
+            entity.setStartDate(DateUtil.parseDate(dto.getStartDate()));
+        }
+        if (StringUtils.isNotEmpty(dto.getEndDate())) {
+            entity.setEndDate(DateUtil.parseDate(dto.getEndDate()));
+        }
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
+            entity.setDeptId(String.valueOf(dto.getDeptId()));
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ActivityPartyDTO dto) {
+        ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
+        if (null != dto.getReportPartyIds()) {
+            String[] partyIds = dto.getReportPartyIds();
+            String temp = "";
+            for (String id : partyIds) {
+                temp += id.concat(",");
+            }
+            entity.setReportPartyIds(temp.substring(0, temp.length() - 1));
+        }
+        if (StringUtils.isNotEmpty(dto.getStartDate())) {
+            entity.setStartDate(DateUtil.parseDate(dto.getStartDate()));
+        }
+        if (StringUtils.isNotEmpty(dto.getEndDate())) {
+            entity.setEndDate(DateUtil.parseDate(dto.getEndDate()));
+        }
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
+            entity.setDeptId(String.valueOf(dto.getDeptId()));
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java

@@ -0,0 +1,153 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.party.dao.FlowPartyDao;
+import com.elink.esua.epdc.party.entity.FlowPartyEntity;
+import com.elink.esua.epdc.party.service.FlowPartyService;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流动党员报道表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Service
+public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPartyEntity> implements FlowPartyService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<FlowPartyDTO> page(Map<String, Object> params) {
+        IPage<FlowPartyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        PageData<FlowPartyDTO> result = getPageData(page, FlowPartyDTO.class);
+        page.getRecords().forEach(entity -> {
+            result.getList().forEach(dto -> {
+                if (entity.getId().equals(dto.getId())) {
+                    dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+                }
+            });
+        });
+        return result;
+    }
+
+    @Override
+    public List<FlowPartyDTO> list(Map<String, Object> params) {
+        List<FlowPartyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FlowPartyDTO.class);
+    }
+
+    private QueryWrapper<FlowPartyEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String name = (String) params.get(FieldConstant.NAME_HUMP);
+        String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
+        String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        QueryWrapper<FlowPartyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
+        wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
+        wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        return wrapper;
+    }
+
+    @Override
+    public FlowPartyDTO get(String id) {
+        FlowPartyEntity entity = baseDao.selectById(id);
+        FlowPartyDTO dto = ConvertUtils.sourceToTarget(entity, FlowPartyDTO.class);
+        if (null != entity.getAllDeptIds()) {
+            dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+            dto.setDeptId(Long.parseLong(entity.getDeptId()));
+        }
+        return dto;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FlowPartyDTO dto) {
+        FlowPartyEntity entity = ConvertUtils.sourceToTarget(dto, FlowPartyEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        entity.setStatus(0);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FlowPartyDTO dto) {
+        FlowPartyEntity entity = ConvertUtils.sourceToTarget(dto, FlowPartyEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java

@@ -0,0 +1,128 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.party.dao.IntoPartyDao;
+import com.elink.esua.epdc.party.entity.IntoPartyEntity;
+import com.elink.esua.epdc.party.service.IntoPartyService;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
+import com.elink.esua.epdc.user.dto.party.result.IntoPartyResultDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 申请入党表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-29
+ */
+@Service
+public class IntoPartyServiceImpl extends BaseServiceImpl<IntoPartyDao, IntoPartyEntity> implements IntoPartyService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<IntoPartyResultDTO> page(Map<String, Object> params) {
+        IPage<IntoPartyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IntoPartyResultDTO.class);
+    }
+
+    @Override
+    public List<IntoPartyResultDTO> list(Map<String, Object> params) {
+        List<IntoPartyEntity> entityList = baseDao.selectList(getWrapper(params));
+        return ConvertUtils.sourceToTarget(entityList, IntoPartyResultDTO.class);
+    }
+
+    private QueryWrapper<IntoPartyEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String name = (String) params.get(FieldConstant.NAME_HUMP);
+        String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
+        String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        String status = (String) params.get("status");
+        QueryWrapper<IntoPartyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
+        wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
+        wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        wrapper.eq(StringUtils.isNotBlank(status), "status", status);
+        return wrapper;
+    }
+
+    @Override
+    public IntoPartyResultDTO get(String id) {
+        IntoPartyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IntoPartyResultDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IntoPartyFormDTO dto) {
+        IntoPartyEntity entity = ConvertUtils.sourceToTarget(dto, IntoPartyEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]));
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        entity.setStatus(0);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IntoPartyFormDTO dto) {
+        IntoPartyEntity entity = ConvertUtils.sourceToTarget(dto, IntoPartyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java

@@ -0,0 +1,152 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.party.dao.KnightPionnerDao;
+import com.elink.esua.epdc.party.entity.KnightPionnerEntity;
+import com.elink.esua.epdc.party.service.KnightPionnerService;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 骑士先锋
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Service
+public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao, KnightPionnerEntity> implements KnightPionnerService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<KnightPionnerDTO> page(Map<String, Object> params) {
+        IPage<KnightPionnerEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        PageData<KnightPionnerDTO> result = getPageData(page, KnightPionnerDTO.class);
+        page.getRecords().forEach(entity -> {
+            result.getList().forEach(dto -> {
+                if (entity.getId().equals(dto.getId())) {
+                    dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+                }
+            });
+        });
+        return result;
+    }
+
+    @Override
+    public List<KnightPionnerDTO> list(Map<String, Object> params) {
+        List<KnightPionnerEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, KnightPionnerDTO.class);
+    }
+
+    private QueryWrapper<KnightPionnerEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String name = (String) params.get(FieldConstant.NAME_HUMP);
+        String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
+        String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        QueryWrapper<KnightPionnerEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
+        wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
+        wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        return wrapper;
+    }
+
+    @Override
+    public KnightPionnerDTO get(String id) {
+        KnightPionnerEntity entity = baseDao.selectById(id);
+        KnightPionnerDTO dto = ConvertUtils.sourceToTarget(entity, KnightPionnerDTO.class);
+        if (null != entity.getAllDeptIds()) {
+            dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+            dto.setDeptId(Long.parseLong(entity.getDeptId()));
+        }
+        return dto;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(KnightPionnerDTO dto) {
+        KnightPionnerEntity entity = ConvertUtils.sourceToTarget(dto, KnightPionnerEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(KnightPionnerDTO dto) {
+        KnightPionnerEntity entity = ConvertUtils.sourceToTarget(dto, KnightPionnerEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java

@@ -0,0 +1,152 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.party.dao.RedSpearheadDao;
+import com.elink.esua.epdc.party.entity.RedSpearheadEntity;
+import com.elink.esua.epdc.party.service.RedSpearheadService;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 红色尖兵
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-01
+ */
+@Service
+public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, RedSpearheadEntity> implements RedSpearheadService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<RedSpearheadDTO> page(Map<String, Object> params) {
+        IPage<RedSpearheadEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        PageData<RedSpearheadDTO> result = getPageData(page, RedSpearheadDTO.class);
+        page.getRecords().forEach(entity -> {
+            result.getList().forEach(dto -> {
+                if (entity.getId().equals(dto.getId())) {
+                    dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+                }
+            });
+        });
+        return result;
+    }
+
+    @Override
+    public List<RedSpearheadDTO> list(Map<String, Object> params) {
+        List<RedSpearheadEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, RedSpearheadDTO.class);
+    }
+
+    private QueryWrapper<RedSpearheadEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String name = (String) params.get(FieldConstant.NAME_HUMP);
+        String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
+        String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        QueryWrapper<RedSpearheadEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
+        wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
+        wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        return wrapper;
+    }
+
+    @Override
+    public RedSpearheadDTO get(String id) {
+        RedSpearheadEntity entity = baseDao.selectById(id);
+        RedSpearheadDTO dto = ConvertUtils.sourceToTarget(entity, RedSpearheadDTO.class);
+        if (null != entity.getAllDeptIds()) {
+            dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+            dto.setDeptId(Long.parseLong(entity.getDeptId()));
+        }
+        return dto;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(RedSpearheadDTO dto) {
+        RedSpearheadEntity entity = ConvertUtils.sourceToTarget(dto, RedSpearheadEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(RedSpearheadDTO dto) {
+        RedSpearheadEntity entity = ConvertUtils.sourceToTarget(dto, RedSpearheadEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

@@ -0,0 +1,143 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.party.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.party.dao.ReportPartyDao;
+import com.elink.esua.epdc.party.entity.ReportPartyEntity;
+import com.elink.esua.epdc.party.service.ReportPartyService;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员报道
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-06-30
+ */
+@Service
+public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, ReportPartyEntity> implements ReportPartyService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<ReportPartyDTO> page(Map<String, Object> params) {
+        IPage<ReportPartyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ReportPartyDTO.class);
+    }
+
+    @Override
+    public List<ReportPartyDTO> list(Map<String, Object> params) {
+        List<ReportPartyEntity> entityList = baseDao.selectList(getWrapper(params));
+        return ConvertUtils.sourceToTarget(entityList, ReportPartyDTO.class);
+    }
+
+    private QueryWrapper<ReportPartyEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String name = (String) params.get(FieldConstant.NAME_HUMP);
+        String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
+        String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        QueryWrapper<ReportPartyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
+        wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
+        wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        return wrapper;
+    }
+
+    @Override
+    public ReportPartyDTO get(String id) {
+        ReportPartyEntity entity = baseDao.selectById(id);
+        ReportPartyDTO result = ConvertUtils.sourceToTarget(entity, ReportPartyDTO.class);
+        if (null != entity.getAllDeptIds()) {
+            result.setAllDeptIds(entity.getAllDeptIds().split(","));
+            result.setDeptId(entity.getDeptId());
+        }
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ReportPartyDTO dto) {
+        ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ReportPartyDTO dto) {
+        ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class);
+        Result<ParentAndAllDeptDTO> parentResult = null;
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        }
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        } else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AdminFeignClient.java

@@ -3,10 +3,14 @@ package com.elink.esua.epdc.user.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.user.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -39,4 +43,13 @@ public interface AdminFeignClient {
      */
     @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
     Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+
+    /**
+     * 根据当前登陆人，获取用户数据权限下各部门基本信息
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("/sys/deptqueryUserSysDeptInfo")
+    Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(@RequestBody UserSysDeptInfoFormDTO formDTO);
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AdminFeignClientFallback.java

@@ -1,10 +1,12 @@
 package com.elink.esua.epdc.user.feign.fallback;
 
-import com.elink.esua.epdc.user.feign.AdminFeignClient;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -26,4 +28,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
     }
+
+    @Override
+    public Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", formDTO);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/ActivityPartyDao.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.party.dao.ActivityPartyDao">
+
+    <resultMap type="com.elink.esua.epdc.party.entity.ActivityPartyEntity" id="activityPartyMap">
+        <result property="id" column="ID"/>
+        <result property="reportPartyIds" column="REPORT_PARTY_IDS"/>
+        <result property="title" column="TITLE"/>
+        <result property="content" column="CONTENT"/>
+        <result property="startDate" column="START_DATE"/>
+        <result property="endDate" column="END_DATE"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="imgs" column="IMGS"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/FlowPartyDao.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.party.dao.FlowPartyDao">
+
+    <resultMap type="com.elink.esua.epdc.party.entity.FlowPartyEntity" id="flowPartyMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="freelance" column="FREELANCE"/>
+        <result property="partyName" column="PARTY_NAME"/>
+        <result property="workUnit" column="WORK_UNIT"/>
+        <result property="workAddr" column="WORK_ADDR"/>
+        <result property="status" column="STATUS"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/IntoPartyDao.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.party.dao.IntoPartyDao">
+
+    <resultMap type="com.elink.esua.epdc.party.entity.IntoPartyEntity" id="intoPartyMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="freelance" column="FREELANCE"/>
+        <result property="workUnit" column="WORK_UNIT"/>
+        <result property="workAddr" column="WORK_ADDR"/>
+        <result property="status" column="STATUS"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/KnightPionnerDao.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.party.dao.KnightPionnerDao">
+
+    <resultMap type="com.elink.esua.epdc.party.entity.KnightPionnerEntity" id="knightPionnerMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="workUnit" column="WORK_UNIT"/>
+        <result property="party" column="PARTY"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/RedSpearheadDao.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.party.dao.RedSpearheadDao">
+
+    <resultMap type="com.elink.esua.epdc.party.entity.RedSpearheadEntity" id="redSpearheadMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="workUnit" column="WORK_UNIT"/>
+        <result property="serviceType" column="SERVICE_TYPE"/>
+        <result property="specialty" column="SPECIALTY"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/ReportPartyDao.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.party.dao.ReportPartyDao">
+
+    <resultMap type="com.elink.esua.epdc.party.entity.ReportPartyEntity" id="reportPartyMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="homeName" column="HOME_NAME"/>
+        <result property="workUnit" column="WORK_UNIT"/>
+        <result property="workType" column="WORK_TYPE"/>
+        <result property="workIndustry" column="WORK_INDUSTRY"/>
+        <result property="specialty" column="SPECIALTY"/>
+        <result property="party" column="PARTY"/>
+        <result property="volunteer" column="VOLUNTEER"/>
+        <result property="gridStaff" column="GRID_STAFF"/>
+        <result property="owners" column="OWNERS"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>