diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/add.html b/ruoyi-admin/src/main/resources/templates/system/leave/add.html index 122df9b..b400417 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html @@ -9,6 +9,7 @@
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html index 7093518..d369233 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html @@ -9,6 +9,7 @@ +
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html index 93684ab..057747e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html @@ -7,6 +7,7 @@
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html index 86726e7..41c792e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html @@ -8,6 +8,7 @@
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html index 51b48c5..59272ee 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html @@ -9,7 +9,7 @@
- +
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java index 6f9bddf..3eb0319 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java @@ -84,7 +84,20 @@ public class TdLeave extends BaseEntity @Excel(name = "审核意见", readConverterExp = "0=通过,1不通过,2审核中") private String examinestate; - public void setId(Long id) + /** + * 部门 + */ + private Long deptId; + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public void setId(Long id) { this.id = id; } @@ -209,6 +222,7 @@ public class TdLeave extends BaseEntity .append("examinename", getExaminename()) .append("examinedate", getExaminedate()) .append("examinestate", getExaminestate()) + .append("deptId", getDeptId()) .toString(); } } 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 index 6ddbd26..9829846 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java @@ -98,6 +98,19 @@ public class TdTrain extends BaseEntity @Excel(name = "培训评价") private String TRAININFO; + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + /** + * 部门 + */ + private Long deptId; + public void setID(Long ID) { this.ID = ID; @@ -302,6 +315,7 @@ public class TdTrain extends BaseEntity .append("trainTimeend", getTrainTimeend()) .append("PART", getPART()) .append("TRAININFO", getTRAININFO()) + .append("deptId", getDeptId()) .toString(); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml index c1afbf6..6f992a8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml @@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate from td_leave u + select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate,dept_id from td_leave u @@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and TRAIN_TIMEEND = #{trainTimeend} and PART = #{PART} and TRAININFO = #{TRAININFO} + and dept_id = #{deptId} order by CREATE_DATE desc @@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" TRAIN_TIMEEND, PART, TRAININFO, + dept_id, #{USERNAME}, @@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{trainTimeend}, #{PART}, #{TRAININFO}, + #{deptId}, @@ -130,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" TRAIN_TIMEEND = #{trainTimeend}, PART = #{PART}, TRAININFO = #{TRAININFO}, + dept_id = #{deptId}, where ID = #{ID}