Merge remote-tracking branch 'origin/master'

huaxin-admin/src/main/java/com/zehong/web/controller/group/TGroupMemberInfoController.java

+package com.zehong.web.controller.group;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TGroupMemberInfo;
+import com.zehong.system.service.ITGroupMemberInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 组内成员信息Controller
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+@RestController
+@RequestMapping("/group/member")
+public class TGroupMemberInfoController extends BaseController
+{
+    @Autowired
+    private ITGroupMemberInfoService tGroupMemberInfoService;
+
+    /**
+     * 查询组内成员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('group:member:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TGroupMemberInfo tGroupMemberInfo)
+    {
+        startPage();
+        List<TGroupMemberInfo> list = tGroupMemberInfoService.selectTGroupMemberInfoList(tGroupMemberInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出组内成员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('group:member:export')")
+    @Log(title = "组内成员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TGroupMemberInfo tGroupMemberInfo)
+    {
+        List<TGroupMemberInfo> list = tGroupMemberInfoService.selectTGroupMemberInfoList(tGroupMemberInfo);
+        ExcelUtil<TGroupMemberInfo> util = new ExcelUtil<TGroupMemberInfo>(TGroupMemberInfo.class);
+        return util.exportExcel(list, "组内成员信息数据");
+    }
+
+    /**
+     * 获取组内成员信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:member:query')")
+    @GetMapping(value = "/{memberId}")
+    public AjaxResult getInfo(@PathVariable("memberId") Long memberId)
+    {
+        return AjaxResult.success(tGroupMemberInfoService.selectTGroupMemberInfoById(memberId));
+    }
+
+    /**
+     * 新增组内成员信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:member:add')")
+    @Log(title = "组内成员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TGroupMemberInfo tGroupMemberInfo)
+    {
+        return toAjax(tGroupMemberInfoService.insertTGroupMemberInfo(tGroupMemberInfo));
+    }
+
+    /**
+     * 修改组内成员信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:member:edit')")
+    @Log(title = "组内成员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TGroupMemberInfo tGroupMemberInfo)
+    {
+        return toAjax(tGroupMemberInfoService.updateTGroupMemberInfo(tGroupMemberInfo));
+    }
+
+    /**
+     * 删除组内成员信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:member:remove')")
+    @Log(title = "组内成员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{memberIds}")
+    public AjaxResult remove(@PathVariable Long[] memberIds)
+    {
+        return toAjax(tGroupMemberInfoService.deleteTGroupMemberInfoByIds(memberIds));
+    }
+
+
+    /**
+     * 获取人员信息
+     * @return
+     */
+    @PostMapping("/selectMemberInfo")
+    public AjaxResult selectMemberInfo(@RequestBody Map<String,Object> map){
+        return AjaxResult.success(tGroupMemberInfoService.selectMemberInfo(map));
+    }
+}

huaxin-admin/src/main/java/com/zehong/web/controller/group/TPersonGroupInfoController.java

+package com.zehong.web.controller.group;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TPersonGroupInfo;
+import com.zehong.system.service.ITPersonGroupInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 人员分组信息Controller
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+@RestController
+@RequestMapping("/group/info")
+public class TPersonGroupInfoController extends BaseController
+{
+    @Autowired
+    private ITPersonGroupInfoService tPersonGroupInfoService;
+
+    /**
+     * 查询人员分组信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('group:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPersonGroupInfo tPersonGroupInfo)
+    {
+        startPage();
+        List<TPersonGroupInfo> list = tPersonGroupInfoService.selectTPersonGroupInfoList(tPersonGroupInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出人员分组信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('group:info:export')")
+    @Log(title = "人员分组信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPersonGroupInfo tPersonGroupInfo)
+    {
+        List<TPersonGroupInfo> list = tPersonGroupInfoService.selectTPersonGroupInfoList(tPersonGroupInfo);
+        ExcelUtil<TPersonGroupInfo> util = new ExcelUtil<TPersonGroupInfo>(TPersonGroupInfo.class);
+        return util.exportExcel(list, "人员分组信息数据");
+    }
+
+    /**
+     * 获取人员分组信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:info:query')")
+    @GetMapping(value = "/{groupId}")
+    public AjaxResult getInfo(@PathVariable("groupId") Long groupId)
+    {
+        return AjaxResult.success(tPersonGroupInfoService.selectTPersonGroupInfoById(groupId));
+    }
+
+    /**
+     * 新增人员分组信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:info:add')")
+    @Log(title = "人员分组信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPersonGroupInfo tPersonGroupInfo)
+    {
+        return toAjax(tPersonGroupInfoService.insertTPersonGroupInfo(tPersonGroupInfo));
+    }
+
+    /**
+     * 修改人员分组信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:info:edit')")
+    @Log(title = "人员分组信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPersonGroupInfo tPersonGroupInfo)
+    {
+        return toAjax(tPersonGroupInfoService.updateTPersonGroupInfo(tPersonGroupInfo));
+    }
+
+    /**
+     * 删除人员分组信息
+     */
+    @PreAuthorize("@ss.hasPermi('group:info:remove')")
+    @Log(title = "人员分组信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{groupIds}")
+    public AjaxResult remove(@PathVariable Long[] groupIds)
+    {
+        return toAjax(tPersonGroupInfoService.deleteTPersonGroupInfoByIds(groupIds));
+    }
+}

huaxin-system/src/main/java/com/zehong/system/domain/TGroupMemberInfo.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 组内成员信息对象 t_group_member_info
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+public class TGroupMemberInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long memberId;
+
+    /** 组主键 */
+    @Excel(name = "组主键")
+    private Long groupId;
+
+    /** 用户主键 */
+    private Long userId;
+
+    @Excel(name = "姓名")
+    private String nickName;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setMemberId(Long memberId) 
+    {
+        this.memberId = memberId;
+    }
+
+    public Long getMemberId() 
+    {
+        return memberId;
+    }
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("memberId", getMemberId())
+            .append("groupId", getGroupId())
+            .append("userId", getUserId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

huaxin-system/src/main/java/com/zehong/system/domain/TPersonGroupInfo.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 人员分组信息对象 t_person_group_info
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+public class TPersonGroupInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long groupId;
+
+    /** 组名 */
+    @Excel(name = "组名")
+    private String groupName;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除",readConverterExp = "0=正常,1=删除")
+    private String isDel;
+
+    private String memberName;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    private List<TGroupMemberInfo> memberInfoList;
+
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setGroupName(String groupName) 
+    {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName() 
+    {
+        return groupName;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public List<TGroupMemberInfo> getMemberInfoList() {
+        return memberInfoList;
+    }
+
+    public void setMemberInfoList(List<TGroupMemberInfo> memberInfoList) {
+        this.memberInfoList = memberInfoList;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("groupId", getGroupId())
+            .append("groupName", getGroupName())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

huaxin-system/src/main/java/com/zehong/system/mapper/TGroupMemberInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TGroupMemberInfo;
+
+/**
+ * 组内成员信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+public interface TGroupMemberInfoMapper 
+{
+    /**
+     * 查询组内成员信息
+     * 
+     * @param memberId 组内成员信息ID
+     * @return 组内成员信息
+     */
+    public TGroupMemberInfo selectTGroupMemberInfoById(Long memberId);
+
+    /**
+     * 查询组内成员信息列表
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 组内成员信息集合
+     */
+    public List<TGroupMemberInfo> selectTGroupMemberInfoList(TGroupMemberInfo tGroupMemberInfo);
+
+    /**
+     * 新增组内成员信息
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 结果
+     */
+    public int insertTGroupMemberInfo(TGroupMemberInfo tGroupMemberInfo);
+
+    /**
+     * 修改组内成员信息
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 结果
+     */
+    public int updateTGroupMemberInfo(TGroupMemberInfo tGroupMemberInfo);
+
+    /**
+     * 删除组内成员信息
+     * 
+     * @param memberId 组内成员信息ID
+     * @return 结果
+     */
+    public int deleteTGroupMemberInfoById(Long memberId);
+
+    /**
+     * 批量删除组内成员信息
+     * 
+     * @param memberIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTGroupMemberInfoByIds(Long[] memberIds);
+
+    /**
+     * 获取人员信息
+     * @return
+     */
+    List<Map<String,Object>> selectMemberInfo(Map<String,Object> map);
+
+    int deleteTGroupMemberInfoByGroupId(Long groupId);
+}

huaxin-system/src/main/java/com/zehong/system/mapper/TPersonGroupInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPersonGroupInfo;
+
+/**
+ * 人员分组信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+public interface TPersonGroupInfoMapper 
+{
+    /**
+     * 查询人员分组信息
+     * 
+     * @param groupId 人员分组信息ID
+     * @return 人员分组信息
+     */
+    public TPersonGroupInfo selectTPersonGroupInfoById(Long groupId);
+
+    /**
+     * 查询人员分组信息列表
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 人员分组信息集合
+     */
+    public List<TPersonGroupInfo> selectTPersonGroupInfoList(TPersonGroupInfo tPersonGroupInfo);
+
+    /**
+     * 新增人员分组信息
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 结果
+     */
+    public int insertTPersonGroupInfo(TPersonGroupInfo tPersonGroupInfo);
+
+    /**
+     * 修改人员分组信息
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 结果
+     */
+    public int updateTPersonGroupInfo(TPersonGroupInfo tPersonGroupInfo);
+
+    /**
+     * 删除人员分组信息
+     * 
+     * @param groupId 人员分组信息ID
+     * @return 结果
+     */
+    public int deleteTPersonGroupInfoById(Long groupId);
+
+    /**
+     * 批量删除人员分组信息
+     * 
+     * @param groupIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPersonGroupInfoByIds(Long[] groupIds);
+}

huaxin-system/src/main/java/com/zehong/system/service/ITGroupMemberInfoService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TGroupMemberInfo;
+
+/**
+ * 组内成员信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+public interface ITGroupMemberInfoService 
+{
+    /**
+     * 查询组内成员信息
+     * 
+     * @param memberId 组内成员信息ID
+     * @return 组内成员信息
+     */
+    public TGroupMemberInfo selectTGroupMemberInfoById(Long memberId);
+
+    /**
+     * 查询组内成员信息列表
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 组内成员信息集合
+     */
+    public List<TGroupMemberInfo> selectTGroupMemberInfoList(TGroupMemberInfo tGroupMemberInfo);
+
+    /**
+     * 新增组内成员信息
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 结果
+     */
+    public int insertTGroupMemberInfo(TGroupMemberInfo tGroupMemberInfo);
+
+    /**
+     * 修改组内成员信息
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 结果
+     */
+    public int updateTGroupMemberInfo(TGroupMemberInfo tGroupMemberInfo);
+
+    /**
+     * 批量删除组内成员信息
+     * 
+     * @param memberIds 需要删除的组内成员信息ID
+     * @return 结果
+     */
+    public int deleteTGroupMemberInfoByIds(Long[] memberIds);
+
+    /**
+     * 删除组内成员信息信息
+     * 
+     * @param memberId 组内成员信息ID
+     * @return 结果
+     */
+    public int deleteTGroupMemberInfoById(Long memberId);
+
+    /**
+     * 获取人员信息
+     * @return
+     */
+    List<Map<String,Object>> selectMemberInfo(Map<String,Object> map);
+}

huaxin-system/src/main/java/com/zehong/system/service/ITPersonGroupInfoService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TPersonGroupInfo;
+
+/**
+ * 人员分组信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+public interface ITPersonGroupInfoService 
+{
+    /**
+     * 查询人员分组信息
+     * 
+     * @param groupId 人员分组信息ID
+     * @return 人员分组信息
+     */
+    public TPersonGroupInfo selectTPersonGroupInfoById(Long groupId);
+
+    /**
+     * 查询人员分组信息列表
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 人员分组信息集合
+     */
+    public List<TPersonGroupInfo> selectTPersonGroupInfoList(TPersonGroupInfo tPersonGroupInfo);
+
+    /**
+     * 新增人员分组信息
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 结果
+     */
+    public int insertTPersonGroupInfo(TPersonGroupInfo tPersonGroupInfo);
+
+    /**
+     * 修改人员分组信息
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 结果
+     */
+    public int updateTPersonGroupInfo(TPersonGroupInfo tPersonGroupInfo);
+
+    /**
+     * 批量删除人员分组信息
+     * 
+     * @param groupIds 需要删除的人员分组信息ID
+     * @return 结果
+     */
+    public int deleteTPersonGroupInfoByIds(Long[] groupIds);
+
+    /**
+     * 删除人员分组信息信息
+     * 
+     * @param groupId 人员分组信息ID
+     * @return 结果
+     */
+    public int deleteTPersonGroupInfoById(Long groupId);
+}

huaxin-system/src/main/java/com/zehong/system/service/impl/TGroupMemberInfoServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TGroupMemberInfoMapper;
+import com.zehong.system.domain.TGroupMemberInfo;
+import com.zehong.system.service.ITGroupMemberInfoService;
+
+/**
+ * 组内成员信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+@Service
+public class TGroupMemberInfoServiceImpl implements ITGroupMemberInfoService 
+{
+    @Autowired
+    private TGroupMemberInfoMapper tGroupMemberInfoMapper;
+
+    /**
+     * 查询组内成员信息
+     * 
+     * @param memberId 组内成员信息ID
+     * @return 组内成员信息
+     */
+    @Override
+    public TGroupMemberInfo selectTGroupMemberInfoById(Long memberId)
+    {
+        return tGroupMemberInfoMapper.selectTGroupMemberInfoById(memberId);
+    }
+
+    /**
+     * 查询组内成员信息列表
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 组内成员信息
+     */
+    @Override
+    public List<TGroupMemberInfo> selectTGroupMemberInfoList(TGroupMemberInfo tGroupMemberInfo)
+    {
+        return tGroupMemberInfoMapper.selectTGroupMemberInfoList(tGroupMemberInfo);
+    }
+
+    /**
+     * 新增组内成员信息
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 结果
+     */
+    @Override
+    public int insertTGroupMemberInfo(TGroupMemberInfo tGroupMemberInfo)
+    {
+        tGroupMemberInfo.setCreateTime(DateUtils.getNowDate());
+        return tGroupMemberInfoMapper.insertTGroupMemberInfo(tGroupMemberInfo);
+    }
+
+    /**
+     * 修改组内成员信息
+     * 
+     * @param tGroupMemberInfo 组内成员信息
+     * @return 结果
+     */
+    @Override
+    public int updateTGroupMemberInfo(TGroupMemberInfo tGroupMemberInfo)
+    {
+        tGroupMemberInfo.setUpdateTime(DateUtils.getNowDate());
+        return tGroupMemberInfoMapper.updateTGroupMemberInfo(tGroupMemberInfo);
+    }
+
+    /**
+     * 批量删除组内成员信息
+     * 
+     * @param memberIds 需要删除的组内成员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGroupMemberInfoByIds(Long[] memberIds)
+    {
+        return tGroupMemberInfoMapper.deleteTGroupMemberInfoByIds(memberIds);
+    }
+
+    /**
+     * 删除组内成员信息信息
+     * 
+     * @param memberId 组内成员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGroupMemberInfoById(Long memberId)
+    {
+        return tGroupMemberInfoMapper.deleteTGroupMemberInfoById(memberId);
+    }
+
+
+    /**
+     * 获取人员信息
+     * @return
+     */
+    @Override
+    public List<Map<String,Object>> selectMemberInfo(Map<String,Object> map){
+        return tGroupMemberInfoMapper.selectMemberInfo(map);
+    }
+}

huaxin-system/src/main/java/com/zehong/system/service/impl/TPersonGroupInfoServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.TGroupMemberInfo;
+import com.zehong.system.mapper.TGroupMemberInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TPersonGroupInfoMapper;
+import com.zehong.system.domain.TPersonGroupInfo;
+import com.zehong.system.service.ITPersonGroupInfoService;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * 人员分组信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-12-05
+ */
+@Service
+public class TPersonGroupInfoServiceImpl implements ITPersonGroupInfoService 
+{
+    @Resource
+    private TPersonGroupInfoMapper tPersonGroupInfoMapper;
+
+    @Resource
+    private TGroupMemberInfoMapper groupMemberInfoMapper;
+
+    /**
+     * 查询人员分组信息
+     * 
+     * @param groupId 人员分组信息ID
+     * @return 人员分组信息
+     */
+    @Override
+    public TPersonGroupInfo selectTPersonGroupInfoById(Long groupId) {
+        TPersonGroupInfo groupInfo = tPersonGroupInfoMapper.selectTPersonGroupInfoById(groupId);
+        TGroupMemberInfo tGroupMemberInfo = new TGroupMemberInfo();
+        tGroupMemberInfo.setGroupId(groupId);
+        List<TGroupMemberInfo> memberInfoList = groupMemberInfoMapper.selectTGroupMemberInfoList(tGroupMemberInfo);
+        groupInfo.setMemberInfoList(memberInfoList);
+        return groupInfo;
+    }
+
+    /**
+     * 查询人员分组信息列表
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 人员分组信息
+     */
+    @Override
+    public List<TPersonGroupInfo> selectTPersonGroupInfoList(TPersonGroupInfo tPersonGroupInfo)
+    {
+        return tPersonGroupInfoMapper.selectTPersonGroupInfoList(tPersonGroupInfo);
+    }
+
+    /**
+     * 新增人员分组信息
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertTPersonGroupInfo(TPersonGroupInfo tPersonGroupInfo) {
+        tPersonGroupInfo.setCreateTime(DateUtils.getNowDate());
+        tPersonGroupInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        int result = tPersonGroupInfoMapper.insertTPersonGroupInfo(tPersonGroupInfo);
+        addMemberInfo(tPersonGroupInfo);
+        return result;
+    }
+
+    /**
+     * 新增组成员
+     * @param tPersonGroupInfo 组信息
+     */
+    private void addMemberInfo(TPersonGroupInfo tPersonGroupInfo){
+        for(TGroupMemberInfo memberInfo : tPersonGroupInfo.getMemberInfoList()){
+            memberInfo.setGroupId(tPersonGroupInfo.getGroupId());
+            memberInfo.setCreateTime(new Date());
+            memberInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+            groupMemberInfoMapper.insertTGroupMemberInfo(memberInfo);
+        }
+    }
+
+    /**
+     * 修改人员分组信息
+     * 
+     * @param tPersonGroupInfo 人员分组信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateTPersonGroupInfo(TPersonGroupInfo tPersonGroupInfo) {
+        tPersonGroupInfo.setUpdateTime(DateUtils.getNowDate());
+        tPersonGroupInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        groupMemberInfoMapper.deleteTGroupMemberInfoByGroupId(tPersonGroupInfo.getGroupId());
+        addMemberInfo(tPersonGroupInfo);
+        return tPersonGroupInfoMapper.updateTPersonGroupInfo(tPersonGroupInfo);
+    }
+
+    /**
+     * 批量删除人员分组信息
+     * 
+     * @param groupIds 需要删除的人员分组信息ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteTPersonGroupInfoByIds(Long[] groupIds) {
+        for(Long groupId : groupIds){
+            groupMemberInfoMapper.deleteTGroupMemberInfoByGroupId(groupId);
+        }
+        return tPersonGroupInfoMapper.deleteTPersonGroupInfoByIds(groupIds);
+    }
+
+    /**
+     * 删除人员分组信息信息
+     * 
+     * @param groupId 人员分组信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPersonGroupInfoById(Long groupId)
+    {
+        return tPersonGroupInfoMapper.deleteTPersonGroupInfoById(groupId);
+    }
+}

huaxin-system/src/main/resources/mapper/system/TGroupMemberInfoMapper.xml

+<?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.zehong.system.mapper.TGroupMemberInfoMapper">
+    
+    <resultMap type="TGroupMemberInfo" id="TGroupMemberInfoResult">
+        <result property="memberId"    column="member_id"    />
+        <result property="groupId"    column="group_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTGroupMemberInfoVo">
+        SELECT
+            member.member_id,
+            member.group_id,
+            member.user_id,
+            member.create_by,
+            member.create_time,
+            member.update_by,
+            member.update_time,
+            member.is_del,
+            member.remarks,
+            su.nick_name as nickName
+        FROM
+            t_group_member_info member
+        LEFT JOIN sys_user su ON su.user_id = member.user_id
+    </sql>
+
+    <select id="selectTGroupMemberInfoList" parameterType="TGroupMemberInfo" resultMap="TGroupMemberInfoResult">
+        <include refid="selectTGroupMemberInfoVo"/>
+        <where>  
+            <if test="groupId != null "> and group_id = #{groupId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTGroupMemberInfoById" parameterType="Long" resultMap="TGroupMemberInfoResult">
+        <include refid="selectTGroupMemberInfoVo"/>
+        where member_id = #{memberId}
+    </select>
+        
+    <insert id="insertTGroupMemberInfo" parameterType="TGroupMemberInfo" useGeneratedKeys="true" keyProperty="memberId">
+        insert into t_group_member_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupId != null">group_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="groupId != null">#{groupId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTGroupMemberInfo" parameterType="TGroupMemberInfo">
+        update t_group_member_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupId != null">group_id = #{groupId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where member_id = #{memberId}
+    </update>
+
+    <delete id="deleteTGroupMemberInfoById" parameterType="Long">
+        delete from t_group_member_info where member_id = #{memberId}
+    </delete>
+
+    <delete id="deleteTGroupMemberInfoByIds" parameterType="String">
+        delete from t_group_member_info where member_id in 
+        <foreach item="memberId" collection="array" open="(" separator="," close=")">
+            #{memberId}
+        </foreach>
+    </delete>
+
+    <select id="selectMemberInfo" parameterType="Map" resultType="Map">
+        SELECT
+          su.user_id as userId,
+          su.nick_name as nickName,
+          su.phonenumber,
+          dept.dept_name as deptName
+        FROM
+            sys_user su
+        LEFT JOIN t_group_member_info member ON member.user_id = su.user_id
+        LEFT JOIN sys_dept dept ON dept.dept_id = su.dept_id
+        <where>
+            <if test="groupId != null">
+                (member.group_id is null or member.group_id = #{groupId})
+            </if>
+            <if test="groupId == null">
+                member.group_id is null
+            </if>
+            <if test="nickName != null and nickName != ''">
+                and su.nick_name = #{nickName}
+            </if>
+        </where>
+    </select>
+
+    <delete id="deleteTGroupMemberInfoByGroupId" parameterType="Long">
+        delete from t_group_member_info where group_id = #{groupId}
+    </delete>
+</mapper>
\ No newline at end of file

huaxin-system/src/main/resources/mapper/system/TPersonGroupInfoMapper.xml

+<?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.zehong.system.mapper.TPersonGroupInfoMapper">
+    
+    <resultMap type="TPersonGroupInfo" id="TPersonGroupInfoResult">
+        <result property="groupId"    column="group_id"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTPersonGroupInfoVo">
+        SELECT
+            info.group_id,
+            info.group_name,
+            info.create_by,
+            info.create_time,
+            info.update_by,
+            info.update_time,
+            info.is_del,
+            info.remarks,
+           (select GROUP_CONCAT(su.nick_name SEPARATOR '|') from t_group_member_info me,sys_user su where me.group_id = info.group_id and me.user_id = su.user_id)as memberName
+        FROM
+            t_person_group_info info
+    </sql>
+
+    <select id="selectTPersonGroupInfoList" parameterType="TPersonGroupInfo" resultMap="TPersonGroupInfoResult">
+        <include refid="selectTPersonGroupInfoVo"/>
+        <where>  
+            <if test="groupName != null  and groupName != ''"> and group_name like concat('%', #{groupName}, '%')</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPersonGroupInfoById" parameterType="Long" resultMap="TPersonGroupInfoResult">
+        <include refid="selectTPersonGroupInfoVo"/>
+        where group_id = #{groupId}
+    </select>
+        
+    <insert id="insertTPersonGroupInfo" parameterType="TPersonGroupInfo" useGeneratedKeys="true" keyProperty="groupId">
+        insert into t_person_group_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupName != null">group_name,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="groupName != null">#{groupName},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPersonGroupInfo" parameterType="TPersonGroupInfo">
+        update t_person_group_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupName != null">group_name = #{groupName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where group_id = #{groupId}
+    </update>
+
+    <delete id="deleteTPersonGroupInfoById" parameterType="Long">
+        delete from t_person_group_info where group_id = #{groupId}
+    </delete>
+
+    <delete id="deleteTPersonGroupInfoByIds" parameterType="String">
+        delete from t_person_group_info where group_id in 
+        <foreach item="groupId" collection="array" open="(" separator="," close=")">
+            #{groupId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

huaxin-web/src/api/checktask/groupInfo.js

+import request from '@/utils/request'
+
+// 查询组内成员信息列表
+export function listInfo(query) {
+  return request({
+    url: '/group/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询组内成员信息详细
+export function getInfo(memberId) {
+  return request({
+    url: '/group/info/' + memberId,
+    method: 'get'
+  })
+}
+
+// 新增组内成员信息
+export function addInfo(data) {
+  return request({
+    url: '/group/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改组内成员信息
+export function updateInfo(data) {
+  return request({
+    url: '/group/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除组内成员信息
+export function delInfo(memberId) {
+  return request({
+    url: '/group/info/' + memberId,
+    method: 'delete'
+  })
+}
+
+// 导出组内成员信息
+export function exportInfo(query) {
+  return request({
+    url: '/group/info/export',
+    method: 'get',
+    params: query
+  })
+}
+
+//获取人员信息
+export function selectMemberInfo(data) {
+  return request({
+    url: '/group/member/selectMemberInfo',
+    method: 'post',
+    data: data
+  })
+}