From 94630097f0575a836e36bc060e8d2800bca58230 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 27 Aug 2021 11:49:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot-incoming-payment/pom.xml            |   4 +
 ...r.java => PayMemberProjectController.java} |  83 ++++--------
 ...=> PayMemberProjectSubitemController.java} |  40 +++---
 ...mberProject.java => PayMemberProject.java} |  14 +-
 ...item.java => PayMemberProjectSubitem.java} |   2 +-
 ...apper.java => PayMemberProjectMapper.java} |   4 +-
 ...ava => PayMemberProjectSubitemMapper.java} |   4 +-
 ...tMapper.xml => PayMemberProjectMapper.xml} |   4 +-
 ....xml => PayMemberProjectSubitemMapper.xml} |   4 +-
 .../member/service/IMemberProjectService.java |  61 ---------
 .../service/IPayMemberProjectService.java     |  72 ++++++++++
 ...a => IPayMemberProjectSubitemService.java} |  16 +--
 .../impl/MemberProjectServiceImpl.java        |  84 ------------
 .../impl/PayPayMemberProjectServiceImpl.java  | 124 ++++++++++++++++++
 ...ayPayMemberProjectSubitemServiceImpl.java} |  20 +--
 .../modules/system/volid/group/GroupE.java    |   8 ++
 .../modules/system/volid/group/GroupF.java    |   8 ++
 .../modules/system/volid/group/GroupG.java    |   8 ++
 18 files changed, 311 insertions(+), 249 deletions(-)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/controller/{MemberProjectController.java => PayMemberProjectController.java} (61%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/controller/{MemberProjectSubitemController.java => PayMemberProjectSubitemController.java} (69%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/entity/{MemberProject.java => PayMemberProject.java} (79%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/entity/{MemberProjectSubitem.java => PayMemberProjectSubitem.java} (98%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/{MemberProjectMapper.java => PayMemberProjectMapper.java} (60%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/{MemberProjectSubitemMapper.java => PayMemberProjectSubitemMapper.java} (57%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/{MemberProjectMapper.xml => PayMemberProjectMapper.xml} (91%)
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/{MemberProjectSubitemMapper.xml => PayMemberProjectSubitemMapper.xml} (93%)
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/service/{IMemberProjectSubitemService.java => IPayMemberProjectSubitemService.java} (57%)
 delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java
 rename jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/{MemberProjectSubitemServiceImpl.java => PayPayMemberProjectSubitemServiceImpl.java} (52%)
 create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupE.java
 create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupF.java
 create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupG.java

diff --git a/jero-boot-incoming-payment/pom.xml b/jero-boot-incoming-payment/pom.xml
index ae417295..dc4e9bda 100644
--- a/jero-boot-incoming-payment/pom.xml
+++ b/jero-boot-incoming-payment/pom.xml
@@ -16,6 +16,10 @@
             <groupId>com.jero.boot</groupId>
             <artifactId>jero-boot-base-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jero.boot</groupId>
+            <artifactId>jero-boot-module-system</artifactId>
+        </dependency>
         <!-- 如果需要微服务版本，则以上API注释，释放该API
         <dependency>
             <groupId>com.jero.boot</groupId>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
similarity index 61%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
index 505d9811..ffe0d0c0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
@@ -2,18 +2,18 @@ package com.jero.member.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.member.entity.MemberProject;
-import com.jero.member.service.IMemberProjectService;
+import com.jero.member.entity.PayMemberProject;
+import com.jero.member.service.IPayMemberProjectService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -32,139 +32,110 @@ import com.jero.common.aspect.annotation.AutoLog;
 @RestController
 @RequestMapping("/jero/memberProject")
 @Slf4j
-public class MemberProjectController extends JeroController<MemberProject, IMemberProjectService> {
-	@Autowired
-	private IMemberProjectService memberProjectService;
+public class PayMemberProjectController extends JeroController<PayMemberProject, IPayMemberProjectService> {
+	@Resource
+	private IPayMemberProjectService memberProjectService;
+
 	
 	/**
 	 * 分页列表查询
-	 *
-	 * @param memberProject
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-分页列表查询")
 	@ApiOperation(value="会员项目表-分页列表查询", notes="会员项目表-分页列表查询")
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(MemberProject memberProject,
+	public Result<?> queryPageList(PayMemberProject payMemberProject,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<MemberProject> queryWrapper = QueryGenerator.initQueryWrapper(memberProject, req.getParameterMap());
-		Page<MemberProject> page = new Page<MemberProject>(pageNo, pageSize);
-		IPage<MemberProject> pageList = memberProjectService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
+		Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
+		IPage<PayMemberProject> memberProjectPage = memberProjectService.getPage(page, queryWrapper);
+		return Result.OK(memberProjectPage);
 	}
 
     /**
 	 * 列表查询
-	 *
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-列表查询")
     @ApiOperation(value="会员项目表-列表查询", notes="会员项目表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<MemberProject>> queryList() {
-        List<MemberProject> list = memberProjectService.queryList();
+	public Result<List<PayMemberProject>> queryList() {
+        List<PayMemberProject> list = memberProjectService.queryList();
         return Result.OK(list);
 	}
 
 	/**
 	 *   添加
-	 *
-	 * @param memberProject
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-添加")
 	@ApiOperation(value="会员项目表-添加", notes="会员项目表-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@Validated @RequestBody MemberProject memberProject) {
-		memberProjectService.add(memberProject);
+	public Result<?> add(@Validated @RequestBody PayMemberProject payMemberProject) {
+		memberProjectService.add(payMemberProject);
 		return Result.OK("添加成功！");
 	}
 
 	/**
 	 *  编辑
-	 *
-	 * @param memberProject
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-编辑")
 	@ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑")
 	@PostMapping(value = "/edit")
-	public Result<?> edit(@Validated @RequestBody MemberProject memberProject) {
-		memberProjectService.editById(memberProject);
+	public Result<?> edit(@Validated @RequestBody PayMemberProject payMemberProject) {
+		memberProjectService.editById(payMemberProject);
 		return Result.OK("编辑成功!");
 	}
 
 	/**
 	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-通过id删除")
 	@ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除")
 	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<?> delete(@RequestParam(name="id") String id) {
 		memberProjectService.deleteById(id);
 		return Result.OK("删除成功!");
 	}
 
 	/**
 	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-批量删除")
 	@ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除")
 	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
 		this.memberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 
 	/**
 	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
 	 */
 	@AutoLog(value = "会员项目表-通过id查询")
 	@ApiOperation(value="会员项目表-通过id查询", notes="会员项目表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		MemberProject memberProject = memberProjectService.queryById(id);
-		if(memberProject==null) {
+	public Result<?> queryById(@RequestParam(name="id") String id) {
+		PayMemberProject payMemberProject = memberProjectService.queryById(id);
+		if(payMemberProject ==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(memberProject);
+		return Result.OK(payMemberProject);
 	}
 
     /**
     * 导出excel
-    *
-    * @param request
-    * @param memberProject
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, MemberProject memberProject) {
-        return super.exportXls(request, memberProject, MemberProject.class, "会员项目表");
+    public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) {
+        return super.exportXls(request, payMemberProject, PayMemberProject.class, "会员项目表");
     }
 
     /**
       * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, MemberProject.class);
+        return super.importExcel(request, response, PayMemberProject.class);
     }
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
similarity index 69%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index 854ecc9b..95cdd0ef 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.member.entity.MemberProjectSubitem;
-import com.jero.member.service.IMemberProjectSubitemService;
+import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.service.IPayMemberProjectSubitemService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,9 +32,9 @@ import com.jero.common.aspect.annotation.AutoLog;
 @RestController
 @RequestMapping("/jero/memberProjectSubitem")
 @Slf4j
-public class MemberProjectSubitemController extends JeroController<MemberProjectSubitem, IMemberProjectSubitemService> {
+public class PayMemberProjectSubitemController extends JeroController<PayMemberProjectSubitem, IPayMemberProjectSubitemService> {
 	@Resource
-	private IMemberProjectSubitemService memberProjectSubitemService;
+	private IPayMemberProjectSubitemService memberProjectSubitemService;
 	
 	/**
 	 * 分页列表查询
@@ -42,13 +42,13 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
 	@AutoLog(value = "会员项目成员表-分页列表查询")
 	@ApiOperation(value="会员项目成员表-分页列表查询", notes="会员项目成员表-分页列表查询")
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(MemberProjectSubitem memberProjectSubitem,
+	public Result<?> queryPageList(PayMemberProjectSubitem payMemberProjectSubitem,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<MemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(memberProjectSubitem, req.getParameterMap());
-		Page<MemberProjectSubitem> page = new Page<>(pageNo, pageSize);
-		IPage<MemberProjectSubitem> pageList = memberProjectSubitemService.page(page, queryWrapper);
+		QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
+		Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
+		IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -58,8 +58,8 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
 	@AutoLog(value = "会员项目成员表-列表查询")
     @ApiOperation(value="会员项目成员表-列表查询", notes="会员项目成员表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<MemberProjectSubitem>> queryList() {
-        List<MemberProjectSubitem> list = memberProjectSubitemService.queryList();
+	public Result<List<PayMemberProjectSubitem>> queryList() {
+        List<PayMemberProjectSubitem> list = memberProjectSubitemService.queryList();
         return Result.OK(list);
 	}
 
@@ -69,8 +69,8 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
 	@AutoLog(value = "会员项目成员表-添加")
 	@ApiOperation(value="会员项目成员表-添加", notes="会员项目成员表-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@Validated @RequestBody MemberProjectSubitem memberProjectSubitem) {
-		memberProjectSubitemService.add(memberProjectSubitem);
+	public Result<?> add(@Validated @RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
+		memberProjectSubitemService.add(payMemberProjectSubitem);
 		return Result.OK("添加成功！");
 	}
 
@@ -80,8 +80,8 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
 	@AutoLog(value = "会员项目成员表-编辑")
 	@ApiOperation(value="会员项目成员表-编辑", notes="会员项目成员表-编辑")
 	@PostMapping(value = "/edit")
-	public Result<?> edit(@Validated @RequestBody MemberProjectSubitem memberProjectSubitem) {
-		memberProjectSubitemService.editById(memberProjectSubitem);
+	public Result<?> edit(@Validated @RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
+		memberProjectSubitemService.editById(payMemberProjectSubitem);
 		return Result.OK("编辑成功!");
 	}
 
@@ -114,19 +114,19 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
 	@ApiOperation(value="会员项目成员表-通过id查询", notes="会员项目成员表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
-		MemberProjectSubitem memberProjectSubitem = memberProjectSubitemService.queryById(id);
-		if(memberProjectSubitem==null) {
+		PayMemberProjectSubitem payMemberProjectSubitem = memberProjectSubitemService.queryById(id);
+		if(payMemberProjectSubitem ==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(memberProjectSubitem);
+		return Result.OK(payMemberProjectSubitem);
 	}
 
     /**
     * 导出excel
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, MemberProjectSubitem memberProjectSubitem) {
-        return super.exportXls(request, memberProjectSubitem, MemberProjectSubitem.class, "会员项目成员表");
+    public ModelAndView exportXls(HttpServletRequest request, PayMemberProjectSubitem payMemberProjectSubitem) {
+        return super.exportXls(request, payMemberProjectSubitem, PayMemberProjectSubitem.class, "会员项目成员表");
     }
 
     /**
@@ -134,7 +134,7 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, MemberProjectSubitem.class);
+        return super.importExcel(request, response, PayMemberProjectSubitem.class);
     }
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java
similarity index 79%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java
index 886c7571..3ecc0c5a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.modules.system.volid.group.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +16,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
 
 /**
  * @Description: 会员项目表
@@ -27,7 +32,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "会员项目对象", description = "会员项目表")
-public class MemberProject implements Serializable {
+public class PayMemberProject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -71,6 +76,8 @@ public class MemberProject implements Serializable {
      */
     @Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
+    @Size(max = 50, message = "项目名称最大为50个字符")
+    @NotBlank(message = "项目名称不能为空")
     private String projectName;
 
     /**
@@ -78,6 +85,7 @@ public class MemberProject implements Serializable {
      */
     @Excel(name = "运行年份", width = 15)
     @ApiModelProperty(value = "运行年份")
+    @Pattern(regexp = "^\\d{4}$", message = "运行年份必须为4位字符", groups = GroupA.class)
     private String particularYear;
 
     /**
@@ -85,6 +93,7 @@ public class MemberProject implements Serializable {
      */
     @Excel(name = "负责人id", width = 15)
     @ApiModelProperty(value = "负责人id")
+    @NotBlank(message = "负责人不能为空", groups = GroupB.class)
     private String directorId;
 
     /**
@@ -106,6 +115,7 @@ public class MemberProject implements Serializable {
      */
     @Excel(name = "收费通知号", width = 15)
     @ApiModelProperty(value = "收费通知号")
+    @Size(max = 50, message = "收费通知号最大为50个字符", groups = GroupC.class)
     private String chargeNoticeNo;
 
     /**
@@ -113,6 +123,7 @@ public class MemberProject implements Serializable {
      */
     @Excel(name = "收费通知文件id", width = 15)
     @ApiModelProperty(value = "收费通知文件id")
+    @Size(max = 50, message = "收费通知号最大为50个字符", groups = GroupD.class)
     private String chargeNoticeFileId;
 
     /**
@@ -120,6 +131,7 @@ public class MemberProject implements Serializable {
      */
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
+    @Size(max = 200, message = "备注最大为200个字符", groups = GroupE.class)
     private String remark;
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
similarity index 98%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index 554f91f9..f0b1e3a1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -26,7 +26,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "会员项目成员表对象", description = "会员项目成员表")
-public class MemberProjectSubitem implements Serializable {
+public class PayMemberProjectSubitem implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java
similarity index 60%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java
index 0a5a8ad7..16491eb0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java
@@ -1,6 +1,6 @@
 package com.jero.member.mapper;
 
-import com.jero.member.entity.MemberProject;
+import com.jero.member.entity.PayMemberProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2021-08-26
  * @Version: V1.0
  */
-public interface MemberProjectMapper extends BaseMapper<MemberProject> {
+public interface PayMemberProjectMapper extends BaseMapper<PayMemberProject> {
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java
similarity index 57%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java
index 00bfa0b9..33f22910 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java
@@ -1,6 +1,6 @@
 package com.jero.member.mapper;
 
-import com.jero.member.entity.MemberProjectSubitem;
+import com.jero.member.entity.PayMemberProjectSubitem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2021-08-26
  * @Version: V1.0
  */
-public interface MemberProjectSubitemMapper extends BaseMapper<MemberProjectSubitem> {
+public interface PayMemberProjectSubitemMapper extends BaseMapper<PayMemberProjectSubitem> {
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml
similarity index 91%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml
index 526d0fdd..a03efdac 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml
@@ -1,7 +1,7 @@
 <?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.jero.member.mapper.MemberProjectMapper">
-    <resultMap id="MemberProjectResultMap" type="com.jero.member.entity.MemberProject">
+<mapper namespace="com.jero.member.mapper.PayMemberProjectMapper">
+    <resultMap id="MemberProjectResultMap" type="com.jero.member.entity.PayMemberProject">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
similarity index 93%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
index 984faccc..88238ba4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
@@ -1,7 +1,7 @@
 <?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.jero.member.mapper.MemberProjectSubitemMapper">
-    <resultMap id="MemberProjectSubitemResultMap" type="com.jero.member.entity.MemberProjectSubitem">
+<mapper namespace="com.jero.member.mapper.PayMemberProjectSubitemMapper">
+    <resultMap id="MemberProjectSubitemResultMap" type="com.jero.member.entity.PayMemberProjectSubitem">
         <id column="id" property="id" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java
deleted file mode 100644
index 3b2990c9..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.jero.member.service;
-
-import com.jero.member.entity.MemberProject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
-/**
- * @Description: 会员项目表
- * @Author: jero-boot
- * @Date:   2021-08-26
- * @Version: V1.0
- */
-public interface IMemberProjectService extends IService<MemberProject> {
-
-	/**
-	 * 保存
-	 *
-	 * @param memberProject
-	 * @return
-	 */
-    void add(MemberProject memberProject);
-
-	/**
-	 * 更新
-	 *
-	 * @param memberProject
-	 * @return
-	 */
-    void editById(MemberProject memberProject);
-
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-    void deleteById(String id);
-
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-    void deleteByIds(List<String> ids);
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-    MemberProject queryById(String id);
-
-    /**
-	 * 列表查询
-	 *
-	 * @return
-	 */
-    List<MemberProject> queryList();
-}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java
new file mode 100644
index 00000000..d1e55248
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java
@@ -0,0 +1,72 @@
+package com.jero.member.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.member.entity.PayMemberProject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 会员项目表
+ * @Author: jero-boot
+ * @Date:   2021-08-26
+ * @Version: V1.0
+ */
+public interface IPayMemberProjectService extends IService<PayMemberProject> {
+
+	/**
+	 * 保存
+	 *
+	 * @param payMemberProject
+	 * @return
+	 */
+    void add(PayMemberProject payMemberProject);
+
+	/**
+	 * 更新
+	 *
+	 * @param payMemberProject
+	 * @return
+	 */
+    void editById(PayMemberProject payMemberProject);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    PayMemberProject queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<PayMemberProject> queryList();
+
+	/**
+	 * 分页查询
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+    IPage<PayMemberProject> getPage(Page<PayMemberProject> page, QueryWrapper<PayMemberProject> queryWrapper);
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
similarity index 57%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
index f6e39778..13d36e26 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
@@ -1,6 +1,6 @@
 package com.jero.member.service;
 
-import com.jero.member.entity.MemberProjectSubitem;
+import com.jero.member.entity.PayMemberProjectSubitem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
 
@@ -10,23 +10,23 @@ import java.util.List;
  * @Date:   2021-08-26
  * @Version: V1.0
  */
-public interface IMemberProjectSubitemService extends IService<MemberProjectSubitem> {
+public interface IPayMemberProjectSubitemService extends IService<PayMemberProjectSubitem> {
 
 	/**
 	 * 保存
 	 *
-	 * @param memberProjectSubitem
+	 * @param payMemberProjectSubitem
 	 * @return
 	 */
-    void add(MemberProjectSubitem memberProjectSubitem);
+    void add(PayMemberProjectSubitem payMemberProjectSubitem);
 
 	/**
 	 * 更新
 	 *
-	 * @param memberProjectSubitem
+	 * @param payMemberProjectSubitem
 	 * @return
 	 */
-    void editById(MemberProjectSubitem memberProjectSubitem);
+    void editById(PayMemberProjectSubitem payMemberProjectSubitem);
 
 	/**
 	 * 通过id删除
@@ -50,12 +50,12 @@ public interface IMemberProjectSubitemService extends IService<MemberProjectSubi
 	 * @param id
 	 * @return
 	 */
-    MemberProjectSubitem queryById(String id);
+    PayMemberProjectSubitem queryById(String id);
 
     /**
 	 * 列表查询
 	 *
 	 * @return
 	 */
-    List<MemberProjectSubitem> queryList();
+    List<PayMemberProjectSubitem> queryList();
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java
deleted file mode 100644
index 5b477804..00000000
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.jero.member.service.impl;
-
-import com.jero.member.entity.MemberProject;
-import com.jero.member.mapper.MemberProjectMapper;
-import com.jero.member.service.IMemberProjectService;
-import org.springframework.stereotype.Service;
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 会员项目表
- * @Author: jero-boot
- * @Date:   2021-08-26
- * @Version: V1.0
- */
-@Service
-public class MemberProjectServiceImpl extends ServiceImpl<MemberProjectMapper, MemberProject> implements IMemberProjectService {
-
-	/**
-	 * 保存
-	 *
-	 * @param memberProject
-	 * @return
-	 */
-	@Override
-    public void add(MemberProject memberProject) {
-        save(memberProject);
-    }
-
-	/**
-	 * 更新
-	 *
-	 * @param memberProject
-	 * @return
-	 */
-	@Override
-    public void editById(MemberProject memberProject) {
-    	saveOrUpdate(memberProject);
-    }
-
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-    public void deleteById(String id) {
-        removeById(id);
-    }
-
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@Override
-    public void deleteByIds(List<String> ids) {
-        removeByIds(ids);
-    }
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-    public MemberProject queryById(String id) {
-        return getById(id);
-    }
-
-    /**
-	 * 列表查询
-	 *
-	 * @return
-	 */
-	@Override
-    public List<MemberProject> queryList() {
-        return list();
-    }
-}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java
new file mode 100644
index 00000000..e807219f
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java
@@ -0,0 +1,124 @@
+package com.jero.member.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.exception.JeroBootException;
+import com.jero.member.entity.PayMemberProject;
+import com.jero.member.mapper.PayMemberProjectMapper;
+import com.jero.member.service.IPayMemberProjectService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.mapper.SysUserMapper;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: 会员项目表
+ * @Author: jero-boot
+ * @Date:   2021-08-26
+ * @Version: V1.0
+ */
+@Service
+public class PayPayMemberProjectServiceImpl extends ServiceImpl<PayMemberProjectMapper, PayMemberProject> implements IPayMemberProjectService {
+	@Resource
+	private SysUserMapper userMapper;
+	/**
+	 * 保存
+	 *
+	 * @param payMemberProject
+	 * @return
+	 */
+	@Override
+    public void add(PayMemberProject payMemberProject) {
+		//判断项目名称
+		LambdaQueryWrapper<PayMemberProject> wrapper = new LambdaQueryWrapper();
+		wrapper.eq(PayMemberProject::getProjectName,payMemberProject.getProjectName());
+		Integer integer = baseMapper.selectCount(wrapper);
+		if (integer>0){
+			throw new JeroBootException("项目名称重复");
+		}
+		//判断联系人
+		String directorId = payMemberProject.getDirectorId();
+		SysUser sysUser = userMapper.selectById(directorId);
+		if (sysUser == null){
+			throw new JeroBootException("联系人不存在");
+		}
+		payMemberProject.setDirectorName(sysUser.getUsername());
+
+
+
+		save(payMemberProject);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param payMemberProject
+	 * @return
+	 */
+	@Override
+    public void editById(PayMemberProject payMemberProject) {
+    	saveOrUpdate(payMemberProject);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public PayMemberProject queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<PayMemberProject> queryList() {
+        return list();
+    }
+
+    @Override
+    public IPage<PayMemberProject> getPage(Page<PayMemberProject> page, QueryWrapper<PayMemberProject> queryWrapper) {
+		Page<PayMemberProject> memberProjectPage = baseMapper.selectPage(page, queryWrapper);
+		List<PayMemberProject> records = memberProjectPage.getRecords();
+		for (PayMemberProject record : records) {
+			String directorId = record.getDirectorId();
+			SysUser sysUser = userMapper.selectById(directorId);
+			record.setDirectorName(sysUser.getUsername());
+		}
+		memberProjectPage.setRecords(records);
+		return memberProjectPage;
+    }
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
similarity index 52%
rename from jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
index 59c9f7f6..510f1f9a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
@@ -1,8 +1,8 @@
 package com.jero.member.service.impl;
 
-import com.jero.member.entity.MemberProjectSubitem;
-import com.jero.member.mapper.MemberProjectSubitemMapper;
-import com.jero.member.service.IMemberProjectSubitemService;
+import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.mapper.PayMemberProjectSubitemMapper;
+import com.jero.member.service.IPayMemberProjectSubitemService;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,22 +14,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
-public class MemberProjectSubitemServiceImpl extends ServiceImpl<MemberProjectSubitemMapper, MemberProjectSubitem> implements IMemberProjectSubitemService {
+public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMemberProjectSubitemMapper, PayMemberProjectSubitem> implements IPayMemberProjectSubitemService {
 
 	/**
 	 * 保存
 	 */
 	@Override
-    public void add(MemberProjectSubitem memberProjectSubitem) {
-        save(memberProjectSubitem);
+    public void add(PayMemberProjectSubitem payMemberProjectSubitem) {
+        save(payMemberProjectSubitem);
     }
 
 	/**
 	 * 更新
 	 */
 	@Override
-    public void editById(MemberProjectSubitem memberProjectSubitem) {
-    	saveOrUpdate(memberProjectSubitem);
+    public void editById(PayMemberProjectSubitem payMemberProjectSubitem) {
+    	saveOrUpdate(payMemberProjectSubitem);
     }
 
 	/**
@@ -52,7 +52,7 @@ public class MemberProjectSubitemServiceImpl extends ServiceImpl<MemberProjectSu
 	 * 通过id查询
 	 */
 	@Override
-    public MemberProjectSubitem queryById(String id) {
+    public PayMemberProjectSubitem queryById(String id) {
         return getById(id);
     }
 
@@ -60,7 +60,7 @@ public class MemberProjectSubitemServiceImpl extends ServiceImpl<MemberProjectSu
 	 * 列表查询
 	 */
 	@Override
-    public List<MemberProjectSubitem> queryList() {
+    public List<PayMemberProjectSubitem> queryList() {
         return list();
     }
 }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupE.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupE.java
new file mode 100644
index 00000000..9442b756
--- /dev/null
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupE.java
@@ -0,0 +1,8 @@
+package com.jero.modules.system.volid.group;
+
+/**
+ * @author liJiaRao
+ * @date 2021-08-19 18:15
+ */
+public @interface GroupE {
+}
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupF.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupF.java
new file mode 100644
index 00000000..248f2073
--- /dev/null
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupF.java
@@ -0,0 +1,8 @@
+package com.jero.modules.system.volid.group;
+
+/**
+ * @author liJiaRao
+ * @date 2021-08-19 18:15
+ */
+public @interface GroupF {
+}
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupG.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupG.java
new file mode 100644
index 00000000..bdb2a3e9
--- /dev/null
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/volid/group/GroupG.java
@@ -0,0 +1,8 @@
+package com.jero.modules.system.volid.group;
+
+/**
+ * @author liJiaRao
+ * @date 2021-08-19 18:15
+ */
+public @interface GroupG {
+}