培训管理

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TEmployedPeopleInfoController.java

@@ -46,6 +46,14 @@ public class TEmployedPeopleInfoController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/employedPeoplesList")
+    public TableDataInfo employedPeoplesList(TEmployedPeopleInfo tEmployedPeopleInfo)
+    {
+        startPage();
+        List<TEmployedPeopleInfo> list = tEmployedPeopleInfoService.selectTEmployedPeopleInfoList(tEmployedPeopleInfo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出从业人员信息列表
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/trainmanage/TTrainManageController.java

+package com.zehong.web.controller.trainmanage;
+
+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.TTrainManage;
+import com.zehong.system.service.ITTrainManageService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 培训管理Controller
+ * 
+ * @author zehong
+ * @date 2023-04-21
+ */
+@RestController
+@RequestMapping("/train/manage")
+public class TTrainManageController extends BaseController
+{
+    @Autowired
+    private ITTrainManageService tTrainManageService;
+
+    /**
+     * 查询培训管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:manage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTrainManage tTrainManage)
+    {
+        startPage();
+        List<TTrainManage> list = tTrainManageService.selectTTrainManageList(tTrainManage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出培训管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:manage:export')")
+    @Log(title = "培训管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTrainManage tTrainManage)
+    {
+        List<TTrainManage> list = tTrainManageService.selectTTrainManageList(tTrainManage);
+        ExcelUtil<TTrainManage> util = new ExcelUtil<TTrainManage>(TTrainManage.class);
+        return util.exportExcel(list, "培训管理数据");
+    }
+
+    /**
+     * 获取培训管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:manage:query')")
+    @GetMapping(value = "/{trainManageId}")
+    public AjaxResult getInfo(@PathVariable("trainManageId") Long trainManageId)
+    {
+        return AjaxResult.success(tTrainManageService.selectTTrainManageById(trainManageId));
+    }
+
+    /**
+     * 新增培训管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:manage:add')")
+    @Log(title = "培训管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTrainManage tTrainManage)
+    {
+        return toAjax(tTrainManageService.insertTTrainManage(tTrainManage));
+    }
+
+    /**
+     * 修改培训管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:manage:edit')")
+    @Log(title = "培训管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTrainManage tTrainManage)
+    {
+        return toAjax(tTrainManageService.updateTTrainManage(tTrainManage));
+    }
+
+    /**
+     * 删除培训管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:manage:remove')")
+    @Log(title = "培训管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{trainManageIds}")
+    public AjaxResult remove(@PathVariable Long[] trainManageIds)
+    {
+        return toAjax(tTrainManageService.deleteTTrainManageByIds(trainManageIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/trainmanage/TTrainPersonController.java

+package com.zehong.web.controller.trainmanage;
+
+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.TTrainPerson;
+import com.zehong.system.service.ITTrainPersonService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 燃气培训人员Controller
+ * 
+ * @author zehong
+ * @date 2023-04-22
+ */
+@RestController
+@RequestMapping("/train/person")
+public class TTrainPersonController extends BaseController
+{
+    @Autowired
+    private ITTrainPersonService tTrainPersonService;
+
+    /**
+     * 查询燃气培训人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:person:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTrainPerson tTrainPerson)
+    {
+        startPage();
+        List<TTrainPerson> list = tTrainPersonService.selectTTrainPersonList(tTrainPerson);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出燃气培训人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:person:export')")
+    @Log(title = "燃气培训人员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTrainPerson tTrainPerson)
+    {
+        List<TTrainPerson> list = tTrainPersonService.selectTTrainPersonList(tTrainPerson);
+        ExcelUtil<TTrainPerson> util = new ExcelUtil<TTrainPerson>(TTrainPerson.class);
+        return util.exportExcel(list, "燃气培训人员数据");
+    }
+
+    /**
+     * 获取燃气培训人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:person:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tTrainPersonService.selectTTrainPersonById(id));
+    }
+
+    /**
+     * 新增燃气培训人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:person:add')")
+    @Log(title = "燃气培训人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTrainPerson tTrainPerson)
+    {
+        return toAjax(tTrainPersonService.insertTTrainPerson(tTrainPerson));
+    }
+
+    /**
+     * 修改燃气培训人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:person:edit')")
+    @Log(title = "燃气培训人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTrainPerson tTrainPerson)
+    {
+        return toAjax(tTrainPersonService.updateTTrainPerson(tTrainPerson));
+    }
+
+    /**
+     * 删除燃气培训人员
+     */
+    @PreAuthorize("@ss.hasPermi('system:person:remove')")
+    @Log(title = "燃气培训人员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tTrainPersonService.deleteTTrainPersonByIds(ids));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTrainManage.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_train_manage
+ * 
+ * @author zehong
+ * @date 2023-04-21
+ */
+public class TTrainManage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 培训管理主键 */
+    private Long trainManageId;
+
+    /** 课程名称 */
+    @Excel(name = "课程名称")
+    private String lessonName;
+
+    /** 培训时长/秒 */
+    @Excel(name = "培训时长/秒")
+    private Integer trainDuration;
+
+    /** 培训开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "培训开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date trainStartTime;
+
+    /** 培训结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "培训结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date trainEndTime;
+
+    /** 课程内容 */
+    @Excel(name = "课程内容")
+    private String lessonContent;
+
+    /** 视频地址 */
+    @Excel(name = "视频地址")
+    private String videoUrl;
+
+    /** 附件地址 */
+    @Excel(name = "附件地址")
+    private String annexUrl;
+
+    /** 培训状态：0 待发布, 1 已发布 */
+    @Excel(name = "培训状态：0 待发布, 1 已发布")
+    private String trainStatus;
+
+    /** 发布时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date publishTime;
+
+    /** 删除标志（0正常，1删除） */
+    @Excel(name = "删除标志", readConverterExp = "0=正常，1删除")
+    private String isDel;
+
+    /**培训人员*/
+    private List<TTrainPerson> tTrainPersonList;
+
+    public void setTrainManageId(Long trainManageId) 
+    {
+        this.trainManageId = trainManageId;
+    }
+
+    public Long getTrainManageId() 
+    {
+        return trainManageId;
+    }
+    public void setLessonName(String lessonName) 
+    {
+        this.lessonName = lessonName;
+    }
+
+    public String getLessonName() 
+    {
+        return lessonName;
+    }
+    public void setTrainDuration(Integer trainDuration) 
+    {
+        this.trainDuration = trainDuration;
+    }
+
+    public Integer getTrainDuration() 
+    {
+        return trainDuration;
+    }
+    public void setTrainStartTime(Date trainStartTime) 
+    {
+        this.trainStartTime = trainStartTime;
+    }
+
+    public Date getTrainStartTime() 
+    {
+        return trainStartTime;
+    }
+    public void setTrainEndTime(Date trainEndTime) 
+    {
+        this.trainEndTime = trainEndTime;
+    }
+
+    public Date getTrainEndTime() 
+    {
+        return trainEndTime;
+    }
+    public void setLessonContent(String lessonContent) 
+    {
+        this.lessonContent = lessonContent;
+    }
+
+    public String getLessonContent() 
+    {
+        return lessonContent;
+    }
+    public void setVideoUrl(String videoUrl) 
+    {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVideoUrl() 
+    {
+        return videoUrl;
+    }
+    public void setAnnexUrl(String annexUrl) 
+    {
+        this.annexUrl = annexUrl;
+    }
+
+    public String getAnnexUrl() 
+    {
+        return annexUrl;
+    }
+    public void setTrainStatus(String trainStatus) 
+    {
+        this.trainStatus = trainStatus;
+    }
+
+    public String getTrainStatus() 
+    {
+        return trainStatus;
+    }
+    public void setPublishTime(Date publishTime)
+    {
+        this.publishTime = publishTime;
+    }
+
+    public Date getPublishTime()
+    {
+        return publishTime;
+    }
+    public void setIsDel(String isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public List<TTrainPerson> gettTrainPersonList() {
+        return tTrainPersonList;
+    }
+
+    public void settTrainPersonList(List<TTrainPerson> tTrainPersonList) {
+        this.tTrainPersonList = tTrainPersonList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("trainManageId", getTrainManageId())
+            .append("lessonName", getLessonName())
+            .append("trainDuration", getTrainDuration())
+            .append("trainStartTime", getTrainStartTime())
+            .append("trainEndTime", getTrainEndTime())
+            .append("lessonContent", getLessonContent())
+            .append("videoUrl", getVideoUrl())
+            .append("annexUrl", getAnnexUrl())
+            .append("trainStatus", getTrainStatus())
+            .append("publishTime", getPublishTime())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTrainPerson.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_train_person
+ * 
+ * @author zehong
+ * @date 2023-04-22
+ */
+public class TTrainPerson extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 培训人员主键 */
+    private Long id;
+
+    /** 培训管理外键 */
+    @Excel(name = "培训管理外键")
+    private Long trainManageId;
+
+    /** 培训人员id */
+    @Excel(name = "培训人员id")
+    private Long trainPersonId;
+
+    /** 实际培训时长/秒 */
+    @Excel(name = "实际培训时长/秒")
+    private Integer realityTrainDuration;
+
+    /** 是否完成培训：0未完成 1完成 */
+    @Excel(name = "是否完成培训：0未完成 1完成")
+    private String isFinish;
+
+    /** 删除标志（0正常，1删除） */
+    @Excel(name = "删除标志", readConverterExp = "0=正常，1删除")
+    private String isDel;
+
+    private String trainPersonName;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTrainManageId(Long trainManageId) 
+    {
+        this.trainManageId = trainManageId;
+    }
+
+    public Long getTrainManageId() 
+    {
+        return trainManageId;
+    }
+    public void setTrainPersonId(Long trainPersonId) 
+    {
+        this.trainPersonId = trainPersonId;
+    }
+
+    public Long getTrainPersonId() 
+    {
+        return trainPersonId;
+    }
+    public void setRealityTrainDuration(Integer realityTrainDuration) 
+    {
+        this.realityTrainDuration = realityTrainDuration;
+    }
+
+    public Integer getRealityTrainDuration() 
+    {
+        return realityTrainDuration;
+    }
+    public void setIsFinish(String isFinish) 
+    {
+        this.isFinish = isFinish;
+    }
+
+    public String getIsFinish() 
+    {
+        return isFinish;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getTrainPersonName() {
+        return trainPersonName;
+    }
+
+    public void setTrainPersonName(String trainPersonName) {
+        this.trainPersonName = trainPersonName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("trainManageId", getTrainManageId())
+            .append("trainPersonId", getTrainPersonId())
+            .append("realityTrainDuration", getRealityTrainDuration())
+            .append("isFinish", getIsFinish())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TTrainManageMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TTrainManage;
+
+/**
+ * 培训管理Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-04-21
+ */
+public interface TTrainManageMapper 
+{
+    /**
+     * 查询培训管理
+     * 
+     * @param trainManageId 培训管理ID
+     * @return 培训管理
+     */
+    public TTrainManage selectTTrainManageById(Long trainManageId);
+
+    /**
+     * 查询培训管理列表
+     * 
+     * @param tTrainManage 培训管理
+     * @return 培训管理集合
+     */
+    public List<TTrainManage> selectTTrainManageList(TTrainManage tTrainManage);
+
+    /**
+     * 新增培训管理
+     * 
+     * @param tTrainManage 培训管理
+     * @return 结果
+     */
+    public int insertTTrainManage(TTrainManage tTrainManage);
+
+    /**
+     * 修改培训管理
+     * 
+     * @param tTrainManage 培训管理
+     * @return 结果
+     */
+    public int updateTTrainManage(TTrainManage tTrainManage);
+
+    /**
+     * 删除培训管理
+     * 
+     * @param trainManageId 培训管理ID
+     * @return 结果
+     */
+    public int deleteTTrainManageById(Long trainManageId);
+
+    /**
+     * 批量删除培训管理
+     * 
+     * @param trainManageIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTrainManageByIds(Long[] trainManageIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TTrainPersonMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TTrainPerson;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 燃气培训人员Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-04-22
+ */
+public interface TTrainPersonMapper 
+{
+    /**
+     * 查询燃气培训人员
+     * 
+     * @param id 燃气培训人员ID
+     * @return 燃气培训人员
+     */
+    public TTrainPerson selectTTrainPersonById(Long id);
+
+    /**
+     * 查询燃气培训人员列表
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 燃气培训人员集合
+     */
+    public List<TTrainPerson> selectTTrainPersonList(TTrainPerson tTrainPerson);
+
+    /**
+     * 新增燃气培训人员
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 结果
+     */
+    public int insertTTrainPerson(TTrainPerson tTrainPerson);
+
+    /**
+     * 修改燃气培训人员
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 结果
+     */
+    public int updateTTrainPerson(TTrainPerson tTrainPerson);
+
+    /**
+     * 删除燃气培训人员
+     * 
+     * @param id 燃气培训人员ID
+     * @return 结果
+     */
+    public int deleteTTrainPersonById(Long id);
+
+    /**
+     * 批量删除燃气培训人员
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTrainPersonByIds(Long[] ids);
+
+    /**
+     * 批量插入培训人员
+     * @param trainManageId
+     * @param tTrainPeople
+     */
+    void batchInsertTTrainPerson(@Param("trainManageId") Long trainManageId, @Param("tTrainPeople")List<TTrainPerson> tTrainPeople);
+
+    /**
+     * 根据trainManageId删除培训人员
+     * @param trainManageId
+     * @return
+     */
+    int deleteTTrainPersonByTrainManageId(Long trainManageId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITTrainManageService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TTrainManage;
+
+/**
+ * 培训管理Service接口
+ * 
+ * @author zehong
+ * @date 2023-04-21
+ */
+public interface ITTrainManageService 
+{
+    /**
+     * 查询培训管理
+     * 
+     * @param trainManageId 培训管理ID
+     * @return 培训管理
+     */
+    public TTrainManage selectTTrainManageById(Long trainManageId);
+
+    /**
+     * 查询培训管理列表
+     * 
+     * @param tTrainManage 培训管理
+     * @return 培训管理集合
+     */
+    public List<TTrainManage> selectTTrainManageList(TTrainManage tTrainManage);
+
+    /**
+     * 新增培训管理
+     * 
+     * @param tTrainManage 培训管理
+     * @return 结果
+     */
+    public int insertTTrainManage(TTrainManage tTrainManage);
+
+    /**
+     * 修改培训管理
+     * 
+     * @param tTrainManage 培训管理
+     * @return 结果
+     */
+    public int updateTTrainManage(TTrainManage tTrainManage);
+
+    /**
+     * 批量删除培训管理
+     * 
+     * @param trainManageIds 需要删除的培训管理ID
+     * @return 结果
+     */
+    public int deleteTTrainManageByIds(Long[] trainManageIds);
+
+    /**
+     * 删除培训管理信息
+     * 
+     * @param trainManageId 培训管理ID
+     * @return 结果
+     */
+    public int deleteTTrainManageById(Long trainManageId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITTrainPersonService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TTrainPerson;
+
+/**
+ * 燃气培训人员Service接口
+ * 
+ * @author zehong
+ * @date 2023-04-22
+ */
+public interface ITTrainPersonService 
+{
+    /**
+     * 查询燃气培训人员
+     * 
+     * @param id 燃气培训人员ID
+     * @return 燃气培训人员
+     */
+    public TTrainPerson selectTTrainPersonById(Long id);
+
+    /**
+     * 查询燃气培训人员列表
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 燃气培训人员集合
+     */
+    public List<TTrainPerson> selectTTrainPersonList(TTrainPerson tTrainPerson);
+
+    /**
+     * 新增燃气培训人员
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 结果
+     */
+    public int insertTTrainPerson(TTrainPerson tTrainPerson);
+
+    /**
+     * 修改燃气培训人员
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 结果
+     */
+    public int updateTTrainPerson(TTrainPerson tTrainPerson);
+
+    /**
+     * 批量删除燃气培训人员
+     * 
+     * @param ids 需要删除的燃气培训人员ID
+     * @return 结果
+     */
+    public int deleteTTrainPersonByIds(Long[] ids);
+
+    /**
+     * 删除燃气培训人员信息
+     * 
+     * @param id 燃气培训人员ID
+     * @return 结果
+     */
+    public int deleteTTrainPersonById(Long id);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTrainManageServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TTrainPerson;
+import com.zehong.system.mapper.TTrainPersonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TTrainManageMapper;
+import com.zehong.system.domain.TTrainManage;
+import com.zehong.system.service.ITTrainManageService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 培训管理Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-04-21
+ */
+@Service
+public class TTrainManageServiceImpl implements ITTrainManageService 
+{
+    @Autowired
+    private TTrainManageMapper tTrainManageMapper;
+
+    @Autowired
+    private TTrainPersonMapper tTrainPersonMapper;
+
+    /**
+     * 查询培训管理
+     * 
+     * @param trainManageId 培训管理ID
+     * @return 培训管理
+     */
+    @Override
+    public TTrainManage selectTTrainManageById(Long trainManageId)
+    {
+        TTrainManage tTrainManage = tTrainManageMapper.selectTTrainManageById(trainManageId);
+        TTrainPerson tTrainPerson = new TTrainPerson();
+        tTrainPerson.setTrainManageId(tTrainManage.getTrainManageId());
+        List<TTrainPerson> personList = tTrainPersonMapper.selectTTrainPersonList(tTrainPerson);
+        if(null != personList && personList.size() >0){
+            tTrainManage.settTrainPersonList(personList);
+        }
+        return tTrainManage;
+    }
+
+    /**
+     * 查询培训管理列表
+     * 
+     * @param tTrainManage 培训管理
+     * @return 培训管理
+     */
+    @Override
+    public List<TTrainManage> selectTTrainManageList(TTrainManage tTrainManage)
+    {
+        List<TTrainManage> manageList = tTrainManageMapper.selectTTrainManageList(tTrainManage);
+        for(TTrainManage manage : manageList){
+            TTrainPerson tTrainPerson = new TTrainPerson();
+            tTrainPerson.setTrainManageId(manage.getTrainManageId());
+            List<TTrainPerson> personList = tTrainPersonMapper.selectTTrainPersonList(tTrainPerson);
+            if(null != personList && personList.size() >0){
+                manage.settTrainPersonList(personList);
+            }
+        }
+        return manageList;
+    }
+
+    /**
+     * 新增培训管理
+     * 
+     * @param tTrainManage 培训管理
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertTTrainManage(TTrainManage tTrainManage)
+    {
+        tTrainManage.setCreateTime(DateUtils.getNowDate());
+        int result = tTrainManageMapper.insertTTrainManage(tTrainManage);
+        if(1==result && null != tTrainManage.gettTrainPersonList() && tTrainManage.gettTrainPersonList().size() >0){
+            tTrainPersonMapper.batchInsertTTrainPerson(tTrainManage.getTrainManageId(),tTrainManage.gettTrainPersonList());
+        }
+        return result;
+    }
+
+    /**
+     * 修改培训管理
+     * 
+     * @param tTrainManage 培训管理
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateTTrainManage(TTrainManage tTrainManage)
+    {
+        tTrainManage.setUpdateTime(DateUtils.getNowDate());
+        if(null != tTrainManage.gettTrainPersonList() && tTrainManage.gettTrainPersonList().size()>0){
+            tTrainPersonMapper.deleteTTrainPersonByTrainManageId(tTrainManage.getTrainManageId());
+            tTrainPersonMapper.batchInsertTTrainPerson(tTrainManage.getTrainManageId(),tTrainManage.gettTrainPersonList());
+        }
+        return tTrainManageMapper.updateTTrainManage(tTrainManage);
+    }
+
+    /**
+     * 批量删除培训管理
+     * 
+     * @param trainManageIds 需要删除的培训管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrainManageByIds(Long[] trainManageIds)
+    {
+        return tTrainManageMapper.deleteTTrainManageByIds(trainManageIds);
+    }
+
+    /**
+     * 删除培训管理信息
+     * 
+     * @param trainManageId 培训管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrainManageById(Long trainManageId)
+    {
+        return tTrainManageMapper.deleteTTrainManageById(trainManageId);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTrainPersonServiceImpl.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.TTrainPersonMapper;
+import com.zehong.system.domain.TTrainPerson;
+import com.zehong.system.service.ITTrainPersonService;
+
+/**
+ * 燃气培训人员Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-04-22
+ */
+@Service
+public class TTrainPersonServiceImpl implements ITTrainPersonService 
+{
+    @Autowired
+    private TTrainPersonMapper tTrainPersonMapper;
+
+    /**
+     * 查询燃气培训人员
+     * 
+     * @param id 燃气培训人员ID
+     * @return 燃气培训人员
+     */
+    @Override
+    public TTrainPerson selectTTrainPersonById(Long id)
+    {
+        return tTrainPersonMapper.selectTTrainPersonById(id);
+    }
+
+    /**
+     * 查询燃气培训人员列表
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 燃气培训人员
+     */
+    @Override
+    public List<TTrainPerson> selectTTrainPersonList(TTrainPerson tTrainPerson)
+    {
+        return tTrainPersonMapper.selectTTrainPersonList(tTrainPerson);
+    }
+
+    /**
+     * 新增燃气培训人员
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 结果
+     */
+    @Override
+    public int insertTTrainPerson(TTrainPerson tTrainPerson)
+    {
+        tTrainPerson.setCreateTime(DateUtils.getNowDate());
+        return tTrainPersonMapper.insertTTrainPerson(tTrainPerson);
+    }
+
+    /**
+     * 修改燃气培训人员
+     * 
+     * @param tTrainPerson 燃气培训人员
+     * @return 结果
+     */
+    @Override
+    public int updateTTrainPerson(TTrainPerson tTrainPerson)
+    {
+        tTrainPerson.setUpdateTime(DateUtils.getNowDate());
+        return tTrainPersonMapper.updateTTrainPerson(tTrainPerson);
+    }
+
+    /**
+     * 批量删除燃气培训人员
+     * 
+     * @param ids 需要删除的燃气培训人员ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrainPersonByIds(Long[] ids)
+    {
+        return tTrainPersonMapper.deleteTTrainPersonByIds(ids);
+    }
+
+    /**
+     * 删除燃气培训人员信息
+     * 
+     * @param id 燃气培训人员ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrainPersonById(Long id)
+    {
+        return tTrainPersonMapper.deleteTTrainPersonById(id);
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/TEmployedPeopleInfoMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
-        group by employed_people_id desc
+        ORDER by employed_people_id desc
     </select>
 
     <select id="selectTEmployedPeopleInfoById" parameterType="Long" resultMap="TEmployedPeopleInfoResult">

gassafetyprogress-system/src/main/resources/mapper/system/TTrainManageMapper.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.TTrainManageMapper">
+    
+    <resultMap type="TTrainManage" id="TTrainManageResult">
+        <result property="trainManageId"    column="train_manage_id"    />
+        <result property="lessonName"    column="lesson_name"    />
+        <result property="trainDuration"    column="train_duration"    />
+        <result property="trainStartTime"    column="train_start_time"    />
+        <result property="trainEndTime"    column="train_end_time"    />
+        <result property="lessonContent"    column="lesson_content"    />
+        <result property="videoUrl"    column="video_url"    />
+        <result property="annexUrl"    column="annex_url"    />
+        <result property="trainStatus"    column="train_status"    />
+        <result property="publishTime"    column="publish_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+    </resultMap>
+
+    <sql id="selectTTrainManageVo">
+        select train_manage_id, lesson_name, train_duration, train_start_time, train_end_time, lesson_content, video_url, annex_url, train_status, publish_time, create_time, update_time, remark, is_del from t_train_manage
+    </sql>
+
+    <select id="selectTTrainManageList" parameterType="TTrainManage" resultMap="TTrainManageResult">
+        <include refid="selectTTrainManageVo"/>
+        <where>  
+            <if test="lessonName != null  and lessonName != ''"> and lesson_name like concat('%', #{lessonName}, '%')</if>
+            <if test="trainDuration != null "> and train_duration = #{trainDuration}</if>
+            <if test="trainStartTime != null "> and train_start_time = #{trainStartTime}</if>
+            <if test="trainEndTime != null "> and train_end_time = #{trainEndTime}</if>
+            <if test="lessonContent != null  and lessonContent != ''"> and lesson_content = #{lessonContent}</if>
+            <if test="videoUrl != null  and videoUrl != ''"> and video_url = #{videoUrl}</if>
+            <if test="annexUrl != null  and annexUrl != ''"> and annex_url = #{annexUrl}</if>
+            <if test="trainStatus != null  and trainStatus != ''"> and train_status = #{trainStatus}</if>
+            <if test="publishTime != null "> and publish_time = #{publishTime}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTTrainManageById" parameterType="Long" resultMap="TTrainManageResult">
+        <include refid="selectTTrainManageVo"/>
+        where train_manage_id = #{trainManageId}
+    </select>
+        
+    <insert id="insertTTrainManage" parameterType="TTrainManage" useGeneratedKeys="true" keyProperty="trainManageId">
+        insert into t_train_manage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="lessonName != null">lesson_name,</if>
+            <if test="trainDuration != null">train_duration,</if>
+            <if test="trainStartTime != null">train_start_time,</if>
+            <if test="trainEndTime != null">train_end_time,</if>
+            <if test="lessonContent != null">lesson_content,</if>
+            <if test="videoUrl != null">video_url,</if>
+            <if test="annexUrl != null">annex_url,</if>
+            <if test="trainStatus != null">train_status,</if>
+            <if test="publishTime != null">publish_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="lessonName != null">#{lessonName},</if>
+            <if test="trainDuration != null">#{trainDuration},</if>
+            <if test="trainStartTime != null">#{trainStartTime},</if>
+            <if test="trainEndTime != null">#{trainEndTime},</if>
+            <if test="lessonContent != null">#{lessonContent},</if>
+            <if test="videoUrl != null">#{videoUrl},</if>
+            <if test="annexUrl != null">#{annexUrl},</if>
+            <if test="trainStatus != null">#{trainStatus},</if>
+            <if test="publishTime != null">#{publishTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTrainManage" parameterType="TTrainManage">
+        update t_train_manage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="lessonName != null">lesson_name = #{lessonName},</if>
+            <if test="trainDuration != null">train_duration = #{trainDuration},</if>
+            <if test="trainStartTime != null">train_start_time = #{trainStartTime},</if>
+            <if test="trainEndTime != null">train_end_time = #{trainEndTime},</if>
+            <if test="lessonContent != null">lesson_content = #{lessonContent},</if>
+            <if test="videoUrl != null">video_url = #{videoUrl},</if>
+            <if test="annexUrl != null">annex_url = #{annexUrl},</if>
+            <if test="trainStatus != null">train_status = #{trainStatus},</if>
+            <if test="publishTime != null">publish_time = #{publishTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+        </trim>
+        where train_manage_id = #{trainManageId}
+    </update>
+
+    <delete id="deleteTTrainManageById" parameterType="Long">
+        delete from t_train_manage where train_manage_id = #{trainManageId}
+    </delete>
+
+    <delete id="deleteTTrainManageByIds" parameterType="String">
+        delete from t_train_manage where train_manage_id in 
+        <foreach item="trainManageId" collection="array" open="(" separator="," close=")">
+            #{trainManageId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TTrainPersonMapper.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.TTrainPersonMapper">
+    
+    <resultMap type="TTrainPerson" id="TTrainPersonResult">
+        <result property="id"    column="id"    />
+        <result property="trainManageId"    column="train_manage_id"    />
+        <result property="trainPersonId"    column="train_person_id"    />
+        <result property="realityTrainDuration"    column="reality_train_duration"    />
+        <result property="isFinish"    column="is_finish"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+    </resultMap>
+
+    <sql id="selectTTrainPersonVo">
+        SELECT
+            person.id,
+            person.train_manage_id,
+            person.train_person_id,
+            person.reality_train_duration,
+            person.is_finish,
+            person.create_time,
+            person.update_time,
+            person.remark,
+            person.is_del,
+            people.employed_people_name as trainPersonName
+        FROM
+            t_train_person person
+        LEFT JOIN t_employed_people_info people on people.employed_people_id = person.train_person_id
+    </sql>
+
+    <select id="selectTTrainPersonList" parameterType="TTrainPerson" resultMap="TTrainPersonResult">
+        <include refid="selectTTrainPersonVo"/>
+        <where>  
+            <if test="trainManageId != null "> and person.train_manage_id = #{trainManageId}</if>
+            <if test="trainPersonId != null "> and person.train_person_id = #{trainPersonId}</if>
+            <if test="realityTrainDuration != null "> and person.reality_train_duration = #{realityTrainDuration}</if>
+            <if test="isFinish != null  and isFinish != ''"> and person.is_finish = #{isFinish}</if>
+            <if test="isDel != null  and isDel != ''"> and person.is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTTrainPersonById" parameterType="Long" resultMap="TTrainPersonResult">
+        <include refid="selectTTrainPersonVo"/>
+        where person.id = #{id}
+    </select>
+        
+    <insert id="insertTTrainPerson" parameterType="TTrainPerson" useGeneratedKeys="true" keyProperty="id">
+        insert into t_train_person
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="trainManageId != null">train_manage_id,</if>
+            <if test="trainPersonId != null">train_person_id,</if>
+            <if test="realityTrainDuration != null">reality_train_duration,</if>
+            <if test="isFinish != null">is_finish,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="trainManageId != null">#{trainManageId},</if>
+            <if test="trainPersonId != null">#{trainPersonId},</if>
+            <if test="realityTrainDuration != null">#{realityTrainDuration},</if>
+            <if test="isFinish != null">#{isFinish},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTrainPerson" parameterType="TTrainPerson">
+        update t_train_person
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="trainManageId != null">train_manage_id = #{trainManageId},</if>
+            <if test="trainPersonId != null">train_person_id = #{trainPersonId},</if>
+            <if test="realityTrainDuration != null">reality_train_duration = #{realityTrainDuration},</if>
+            <if test="isFinish != null">is_finish = #{isFinish},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTTrainPersonById" parameterType="Long">
+        delete from t_train_person where id = #{id}
+    </delete>
+
+    <delete id="deleteTTrainPersonByIds" parameterType="String">
+        delete from t_train_person where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <insert id="batchInsertTTrainPerson">
+        INSERT INTO t_train_person(train_manage_id,train_person_id,create_time) VALUES
+        <foreach collection="tTrainPeople" separator="," item="item">
+            (${trainManageId},${item.trainPersonId},sysdate())
+        </foreach>
+    </insert>
+
+    <delete id="deleteTTrainPersonByTrainManageId" parameterType="Long">
+        delete from t_train_person where train_manage_id = #{trainManageId}
+    </delete>
+</mapper>
\ No newline at end of file