员工假期余额表增加人员大厅字段

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationBalanceEntity.java

@@ -24,6 +24,15 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
      */
     @Excel(name = "员工姓名")
     private String staffName;
+    /**
+     * 所属大厅
+     */
+    private Long salaId;
+    /**
+     * 所属大厅名称
+     */
+    @Excel(name = "大厅名称")
+    private String salaName;
     /**
      * 部门id
      */
@@ -543,6 +552,22 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
         this.other = other;
     }
 
+    public Long getSalaId() {
+        return salaId;
+    }
+
+    public void setSalaId(Long salaId) {
+        this.salaId = salaId;
+    }
+
+    public String getSalaName() {
+        return salaName;
+    }
+
+    public void setSalaName(String salaName) {
+        this.salaName = salaName;
+    }
+
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -563,6 +588,8 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
         StringBuilder sb = new StringBuilder("");
         sb.append(",staffId:").append(getStaffId());
         sb.append(",staffName:").append(getStaffName());
+        sb.append(",salaId:").append(getSalaId());
+        sb.append(",salaName:").append(getSalaName());
         sb.append(",deptId:").append(getDeptId());
         sb.append(",deptName:").append(getDeptName());
         sb.append(",entryTime:").append(getEntryTime());
@@ -649,5 +676,9 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
         this.homeLeave = BigDecimal.valueOf(0);
 
         this.other = BigDecimal.valueOf(0);
+
+        this.salaId = null;
+
+        this.salaName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationBalanceQuery.java

@@ -432,6 +432,27 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
     /** 探亲假（天）排除列表 */
     private List <BigDecimal> homeLeaveNotList;
 
+    /** 开始 所属大厅 */
+    private Long salaIdStart;
+
+    /** 结束 所属大厅 */
+    private Long salaIdEnd;
+
+    /** 增加 所属大厅 */
+    private Long salaIdIncrement;
+
+    /** 所属大厅列表 */
+    private List <Long> salaIdList;
+
+    /** 所属大厅排除列表 */
+    private List <Long> salaIdNotList;
+
+    /** 所属大厅名称 */
+    private List<String> salaNameList;
+
+    /** 所属大厅名称排除列表 */
+    private List <String> salaNameNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<AttendanceVacationBalanceQuery> orConditionList;
 
@@ -2737,6 +2758,118 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
         this.homeLeaveNotList = homeLeaveNotList;
     }
 
+    /**
+     * 获取 开始 所属大厅
+     * @return salaIdStart
+     */
+    public Long getSalaIdStart(){
+        return this.salaIdStart;
+    }
+
+    /**
+     * 设置 开始 所属大厅
+     * @param salaIdStart
+     */
+    public void setSalaIdStart(Long salaIdStart){
+        this.salaIdStart = salaIdStart;
+    }
+
+    /**
+     * 获取 结束 所属大厅
+     * @return $salaIdEnd
+     */
+    public Long getSalaIdEnd(){
+        return this.salaIdEnd;
+    }
+
+    /**
+     * 设置 结束 所属大厅
+     * @param salaIdEnd
+     */
+    public void setSalaIdEnd(Long salaIdEnd){
+        this.salaIdEnd = salaIdEnd;
+    }
+
+    /**
+     * 获取 增加 所属大厅
+     * @return salaIdIncrement
+     */
+    public Long getSalaIdIncrement(){
+        return this.salaIdIncrement;
+    }
+
+    /**
+     * 设置 增加 所属大厅
+     * @param salaIdIncrement
+     */
+    public void setSalaIdIncrement(Long salaIdIncrement){
+        this.salaIdIncrement = salaIdIncrement;
+    }
+
+    /**
+     * 获取 所属大厅
+     * @return salaIdList
+     */
+    public List<Long> getSalaIdList(){
+        return this.salaIdList;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdList
+     */
+    public void setSalaIdList(List<Long> salaIdList){
+        this.salaIdList = salaIdList;
+    }
+
+    /**
+     * 获取 所属大厅
+     * @return salaIdNotList
+     */
+    public List<Long> getSalaIdNotList(){
+        return this.salaIdNotList;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdNotList
+     */
+    public void setSalaIdNotList(List<Long> salaIdNotList){
+        this.salaIdNotList = salaIdNotList;
+    }
+
+
+    /**
+     * 获取 所属大厅名称
+     * @return salaNameList
+     */
+    public List<String> getSalaNameList(){
+        return this.salaNameList;
+    }
+
+    /**
+     * 设置 所属大厅名称
+     * @param salaNameList
+     */
+    public void setSalaNameList(List<String> salaNameList){
+        this.salaNameList = salaNameList;
+    }
+
+    /**
+     * 获取 所属大厅名称
+     * @return salaNameNotList
+     */
+    public List<String> getSalaNameNotList(){
+        return this.salaNameNotList;
+    }
+
+    /**
+     * 设置 所属大厅名称
+     * @param salaNameNotList
+     */
+    public void setSalaNameNotList(List<String> salaNameNotList){
+        this.salaNameNotList = salaNameNotList;
+    }
 
     /**
      * 设置  序号，主键，自增长
@@ -4202,6 +4335,79 @@ public class AttendanceVacationBalanceQuery extends AttendanceVacationBalanceEnt
         return this;
     }
 
+    /**
+     * 设置  所属大厅
+     * @param salaId
+     */
+    public AttendanceVacationBalanceQuery salaId(Long salaId){
+        setSalaId(salaId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属大厅
+     * @param salaIdStart
+     */
+    public AttendanceVacationBalanceQuery salaIdStart(Long salaIdStart){
+        this.salaIdStart = salaIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 所属大厅
+     * @param salaIdEnd
+     */
+    public AttendanceVacationBalanceQuery salaIdEnd(Long salaIdEnd){
+        this.salaIdEnd = salaIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 所属大厅
+     * @param salaIdIncrement
+     */
+    public AttendanceVacationBalanceQuery salaIdIncrement(Long salaIdIncrement){
+        this.salaIdIncrement = salaIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdList
+     */
+    public AttendanceVacationBalanceQuery salaIdList(List<Long> salaIdList){
+        this.salaIdList = salaIdList;
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdNotList
+     */
+    public AttendanceVacationBalanceQuery salaIdNotList(List<Long> salaIdNotList){
+        this.salaIdNotList = salaIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 所属大厅名称
+     * @param salaName
+     */
+    public AttendanceVacationBalanceQuery salaName(String salaName){
+        setSalaName(salaName);
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅名称
+     * @param salaNameList
+     */
+    public AttendanceVacationBalanceQuery salaNameList(List<String> salaNameList){
+        this.salaNameList = salaNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceVacationBalanceServiceImpl.java

@@ -36,6 +36,8 @@ public class AttendanceVacationBalanceServiceImpl extends AbstractCRUDServiceImp
         entity.setStaffName(staff.getName());
         entity.setDeptId(staff.getDeptId());
         entity.setDeptName(staff.getDeptName());
+        entity.setSalaId(staff.getSalaId());
+        entity.setSalaName(staff.getSalaName());
 
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java

@@ -631,6 +631,8 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
                                 attendanceVacationBalanceEntity.setStaffName(staffEntity.getName());
                                 attendanceVacationBalanceEntity.setDeptId(staffEntity.getDeptId());
                                 attendanceVacationBalanceEntity.setDeptName(staffEntity.getDeptName());
+                                attendanceVacationBalanceEntity.setSalaId(staffEntity.getSalaId());
+                                attendanceVacationBalanceEntity.setSalaName(staffEntity.getSalaName());
                                 attendanceVacationBalanceEntity.setEntryTime(staffEntity.getEntryDate());
                                 if (leaveRecordsResponseBodyResultRest.getCode() == Rest.SUCCESS) {
                                     OapiAttendanceVacationQuotaListResponse.OapiLeaveQuotaUserListVo result1 = leaveRecordsResponseBodyResultRest.getData();

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -305,6 +305,8 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             balanceEntity.setStaffName(entity.getName());
             balanceEntity.setDeptId(entity.getDeptId());
             balanceEntity.setDeptName(entity.getDeptName());
+            balanceEntity.setSalaId(entity.getSalaId());
+            balanceEntity.setSalaName(entity.getSalaName());
             balanceEntity.setCreateUserId(1L);
             balanceEntity.setCreateTime(new Date());
             balanceService.save(balanceEntity);