From 7ac2684f3197fdc36fed9999f11a94146face4bb Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Wed, 10 Apr 2024 15:18:51 +0800 Subject: [PATCH 1/4] FIRSTCOMMIT --- .../system/TdExamnumController.java | 116 ++++++++++++++++ .../templates/system/examnum/examnum.html | 112 ++++++++++++++++ .../com/ruoyi/system/domain/TdExamnum.java | 125 ++++++++++++++++++ .../ruoyi/system/mapper/TdExamnumMapper.java | 61 +++++++++ .../system/service/ITdExamnumService.java | 61 +++++++++ .../service/impl/TdExamnumServiceImpl.java | 94 +++++++++++++ .../mapper/system/TdExamnumMapper.xml | 82 ++++++++++++ 7 files changed, 651 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java create mode 100644 ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java new file mode 100644 index 0000000..6919bb9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java @@ -0,0 +1,116 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.TdExamnum; +import com.ruoyi.system.service.ITdExamnumService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 考试结果Controller + * + * @author ruoyi + * @date 2024-04-10 + */ +@Controller +@RequestMapping("/system/examnum") +public class TdExamnumController extends BaseController +{ + private String prefix = "system/examnum"; + + @Autowired + private ITdExamnumService tdExamnumService; + + @RequiresPermissions("system:examnum:view") + @GetMapping() + public String examnum() + { + return prefix + "/examnum"; + } + + /** + * 查询考试结果列表 + */ + @RequiresPermissions("system:examnum:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdExamnum tdExamnum) + { + startPage(); + List list = tdExamnumService.selectTdExamnumList(tdExamnum); + return getDataTable(list); + } + + /** + * 导出考试结果列表 + */ + @RequiresPermissions("system:examnum:export") + @Log(title = "考试结果", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TdExamnum tdExamnum) + { + List list = tdExamnumService.selectTdExamnumList(tdExamnum); + ExcelUtil util = new ExcelUtil(TdExamnum.class); + return util.exportExcel(list, "考试结果数据"); + } + + /** + * 新增考试结果 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存考试结果 + */ + @RequiresPermissions("system:examnum:add") + @Log(title = "考试结果", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSaveNew(TdExamnum tdExamnum) + { + return toAjax(tdExamnumService.insertTdExamnum(tdExamnum)); + } + + /** + * 新增保存考试结果 + */ + @RequiresPermissions("system:examnum:add") + @Log(title = "考试结果", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TdExamnum tdExamnum) + { + return toAjax(tdExamnumService.insertTdExamnum(tdExamnum)); + } + + /** + * 修改保存考试结果 + */ + @RequiresPermissions("system:examnum:edit") + @Log(title = "考试结果", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TdExamnum tdExamnum) + { + return toAjax(tdExamnumService.updateTdExamnum(tdExamnum)); + } + +} diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html new file mode 100644 index 0000000..ded2257 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html @@ -0,0 +1,112 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java new file mode 100644 index 0000000..b703bea --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java @@ -0,0 +1,125 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 考试结果对象 td_examnum + * + * @author ruoyi + * @date 2024-04-10 + */ +public class TdExamnum extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 考试姓名 */ + @Excel(name = "考试姓名") + private String userName; + + /** 考试分数 */ + @Excel(name = "考试分数") + private Long examResult; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String dept; + + /** 试题类型 */ + @Excel(name = "试题类型") + private String tyep; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + public void setExamResult(Long examResult) + { + this.examResult = examResult; + } + + public Long getExamResult() + { + return examResult; + } + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + public void setDept(String dept) + { + this.dept = dept; + } + + public String getDept() + { + return dept; + } + public void setTyep(String tyep) + { + this.tyep = tyep; + } + + public String getTyep() + { + return tyep; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userName", getUserName()) + .append("examResult", getExamResult()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("dept", getDept()) + .append("tyep", getTyep()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java new file mode 100644 index 0000000..58618a5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.TdExamnum; + +/** + * 考试结果Mapper接口 + * + * @author ruoyi + * @date 2024-04-10 + */ +public interface TdExamnumMapper +{ + /** + * 查询考试结果 + * + * @param id 考试结果主键 + * @return 考试结果 + */ + public TdExamnum selectTdExamnumById(Long id); + + /** + * 查询考试结果列表 + * + * @param tdExamnum 考试结果 + * @return 考试结果集合 + */ + public List selectTdExamnumList(TdExamnum tdExamnum); + + /** + * 新增考试结果 + * + * @param tdExamnum 考试结果 + * @return 结果 + */ + public int insertTdExamnum(TdExamnum tdExamnum); + + /** + * 修改考试结果 + * + * @param tdExamnum 考试结果 + * @return 结果 + */ + public int updateTdExamnum(TdExamnum tdExamnum); + + /** + * 删除考试结果 + * + * @param id 考试结果主键 + * @return 结果 + */ + public int deleteTdExamnumById(Long id); + + /** + * 批量删除考试结果 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTdExamnumByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java new file mode 100644 index 0000000..7ca1fd7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.TdExamnum; + +/** + * 考试结果Service接口 + * + * @author ruoyi + * @date 2024-04-10 + */ +public interface ITdExamnumService +{ + /** + * 查询考试结果 + * + * @param id 考试结果主键 + * @return 考试结果 + */ + public TdExamnum selectTdExamnumById(Long id); + + /** + * 查询考试结果列表 + * + * @param tdExamnum 考试结果 + * @return 考试结果集合 + */ + public List selectTdExamnumList(TdExamnum tdExamnum); + + /** + * 新增考试结果 + * + * @param tdExamnum 考试结果 + * @return 结果 + */ + public int insertTdExamnum(TdExamnum tdExamnum); + + /** + * 修改考试结果 + * + * @param tdExamnum 考试结果 + * @return 结果 + */ + public int updateTdExamnum(TdExamnum tdExamnum); + + /** + * 批量删除考试结果 + * + * @param ids 需要删除的考试结果主键集合 + * @return 结果 + */ + public int deleteTdExamnumByIds(String ids); + + /** + * 删除考试结果信息 + * + * @param id 考试结果主键 + * @return 结果 + */ + public int deleteTdExamnumById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java new file mode 100644 index 0000000..b2ec5e4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.TdExamnumMapper; +import com.ruoyi.system.domain.TdExamnum; +import com.ruoyi.system.service.ITdExamnumService; +import com.ruoyi.common.core.text.Convert; + +/** + * 考试结果Service业务层处理 + * + * @author ruoyi + * @date 2024-04-10 + */ +@Service +public class TdExamnumServiceImpl implements ITdExamnumService +{ + @Autowired + private TdExamnumMapper tdExamnumMapper; + + /** + * 查询考试结果 + * + * @param id 考试结果主键 + * @return 考试结果 + */ + @Override + public TdExamnum selectTdExamnumById(Long id) + { + return tdExamnumMapper.selectTdExamnumById(id); + } + + /** + * 查询考试结果列表 + * + * @param tdExamnum 考试结果 + * @return 考试结果 + */ + @Override + public List selectTdExamnumList(TdExamnum tdExamnum) + { + return tdExamnumMapper.selectTdExamnumList(tdExamnum); + } + + /** + * 新增考试结果 + * + * @param tdExamnum 考试结果 + * @return 结果 + */ + @Override + public int insertTdExamnum(TdExamnum tdExamnum) + { + return tdExamnumMapper.insertTdExamnum(tdExamnum); + } + + /** + * 修改考试结果 + * + * @param tdExamnum 考试结果 + * @return 结果 + */ + @Override + public int updateTdExamnum(TdExamnum tdExamnum) + { + return tdExamnumMapper.updateTdExamnum(tdExamnum); + } + + /** + * 批量删除考试结果 + * + * @param ids 需要删除的考试结果主键 + * @return 结果 + */ + @Override + public int deleteTdExamnumByIds(String ids) + { + return tdExamnumMapper.deleteTdExamnumByIds(Convert.toStrArray(ids)); + } + + /** + * 删除考试结果信息 + * + * @param id 考试结果主键 + * @return 结果 + */ + @Override + public int deleteTdExamnumById(Long id) + { + return tdExamnumMapper.deleteTdExamnumById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml new file mode 100644 index 0000000..70bc8af --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + select id, userName, examResult, startTime, endTime, dept, tyep from td_examnum + + + + + + + + insert into td_examnum + + userName, + examResult, + startTime, + endTime, + dept, + tyep, + + + #{userName}, + #{examResult}, + #{startTime}, + #{endTime}, + #{dept}, + #{tyep}, + + + + + update td_examnum + + userName = #{userName}, + examResult = #{examResult}, + startTime = #{startTime}, + endTime = #{endTime}, + dept = #{dept}, + tyep = #{tyep}, + + where id = #{id} + + + + delete from td_examnum where id = #{id} + + + + delete from td_examnum where id in + + #{id} + + + + \ No newline at end of file From 9d05b53f0026131b0df2a083bd5698ed6a0520a8 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Thu, 11 Apr 2024 10:17:51 +0800 Subject: [PATCH 2/4] FIRSTCOMMIT --- .../controller/system/TdExamController.java | 4 +- .../system/TdExamnumController.java | 42 ++++- .../resources/templates/system/user/add.html | 70 ++++++- .../resources/templates/system/user/edit.html | 7 + .../common/core/domain/entity/SysUser.java | 171 +++++++++++++++--- .../com/ruoyi/common/enums/BusinessType.java | 5 + ruoyi-system/pom.xml | 7 + .../ruoyi/system/mapper/TdExamnumMapper.java | 4 +- .../system/service/ITdExamnumService.java | 4 +- .../service/impl/TdExamnumServiceImpl.java | 9 +- .../mapper/system/SysOperLogMapper.xml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 40 +++- 12 files changed, 321 insertions(+), 44 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java index e3837c3..7db63a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamController.java @@ -1,7 +1,9 @@ package com.ruoyi.web.controller.system; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.TdQuestion; import com.ruoyi.system.service.ITdQuestionService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -46,7 +48,6 @@ public class TdExamController extends BaseController{ public TableDataInfo list(TdQuestion tdQuestion) { startPage(); - List list = tdQuestionService.selectTdQuestionList(tdQuestion); return getDataTable(list); } @@ -54,6 +55,7 @@ public class TdExamController extends BaseController{ /** * 访问考试界面，点击开始答题，重定向到exam页面 */ + @Log(title = "涉密考试", businessType = BusinessType.EXAM) @GetMapping("/edit") public String index(){ return prefix + "/exam"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java index 6919bb9..c3cd768 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java @@ -5,6 +5,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -19,6 +20,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.servlet.http.HttpServletRequest; + /** * 考试结果Controller * @@ -84,21 +87,21 @@ public class TdExamnumController extends BaseController @Log(title = "考试结果", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSaveNew(TdExamnum tdExamnum) + public AjaxResult addSave(TdExamnum tdExamnum) { return toAjax(tdExamnumService.insertTdExamnum(tdExamnum)); } /** - * 新增保存考试结果 + * 修改考试结果 */ - @RequiresPermissions("system:examnum:add") - @Log(title = "考试结果", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(TdExamnum tdExamnum) + @RequiresPermissions("system:examnum:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { - return toAjax(tdExamnumService.insertTdExamnum(tdExamnum)); + TdExamnum tdExamnum = tdExamnumService.selectTdExamnumById(id); + mmap.put("tdExamnum", tdExamnum); + return prefix + "/edit"; } /** @@ -113,4 +116,27 @@ public class TdExamnumController extends BaseController return toAjax(tdExamnumService.updateTdExamnum(tdExamnum)); } + /** + * 删除考试结果 + */ + @RequiresPermissions("system:examnum:remove") + @Log(title = "考试结果", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tdExamnumService.deleteTdExamnumByIds(ids)); + } + + /** + * 将前端的考试结果进行保存 + * @param + */ + // 新增提交 + @PostMapping("/add") + @ResponseBody + public AjaxResult addSaveExamnum(@Validated TdExamnum tdExamnum) + { + return toAjax(tdExamnumService.insertTdExamnum(tdExamnum)); + } } diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index fa5b522..9344dc2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -124,6 +124,69 @@ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+

其他信息

@@ -210,8 +273,13 @@ }, focusCleanup: true }); - + $("input[name='birthday']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); function submitHandler() { + var chrtype = [[${#strings.defaultString(@config.getKey('sys.account.chrtype'), 0)}]]; var password = $("#password").val(); if ($.validate.form() && checkpwd(chrtype, password)) { diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html index 255239e..343ede9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -110,6 +110,8 @@
+ +

其他信息

@@ -213,6 +215,11 @@ $("#treeName").val(body.find('#treeName').val()); $.modal.close(index); } + $("input[name='birthday']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); $(function() { $('#post').select2({ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 763aab5..3bba984 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -1,10 +1,11 @@ package com.ruoyi.common.core.domain.entity; +import java.util.Arrays; import java.util.Date; import java.util.List; import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; + +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; @@ -86,6 +87,115 @@ public class SysUser extends BaseEntity /** 密码最后更新时间 */ private Date pwdUpdateDate; + /** 用户地区 */ + @Excel(name = "用户地区") + private String userarea; + + /** 民族 */ + @Excel(name = "民族") + private String nation; + + /** 出生年月 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthday; + + public String getUserarea() { + return userarea; + } + + public void setUserarea(String userarea) { + this.userarea = userarea; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public Date getBirthday() { + return birthday; + } + + public void setBirthday(Date birthday) { + this.birthday = birthday; + } + + public String getPolitics() { + return politics; + } + + public void setPolitics(String politics) { + this.politics = politics; + } + + public String getShemichengdu() { + return shemichengdu; + } + + public void setShemichengdu(String shemichengdu) { + this.shemichengdu = shemichengdu; + } + + public String getGraduate() { + return graduate; + } + + public void setGraduate(String graduate) { + this.graduate = graduate; + } + + public String getStartdata() { + return startdata; + } + + public void setStartdata(String startdata) { + this.startdata = startdata; + } + + public String getEnddata() { + return enddata; + } + + public void setEnddata(String enddata) { + this.enddata = enddata; + } + + public String getHelthy() { + return helthy; + } + + public void setHelthy(String helthy) { + this.helthy = helthy; + } + + /** 政治面貌 */ + @Excel(name = "政治面貌") + private String politics; + + /** 涉密程度 */ + @Excel(name = "涉密程度") + private String shemichengdu; + + /** 学历 */ + @Excel(name = "学历") + private String graduate; + + /** 生效时间 */ + @Excel(name = "生效时间") + private String startdata; + + /** 失效时间 */ + @Excel(name = "失效时间") + private String enddata; + + /** 健康状况 */ + @Excel(name = "健康状况") + private String helthy; + /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @@ -357,29 +467,38 @@ public class SysUser extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("loginName", getLoginName()) - .append("userName", getUserName()) - .append("userType", getUserType()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("salt", getSalt()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .append("roles", getRoles()) - .toString(); + return "SysUser{" + + "userId=" + userId + + ", deptId=" + deptId + + ", parentId=" + parentId + + ", roleId=" + roleId + + ", loginName='" + loginName + '\'' + + ", userName='" + userName + '\'' + + ", userType='" + userType + '\'' + + ", email='" + email + '\'' + + ", phonenumber='" + phonenumber + '\'' + + ", sex='" + sex + '\'' + + ", avatar='" + avatar + '\'' + + ", password='" + password + '\'' + + ", salt='" + salt + '\'' + + ", status='" + status + '\'' + + ", delFlag='" + delFlag + '\'' + + ", loginIp='" + loginIp + '\'' + + ", loginDate=" + loginDate + + ", pwdUpdateDate=" + pwdUpdateDate + + ", userarea='" + userarea + '\'' + + ", nation='" + nation + '\'' + + ", birthday=" + birthday + + ", politics='" + politics + '\'' + + ", shemichengdu='" + shemichengdu + '\'' + + ", graduate='" + graduate + '\'' + + ", startdata='" + startdata + '\'' + + ", enddata='" + enddata + '\'' + + ", helthy='" + helthy + '\'' + + ", dept=" + dept + + ", roles=" + roles + + ", roleIds=" + Arrays.toString(roleIds) + + ", postIds=" + Arrays.toString(postIds) + + '}'; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 24d076a..160f063 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -56,4 +56,9 @@ public enum BusinessType * 清空 */ CLEAN, + + /** + * 考试 + */ + EXAM, } diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 13db1c3..c2691ac 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -23,6 +23,13 @@ ruoyi-common + + + com.baomidou + mybatis-plus-boot-starter + 3.5.2 + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java index 58618a5..a2e2e82 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdExamnumMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.TdExamnum; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.TdExamnum; * @author ruoyi * @date 2024-04-10 */ -public interface TdExamnumMapper +public interface TdExamnumMapper extends BaseMapper { /** * 查询考试结果 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java index 7ca1fd7..6abe69a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdExamnumService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.TdExamnum; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.TdExamnum; * @author ruoyi * @date 2024-04-10 */ -public interface ITdExamnumService +public interface ITdExamnumService extends IService { /** * 查询考试结果 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java index b2ec5e4..2b1082a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdExamnumServiceImpl.java @@ -1,6 +1,13 @@ package com.ruoyi.system.service.impl; +import java.util.Collection; import java.util.List; +import java.util.Map; +import java.util.function.Function; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.TdExamnumMapper; @@ -15,7 +22,7 @@ import com.ruoyi.common.core.text.Convert; * @date 2024-04-10 */ @Service -public class TdExamnumServiceImpl implements ITdExamnumService +public class TdExamnumServiceImpl extends ServiceImpl implements ITdExamnumService { @Autowired private TdExamnumMapper tdExamnumMapper; diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index d9a238b..a17c18d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, now()) - select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u + select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdata, enddata, helthy,d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -89,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html new file mode 100644 index 0000000..8860258 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html @@ -0,0 +1,122 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html new file mode 100644 index 0000000..9eec96d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html @@ -0,0 +1,203 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • + +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ArrayListRandom.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ArrayListRandom.java new file mode 100644 index 0000000..c6a7105 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ArrayListRandom.java @@ -0,0 +1,22 @@ +package com.ruoyi.common.utils; + +import java.util.ArrayList; +import java.util.Random; + +public class ArrayListRandom { + public static ArrayList generateRandomIDs(int min, int max, int total) { + ArrayList ids = new ArrayList<>(); + Random random = new Random(); + + for (int i = 0; i < total; i++) { + int id = random.nextInt(max - min + 1) + min; + if (!ids.contains(id)) { + ids.add(id); + } else { + i--; // 如果ID已存在，重新生成 + } + } + + return ids; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java new file mode 100644 index 0000000..40aeff1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java @@ -0,0 +1,309 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 涉密人员培训对象 td_train + * + * @author ruoyi + * @date 2024-04-11 + */ +public class TdTrain extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private Long ID; + + /** 人员名称 */ + @Excel(name = "人员名称") + private String USERNAME; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String deptName; + + /** 培训类型 */ + @Excel(name = "培训类型") + private String trainType; + + /** 培训对象 */ + @Excel(name = "培训对象") + private String trainSubject; + + /** 培训地点 */ + @Excel(name = "培训地点") + private String trainAddress; + + /** 培训日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date trainDate; + + /** 创建人 */ + @Excel(name = "创建人") + private String createStaffid; + + /** 创建单位 */ + @Excel(name = "创建单位") + private String createDepartid; + + /** 创建日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 更新单位 */ + @Excel(name = "更新单位") + private String updateDepartid; + + /** 更新人员 */ + @Excel(name = "更新人员") + private String updateStaffid; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 所属地市 */ + @Excel(name = "所属地市") + private String AREAID; + + /** 所属区县 */ + @Excel(name = "所属区县") + private String FRAMEWORK; + + /** 培训人员 */ + @Excel(name = "培训人员") + private String trainName; + + /** 培训状态 */ + @Excel(name = "培训状态") + private Long trainState; + + /** 培训结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "培训结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date trainTimeend; + + /** 部门 */ + @Excel(name = "部门") + private String PART; + + /** 培训评价 */ + @Excel(name = "培训评价") + private String TRAININFO; + + public void setID(Long ID) + { + this.ID = ID; + } + + public Long getID() + { + return ID; + } + public void setUSERNAME(String USERNAME) + { + this.USERNAME = USERNAME; + } + + public String getUSERNAME() + { + return USERNAME; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setTrainType(String trainType) + { + this.trainType = trainType; + } + + public String getTrainType() + { + return trainType; + } + public void setTrainSubject(String trainSubject) + { + this.trainSubject = trainSubject; + } + + public String getTrainSubject() + { + return trainSubject; + } + public void setTrainAddress(String trainAddress) + { + this.trainAddress = trainAddress; + } + + public String getTrainAddress() + { + return trainAddress; + } + public void setTrainDate(Date trainDate) + { + this.trainDate = trainDate; + } + + public Date getTrainDate() + { + return trainDate; + } + public void setCreateStaffid(String createStaffid) + { + this.createStaffid = createStaffid; + } + + public String getCreateStaffid() + { + return createStaffid; + } + public void setCreateDepartid(String createDepartid) + { + this.createDepartid = createDepartid; + } + + public String getCreateDepartid() + { + return createDepartid; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDepartid(String updateDepartid) + { + this.updateDepartid = updateDepartid; + } + + public String getUpdateDepartid() + { + return updateDepartid; + } + public void setUpdateStaffid(String updateStaffid) + { + this.updateStaffid = updateStaffid; + } + + public String getUpdateStaffid() + { + return updateStaffid; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setAREAID(String AREAID) + { + this.AREAID = AREAID; + } + + public String getAREAID() + { + return AREAID; + } + public void setFRAMEWORK(String FRAMEWORK) + { + this.FRAMEWORK = FRAMEWORK; + } + + public String getFRAMEWORK() + { + return FRAMEWORK; + } + public void setTrainName(String trainName) + { + this.trainName = trainName; + } + + public String getTrainName() + { + return trainName; + } + public void setTrainState(Long trainState) + { + this.trainState = trainState; + } + + public Long getTrainState() + { + return trainState; + } + public void setTrainTimeend(Date trainTimeend) + { + this.trainTimeend = trainTimeend; + } + + public Date getTrainTimeend() + { + return trainTimeend; + } + public void setPART(String PART) + { + this.PART = PART; + } + + public String getPART() + { + return PART; + } + public void setTRAININFO(String TRAININFO) + { + this.TRAININFO = TRAININFO; + } + + public String getTRAININFO() + { + return TRAININFO; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("ID", getID()) + .append("USERNAME", getUSERNAME()) + .append("deptName", getDeptName()) + .append("trainType", getTrainType()) + .append("trainSubject", getTrainSubject()) + .append("trainAddress", getTrainAddress()) + .append("trainDate", getTrainDate()) + .append("createStaffid", getCreateStaffid()) + .append("createDepartid", getCreateDepartid()) + .append("createDate", getCreateDate()) + .append("updateDepartid", getUpdateDepartid()) + .append("updateStaffid", getUpdateStaffid()) + .append("updateDate", getUpdateDate()) + .append("AREAID", getAREAID()) + .append("FRAMEWORK", getFRAMEWORK()) + .append("trainName", getTrainName()) + .append("trainState", getTrainState()) + .append("trainTimeend", getTrainTimeend()) + .append("PART", getPART()) + .append("TRAININFO", getTRAININFO()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java new file mode 100644 index 0000000..2552284 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdTrainMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.TdTrain; + +/** + * 涉密人员培训Mapper接口 + * + * @author ruoyi + * @date 2024-04-11 + */ +public interface TdTrainMapper extends BaseMapper +{ + /** + * 查询涉密人员培训 + * + * @param ID 涉密人员培训主键 + * @return 涉密人员培训 + */ + public TdTrain selectTdTrainByID(Long ID); + + /** + * 查询涉密人员培训列表 + * + * @param tdTrain 涉密人员培训 + * @return 涉密人员培训集合 + */ + public List selectTdTrainList(TdTrain tdTrain); + + /** + * 新增涉密人员培训 + * + * @param tdTrain 涉密人员培训 + * @return 结果 + */ + public int insertTdTrain(TdTrain tdTrain); + + /** + * 修改涉密人员培训 + * + * @param tdTrain 涉密人员培训 + * @return 结果 + */ + public int updateTdTrain(TdTrain tdTrain); + + /** + * 删除涉密人员培训 + * + * @param ID 涉密人员培训主键 + * @return 结果 + */ + public int deleteTdTrainByID(Long ID); + + /** + * 批量删除涉密人员培训 + * + * @param IDs 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTdTrainByIDs(String[] IDs); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdTrainService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdTrainService.java new file mode 100644 index 0000000..fd9a950 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdTrainService.java @@ -0,0 +1,64 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.system.domain.TdTrain; + +/** + * 涉密人员培训Service接口 + * + * @author ruoyi + * @date 2024-04-11 + */ +public interface ITdTrainService extends IService +{ + /** + * 查询涉密人员培训 + * + * @param ID 涉密人员培训主键 + * @return 涉密人员培训 + */ + public TdTrain selectTdTrainByID(Long ID); + + /** + * 查询涉密人员培训列表 + * + * @param tdTrain 涉密人员培训 + * @return 涉密人员培训集合 + */ + public List selectTdTrainList(TdTrain tdTrain); + + /** + * 新增涉密人员培训 + * + * @param tdTrain 涉密人员培训 + * @return 结果 + */ + public int insertTdTrain(TdTrain tdTrain); + + /** + * 修改涉密人员培训 + * + * @param tdTrain 涉密人员培训 + * @return 结果 + */ + public int updateTdTrain(TdTrain tdTrain); + + /** + * 批量删除涉密人员培训 + * + * @param IDs 需要删除的涉密人员培训主键集合 + * @return 结果 + */ + public int deleteTdTrainByIDs(String IDs); + + /** + * 删除涉密人员培训信息 + * + * @param ID 涉密人员培训主键 + * @return 结果 + */ + public int deleteTdTrainByID(Long ID); + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java new file mode 100644 index 0000000..7488fd7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdTrainServiceImpl.java @@ -0,0 +1,142 @@ +package com.ruoyi.system.service.impl; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.TdTrainMapper; +import com.ruoyi.system.domain.TdTrain; +import com.ruoyi.system.service.ITdTrainService; +import com.ruoyi.common.core.text.Convert; + +/** + * 涉密人员培训Service业务层处理 + * + * @author ruoyi + * @date 2024-04-11 + */ +@Service +public class TdTrainServiceImpl extends ServiceImpl implements ITdTrainService +{ + @Autowired + private TdTrainMapper tdTrainMapper; + + /** + * 查询涉密人员培训 + * + * @param ID 涉密人员培训主键 + * @return 涉密人员培训 + */ + @Override + public TdTrain selectTdTrainByID(Long ID) + { + return tdTrainMapper.selectTdTrainByID(ID); + } + + /** + * 查询涉密人员培训列表 + * + * @param tdTrain 涉密人员培训 + * @return 涉密人员培训 + */ + @Override + public List selectTdTrainList(TdTrain tdTrain) + { + return tdTrainMapper.selectTdTrainList(tdTrain); + } + + /** + * 新增涉密人员培训 + * + * @param tdTrain 涉密人员培训 + * @return 结果 + */ + @Override + public int insertTdTrain(TdTrain tdTrain) + { + return tdTrainMapper.insertTdTrain(tdTrain); + } + + /** + * 修改涉密人员培训 + * + * @param tdTrain 涉密人员培训 + * @return 结果 + */ + @Override + public int updateTdTrain(TdTrain tdTrain) + { + return tdTrainMapper.updateTdTrain(tdTrain); + } + + /** + * 批量删除涉密人员培训 + * + * @param IDs 需要删除的涉密人员培训主键 + * @return 结果 + */ + @Override + public int deleteTdTrainByIDs(String IDs) + { + return tdTrainMapper.deleteTdTrainByIDs(Convert.toStrArray(IDs)); + } + + /** + * 删除涉密人员培训信息 + * + * @param ID 涉密人员培训主键 + * @return 结果 + */ + @Override + public int deleteTdTrainByID(Long ID) + { + return tdTrainMapper.deleteTdTrainByID(ID); + } + + + @Override + public boolean saveBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean updateBatchById(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdate(TdTrain entity) { + return false; + } + + @Override + public TdTrain getOne(Wrapper queryWrapper, boolean throwEx) { + return null; + } + + @Override + public Map getMap(Wrapper queryWrapper) { + return null; + } + + @Override + public V getObj(Wrapper queryWrapper, Function mapper) { + return null; + } + + @Override + public Class getEntityClass() { + return null; + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml new file mode 100644 index 0000000..2fc062c --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO from td_train + + + + + + + + insert into td_train + + USERNAME, + DEPT_NAME, + TRAIN_TYPE, + TRAIN_SUBJECT, + TRAIN_ADDRESS, + TRAIN_DATE, + CREATE_STAFFID, + CREATE_DEPARTID, + CREATE_DATE, + UPDATE_DEPARTID, + UPDATE_STAFFID, + UPDATE_DATE, + AREAID, + FRAMEWORK, + TRAIN_NAME, + TRAIN_STATE, + TRAIN_TIMEEND, + PART, + TRAININFO, + + + #{USERNAME}, + #{deptName}, + #{trainType}, + #{trainSubject}, + #{trainAddress}, + #{trainDate}, + #{createStaffid}, + #{createDepartid}, + #{createDate}, + #{updateDepartid}, + #{updateStaffid}, + #{updateDate}, + #{AREAID}, + #{FRAMEWORK}, + #{trainName}, + #{trainState}, + #{trainTimeend}, + #{PART}, + #{TRAININFO}, + + + + + update td_train + + USERNAME = #{USERNAME}, + DEPT_NAME = #{deptName}, + TRAIN_TYPE = #{trainType}, + TRAIN_SUBJECT = #{trainSubject}, + TRAIN_ADDRESS = #{trainAddress}, + TRAIN_DATE = #{trainDate}, + CREATE_STAFFID = #{createStaffid}, + CREATE_DEPARTID = #{createDepartid}, + CREATE_DATE = #{createDate}, + UPDATE_DEPARTID = #{updateDepartid}, + UPDATE_STAFFID = #{updateStaffid}, + UPDATE_DATE = #{updateDate}, + AREAID = #{AREAID}, + FRAMEWORK = #{FRAMEWORK}, + TRAIN_NAME = #{trainName}, + TRAIN_STATE = #{trainState}, + TRAIN_TIMEEND = #{trainTimeend}, + PART = #{PART}, + TRAININFO = #{TRAININFO}, + + where ID = #{ID} + + + + delete from td_train where ID = #{ID} + + + + delete from td_train where ID in + + #{ID} + + + + \ No newline at end of file From 9eaf97a16226964a480e97d2e3c4dfdab157f1d4 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Thu, 11 Apr 2024 15:52:42 +0800 Subject: [PATCH 4/4] renyuanpeixun --- .../controller/system/TdTrainController.java | 25 +++ .../templates/system/train/examine.html | 157 ++++++++++++++++++ .../templates/system/train/train.html | 5 +- .../com/ruoyi/common/enums/BusinessType.java | 5 + 4 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/train/examine.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java index 3c240e1..cc13ad0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java @@ -96,6 +96,7 @@ public class TdTrainController extends BaseController @GetMapping("/edit/{ID}") public String edit(@PathVariable("ID") Long ID, ModelMap mmap) { + TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); mmap.put("tdTrain", tdTrain); return prefix + "/edit"; @@ -135,4 +136,28 @@ public class TdTrainController extends BaseController mmap.put("train", tdTrainService.selectTdTrainByID(operId)); return prefix + "/detail"; } + + /** + * 审核涉密人员培训 + */ + @RequiresPermissions("system:train:examine") + @GetMapping("/examine/{ID}") + public String examine(@PathVariable("ID") Long ID, ModelMap mmap) + { + TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); + mmap.put("tdTrain", tdTrain); + return prefix + "/examine"; + } + + /** + * 修改保存涉密人员培训 + */ + @RequiresPermissions("system:train:examine") + @Log(title = "涉密人员培训", businessType = BusinessType.EXAMINE) + @PostMapping("/examine") + @ResponseBody + public AjaxResult examineSave(TdTrain tdTrain) + { + return toAjax(tdTrainService.updateTdTrain(tdTrain)); + } } diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html new file mode 100644 index 0000000..3c27f0c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html @@ -0,0 +1,157 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html index 9eec96d..a0ae9d7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/train.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html @@ -62,6 +62,7 @@