From b2faaa9abaaf1747149bb95b9ab9ed8535504902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 29 Aug 2023 00:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectTrainController.java | 90 +++++++++++++++++++ .../yanzhu/jh/work/domain/WorkTrainDept.java | 10 +++ .../jh/work/mapper/WorkTrainMapper.java | 8 ++ .../jh/work/service/IWorkTrainService.java | 8 ++ .../service/impl/WorkTrainServiceImpl.java | 10 +++ .../resources/mapper/work/WorkTrainMapper.xml | 9 ++ 6 files changed, 135 insertions(+) create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java new file mode 100644 index 00000000..c2495973 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java @@ -0,0 +1,90 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.work.domain.WorkTrain; +import com.yanzhu.jh.work.service.IWorkTrainService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectTrainController + * @Description: 专项培训||应急演练 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectTrain") +public class ProjectTrainController extends BaseController { + + @Autowired + private IWorkTrainService workTrainService; + + /** + * 查询项目专项培训||应急演练列表 + * @param workTrain + * @return + */ + @GetMapping("/list") + public AjaxResult list(WorkTrain workTrain){ + if(workTrain.getDeptId()==0){ + workTrain.setDeptId(null); + } + return success(workTrainService.selectWorkTrainList(workTrain)); + } + + /** + * 查询专项培训||应急演练详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(workTrainService.selectById(id)); + } + + /** + * 新增专项培训 + * @param workTrain + * @return + */ + @PostMapping("/addTrain") + @Log(title = "专项培训", businessType = BusinessType.INSERT) + public AjaxResult addTrain(@RequestBody WorkTrain workTrain){ + return success(workTrainService.insertWorkTrain(workTrain)); + } + + /** + * 新增应急演练 + * @param workTrain + * @return + */ + @PostMapping("/addEmergencyDrill") + @Log(title = "应急演练", businessType = BusinessType.INSERT) + public AjaxResult addEmergencyDrill(@RequestBody WorkTrain workTrain){ + return success(workTrainService.insertWorkTrain(workTrain)); + } + + /** + * 删除专项培训 + */ + @Log(title = "专项培训", businessType = BusinessType.DELETE) + @GetMapping("/removeTrain") + public AjaxResult removeTrain(@RequestParam Long id) + { + return toAjax(workTrainService.deleteWorkTrainById(id)); + } + + /** + * 删除应急演练 + */ + @Log(title = "应急演练", businessType = BusinessType.DELETE) + @GetMapping("/removeEmergencyDrill") + public AjaxResult removeEmergencyDrill(@RequestParam Long id) + { + return toAjax(workTrainService.deleteWorkTrainById(id)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrainDept.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrainDept.java index 7c94b42b..6bc50bf7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrainDept.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrainDept.java @@ -27,6 +27,8 @@ public class WorkTrainDept extends BaseEntity @Excel(name = "是否组织部门") private String isMain; + private String deptName; + public void setTrainId(Long trainId) { this.trainId = trainId; @@ -56,6 +58,14 @@ public class WorkTrainDept extends BaseEntity return isMain; } + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java index d357ed05..39122381 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java @@ -20,6 +20,14 @@ public interface WorkTrainMapper */ public WorkTrain selectWorkTrainById(Long id); + /** + * 查询演练培训 + * + * @param id 演练培训主键 + * @return 演练培训 + */ + public WorkTrain selectById(Long id); + /** * 查询演练培训列表 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java index 4cfa1e53..1c82a055 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java @@ -19,6 +19,14 @@ public interface IWorkTrainService */ public WorkTrain selectWorkTrainById(Long id); + /** + * 查询演练培训 + * + * @param id 演练培训主键 + * @return 演练培训 + */ + public WorkTrain selectById(Long id); + /** * 查询演练培训列表 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java index a6233d9b..aea18379 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java @@ -50,6 +50,16 @@ public class WorkTrainServiceImpl implements IWorkTrainService return workTrainMapper.selectWorkTrainById(id); } + /** + * 查询演练培训 + * + * @param id 演练培训主键 + * @return 演练培训 + */ + public WorkTrain selectById(Long id) { + return workTrainMapper.selectById(id); + } + /** * 查询演练培训列表 * diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index 2df644e9..d1f6f28d 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -132,6 +132,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join work_train_dept b on b.train_id = a.id and b.is_main ='N' where a.id = #{id} + + insert into work_train