Merge remote-tracking branch 'origin/master'

huaxin-admin/src/main/java/com/zehong/web/controller/checktask/TTaskRelationInfoController.java

+package com.zehong.web.controller.checktask;
+
+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.TTaskRelationInfo;
+import com.zehong.system.service.ITTaskRelationInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 安检任务关联信息Controller
+ * 
+ * @author zehong
+ * @date 2025-12-08
+ */
+@RestController
+@RequestMapping("/checkTask/relation")
+public class TTaskRelationInfoController extends BaseController
+{
+    @Autowired
+    private ITTaskRelationInfoService tTaskRelationInfoService;
+
+    /**
+     * 查询安检任务关联信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('checkTask:relation:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTaskRelationInfo tTaskRelationInfo)
+    {
+        startPage();
+        List<TTaskRelationInfo> list = tTaskRelationInfoService.selectTTaskRelationInfoList(tTaskRelationInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出安检任务关联信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('checkTask:relation:export')")
+    @Log(title = "安检任务关联信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTaskRelationInfo tTaskRelationInfo)
+    {
+        List<TTaskRelationInfo> list = tTaskRelationInfoService.selectTTaskRelationInfoList(tTaskRelationInfo);
+        ExcelUtil<TTaskRelationInfo> util = new ExcelUtil<TTaskRelationInfo>(TTaskRelationInfo.class);
+        return util.exportExcel(list, "安检任务关联信息数据");
+    }
+
+    /**
+     * 获取安检任务关联信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('checkTask:relation:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTaskRelationInfoService.selectTTaskRelationInfoById(id));
+    }
+
+    /**
+     * 新增安检任务关联信息
+     */
+    @PreAuthorize("@ss.hasPermi('checkTask:relation:add')")
+    @Log(title = "安检任务关联信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTaskRelationInfo tTaskRelationInfo)
+    {
+        return toAjax(tTaskRelationInfoService.insertTTaskRelationInfo(tTaskRelationInfo));
+    }
+
+    /**
+     * 修改安检任务关联信息
+     */
+    @PreAuthorize("@ss.hasPermi('checkTask:relation:edit')")
+    @Log(title = "安检任务关联信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTaskRelationInfo tTaskRelationInfo)
+    {
+        return toAjax(tTaskRelationInfoService.updateTTaskRelationInfo(tTaskRelationInfo));
+    }
+
+    /**
+     * 删除安检任务关联信息
+     */
+    @PreAuthorize("@ss.hasPermi('checkTask:relation:remove')")
+    @Log(title = "安检任务关联信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTaskRelationInfoService.deleteTTaskRelationInfoByIds(ids));
+    }
+}

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

@@ -45,6 +45,12 @@ public class TPersonGroupInfoController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/personGroupInfoList")
+    public AjaxResult personGroupInfoList(TPersonGroupInfo tPersonGroupInfo) {
+        List<TPersonGroupInfo> list = tPersonGroupInfoService.selectTPersonGroupInfoList(tPersonGroupInfo);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出人员分组信息列表
      */

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 入户安检任务对象 t_task
@@ -76,6 +77,8 @@ public class TTask extends BaseEntity
     //当前登录人安检数  2024-05-28需求要求
     private Integer selfInspectNum;
 
+    private List<TTaskRelationInfo> relationInfoList;
+
 
     public Integer getIsjian() {
         return isjian;
@@ -225,6 +228,14 @@ public class TTask extends BaseEntity
         this.selfInspectNum = selfInspectNum;
     }
 
+    public List<TTaskRelationInfo> getRelationInfoList() {
+        return relationInfoList;
+    }
+
+    public void setRelationInfoList(List<TTaskRelationInfo> relationInfoList) {
+        this.relationInfoList = relationInfoList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

huaxin-system/src/main/java/com/zehong/system/domain/TTaskRelationInfo.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_task_relation_info
+ * 
+ * @author zehong
+ * @date 2025-12-08
+ */
+public class TTaskRelationInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 任务主键 */
+    @Excel(name = "任务主键")
+    private Long taskId;
+
+    /** 组主键 */
+    @Excel(name = "组主键")
+    private Long relationId;
+
+    /** 类型：1区域 2负责组 */
+    @Excel(name = "类型：1区域 2负责组")
+    private String type;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTaskId(Long taskId) 
+    {
+        this.taskId = taskId;
+    }
+
+    public Long getTaskId() 
+    {
+        return taskId;
+    }
+    public void setRelationId(Long relationId) 
+    {
+        this.relationId = relationId;
+    }
+
+    public Long getRelationId() 
+    {
+        return relationId;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("taskId", getTaskId())
+            .append("relationId", getRelationId())
+            .append("type", getType())
+            .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/TTaskRelationInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TTaskRelationInfo;
+
+/**
+ * 安检任务关联信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-12-08
+ */
+public interface TTaskRelationInfoMapper 
+{
+    /**
+     * 查询安检任务关联信息
+     * 
+     * @param id 安检任务关联信息ID
+     * @return 安检任务关联信息
+     */
+    public TTaskRelationInfo selectTTaskRelationInfoById(Long id);
+
+    /**
+     * 查询安检任务关联信息列表
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 安检任务关联信息集合
+     */
+    public List<TTaskRelationInfo> selectTTaskRelationInfoList(TTaskRelationInfo tTaskRelationInfo);
+
+    /**
+     * 新增安检任务关联信息
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 结果
+     */
+    public int insertTTaskRelationInfo(TTaskRelationInfo tTaskRelationInfo);
+
+    /**
+     * 修改安检任务关联信息
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 结果
+     */
+    public int updateTTaskRelationInfo(TTaskRelationInfo tTaskRelationInfo);
+
+    /**
+     * 删除安检任务关联信息
+     * 
+     * @param id 安检任务关联信息ID
+     * @return 结果
+     */
+    public int deleteTTaskRelationInfoById(Long id);
+
+    /**
+     * 根据任务删除关联关系
+     * @param taskId 任务主键
+     * @return
+     */
+    int deleteTTaskRelationInfoByTaskId(Long taskId);
+
+    /**
+     * 批量删除安检任务关联信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTaskRelationInfoByIds(Long[] ids);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TTaskRelationInfo;
+
+/**
+ * 安检任务关联信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-12-08
+ */
+public interface ITTaskRelationInfoService 
+{
+    /**
+     * 查询安检任务关联信息
+     * 
+     * @param id 安检任务关联信息ID
+     * @return 安检任务关联信息
+     */
+    public TTaskRelationInfo selectTTaskRelationInfoById(Long id);
+
+    /**
+     * 查询安检任务关联信息列表
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 安检任务关联信息集合
+     */
+    public List<TTaskRelationInfo> selectTTaskRelationInfoList(TTaskRelationInfo tTaskRelationInfo);
+
+    /**
+     * 新增安检任务关联信息
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 结果
+     */
+    public int insertTTaskRelationInfo(TTaskRelationInfo tTaskRelationInfo);
+
+    /**
+     * 修改安检任务关联信息
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 结果
+     */
+    public int updateTTaskRelationInfo(TTaskRelationInfo tTaskRelationInfo);
+
+    /**
+     * 批量删除安检任务关联信息
+     * 
+     * @param ids 需要删除的安检任务关联信息ID
+     * @return 结果
+     */
+    public int deleteTTaskRelationInfoByIds(Long[] ids);
+
+    /**
+     * 删除安检任务关联信息信息
+     * 
+     * @param id 安检任务关联信息ID
+     * @return 结果
+     */
+    public int deleteTTaskRelationInfoById(Long id);
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TTaskRelationInfoMapper;
+import com.zehong.system.domain.TTaskRelationInfo;
+import com.zehong.system.service.ITTaskRelationInfoService;
+
+/**
+ * 安检任务关联信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-12-08
+ */
+@Service
+public class TTaskRelationInfoServiceImpl implements ITTaskRelationInfoService 
+{
+    @Autowired
+    private TTaskRelationInfoMapper tTaskRelationInfoMapper;
+
+    /**
+     * 查询安检任务关联信息
+     * 
+     * @param id 安检任务关联信息ID
+     * @return 安检任务关联信息
+     */
+    @Override
+    public TTaskRelationInfo selectTTaskRelationInfoById(Long id)
+    {
+        return tTaskRelationInfoMapper.selectTTaskRelationInfoById(id);
+    }
+
+    /**
+     * 查询安检任务关联信息列表
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 安检任务关联信息
+     */
+    @Override
+    public List<TTaskRelationInfo> selectTTaskRelationInfoList(TTaskRelationInfo tTaskRelationInfo)
+    {
+        return tTaskRelationInfoMapper.selectTTaskRelationInfoList(tTaskRelationInfo);
+    }
+
+    /**
+     * 新增安检任务关联信息
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 结果
+     */
+    @Override
+    public int insertTTaskRelationInfo(TTaskRelationInfo tTaskRelationInfo)
+    {
+        tTaskRelationInfo.setCreateTime(DateUtils.getNowDate());
+        return tTaskRelationInfoMapper.insertTTaskRelationInfo(tTaskRelationInfo);
+    }
+
+    /**
+     * 修改安检任务关联信息
+     * 
+     * @param tTaskRelationInfo 安检任务关联信息
+     * @return 结果
+     */
+    @Override
+    public int updateTTaskRelationInfo(TTaskRelationInfo tTaskRelationInfo)
+    {
+        tTaskRelationInfo.setUpdateTime(DateUtils.getNowDate());
+        return tTaskRelationInfoMapper.updateTTaskRelationInfo(tTaskRelationInfo);
+    }
+
+    /**
+     * 批量删除安检任务关联信息
+     * 
+     * @param ids 需要删除的安检任务关联信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTaskRelationInfoByIds(Long[] ids)
+    {
+        return tTaskRelationInfoMapper.deleteTTaskRelationInfoByIds(ids);
+    }
+
+    /**
+     * 删除安检任务关联信息信息
+     * 
+     * @param id 安检任务关联信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTaskRelationInfoById(Long id)
+    {
+        return tTaskRelationInfoMapper.deleteTTaskRelationInfoById(id);
+    }
+}

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

 package com.zehong.system.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.zehong.common.core.domain.entity.SysRole;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.TTaskMapper;
 import com.zehong.system.domain.TTask;
+import com.zehong.system.domain.TTaskRelationInfo;
+import com.zehong.system.mapper.TTaskMapper;
+import com.zehong.system.mapper.TTaskRelationInfoMapper;
 import com.zehong.system.service.ITTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 入户安检任务Service业务层处理
  * 
@@ -27,6 +32,9 @@ public class TTaskServiceImpl implements ITTaskService
     @Autowired
     private TTaskMapper tTaskMapper;
 
+    @Resource
+    private TTaskRelationInfoMapper tTaskRelationInfoMapper;
+
     /**
      * 查询入户安检任务
      * 
@@ -34,9 +42,12 @@ public class TTaskServiceImpl implements ITTaskService
      * @return 入户安检任务
      */
     @Override
-    public TTask selectTTaskById(Long id)
-    {
-        return tTaskMapper.selectTTaskById(id);
+    public TTask selectTTaskById(Long id) {
+        TTask task = tTaskMapper.selectTTaskById(id);
+        TTaskRelationInfo relationInfo = new TTaskRelationInfo();
+        relationInfo.setTaskId(id);
+        task.setRelationInfoList(tTaskRelationInfoMapper.selectTTaskRelationInfoList(relationInfo));
+        return task;
     }
 
     /**
@@ -58,10 +69,25 @@ public class TTaskServiceImpl implements ITTaskService
      * @return 结果
      */
     @Override
-    public int insertTTask(TTask tTask)
-    {
+    @Transactional(rollbackFor = Exception.class)
+    public int insertTTask(TTask tTask) {
         tTask.setCreateTime(DateUtils.getNowDate());
-        return tTaskMapper.insertTTask(tTask);
+        int result = tTaskMapper.insertTTask(tTask);
+        addTaskRelationInfo(tTask);
+        return result;
+    }
+
+    /**
+     * 新增关联关系
+     * @param tTask 任务信息
+     */
+    private void addTaskRelationInfo(TTask tTask){
+        for (TTaskRelationInfo relationInfo : tTask.getRelationInfoList()){
+            relationInfo.setTaskId(tTask.getId());
+            relationInfo.setCreateTime(new Date());
+            relationInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+            tTaskRelationInfoMapper.insertTTaskRelationInfo(relationInfo);
+        }
     }
 
     /**
@@ -71,8 +97,10 @@ public class TTaskServiceImpl implements ITTaskService
      * @return 结果
      */
     @Override
-    public int updateTTask(TTask tTask)
-    {
+    @Transactional(rollbackFor = Exception.class)
+    public int updateTTask(TTask tTask) {
+        tTaskRelationInfoMapper.deleteTTaskRelationInfoByTaskId(tTask.getId());
+        addTaskRelationInfo(tTask);
         return tTaskMapper.updateTTask(tTask);
     }
 
@@ -83,8 +111,11 @@ public class TTaskServiceImpl implements ITTaskService
      * @return 结果
      */
     @Override
-    public int deleteTTaskByIds(Long[] ids)
-    {
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteTTaskByIds(Long[] ids) {
+        for(Long id : ids){
+            tTaskRelationInfoMapper.deleteTTaskRelationInfoByTaskId(id);
+        }
         return tTaskMapper.deleteTTaskByIds(ids);
     }
 

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

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertTTask" parameterType="TTask">
+    <insert id="insertTTask" parameterType="TTask" useGeneratedKeys="true" keyProperty="id">
         insert into t_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

huaxin-system/src/main/resources/mapper/system/TTaskRelationInfoMapper.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.TTaskRelationInfoMapper">
+    
+    <resultMap type="TTaskRelationInfo" id="TTaskRelationInfoResult">
+        <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
+        <result property="relationId"    column="relation_id"    />
+        <result property="type"    column="type"    />
+        <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="selectTTaskRelationInfoVo">
+        select id, task_id, relation_id, type, create_by, create_time, update_by, update_time, is_del, remarks from t_task_relation_info
+    </sql>
+
+    <select id="selectTTaskRelationInfoList" parameterType="TTaskRelationInfo" resultMap="TTaskRelationInfoResult">
+        <include refid="selectTTaskRelationInfoVo"/>
+        <where>  
+            <if test="taskId != null "> and task_id = #{taskId}</if>
+            <if test="relationId != null "> and relation_id = #{relationId}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</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="selectTTaskRelationInfoById" parameterType="Long" resultMap="TTaskRelationInfoResult">
+        <include refid="selectTTaskRelationInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTTaskRelationInfo" parameterType="TTaskRelationInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into t_task_relation_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
+            <if test="relationId != null">relation_id,</if>
+            <if test="type != null">type,</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="taskId != null">#{taskId},</if>
+            <if test="relationId != null">#{relationId},</if>
+            <if test="type != null">#{type},</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="updateTTaskRelationInfo" parameterType="TTaskRelationInfo">
+        update t_task_relation_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
+            <if test="relationId != null">relation_id = #{relationId},</if>
+            <if test="type != null">type = #{type},</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 id = #{id}
+    </update>
+
+    <delete id="deleteTTaskRelationInfoById" parameterType="Long">
+        delete from t_task_relation_info where id = #{id}
+    </delete>
+
+    <delete id="deleteTTaskRelationInfoByTaskId" parameterType="Long">
+        delete from t_task_relation_info where task_id = #{taskId}
+    </delete>
+
+    <delete id="deleteTTaskRelationInfoByIds" parameterType="String">
+        delete from t_task_relation_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

@@ -60,3 +60,12 @@ export function selectMemberInfo(data) {
     data: data
   })
 }
+
+// 查询组信息列表
+export function personGroupInfoList(query) {
+  return request({
+    url: '/group/info/personGroupInfoList',
+    method: 'get',
+    params: query
+  })
+}