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

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);

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationBalanceMapper.xml

@@ -37,6 +37,8 @@
         <result property="childRearingLeave" column="childRearingLeave" />
         <result property="transferBack" column="transferBack" />
         <result property="homeLeave" column="homeLeave" />
+        <result property="salaId" column="salaId" />
+        <result property="salaName" column="salaName" />
 
     </resultMap>
 
@@ -140,23 +142,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('homeLeave') or colPickMode == 1 and data.containsKey('homeLeave')))">
                 a.homeLeave,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaId') or colPickMode == 1 and data.containsKey('salaId')))">
+                a.salaId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
+                a.salaName,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AttendanceVacationBalanceEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_attendance_vacation_balance
-        (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave)
+        (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave,salaId,salaName)
         VALUES
-        (#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{marriageLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{maternityLeaveDays},#{paternityLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{childRearingLeave},#{transferBack},#{homeLeave})
+        (#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{marriageLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{maternityLeaveDays},#{paternityLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{childRearingLeave},#{transferBack},#{homeLeave},#{salaId},#{salaName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_attendance_vacation_balance
-        (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave)
+        (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave,salaId,salaName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.entryTime},#{item.personalLeaveDays},#{item.compensatedLeaveDays},#{item.sickLeaveDays},#{item.annualLeaveDays},#{item.marriageLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.maternityLeaveDays},#{item.paternityLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.childRearingLeave},#{item.transferBack},#{item.homeLeave})
+            (#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.entryTime},#{item.personalLeaveDays},#{item.compensatedLeaveDays},#{item.sickLeaveDays},#{item.annualLeaveDays},#{item.marriageLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.maternityLeaveDays},#{item.paternityLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.childRearingLeave},#{item.transferBack},#{item.homeLeave},#{item.salaId},#{item.salaName})
         </foreach>
     </insert>
 
@@ -334,6 +342,15 @@
             <if test="(colPickMode==0 and data.containsKey('homeLeaveIncrement')) or (colPickMode==1 and !data.containsKey('homeLeaveIncrement'))">
                 a.homeLeave=ifnull(a.homeLeave,0) + #{data.homeLeaveIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('salaId')) or (colPickMode==1 and !data.containsKey('salaId'))">
+                a.salaId=#{data.salaId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('salaIdIncrement')) or (colPickMode==1 and !data.containsKey('salaIdIncrement'))">
+                a.salaId=ifnull(a.salaId,0) + #{data.salaIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
+                a.salaName=#{data.salaName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -688,6 +705,25 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="salaId=(case" suffix="ELSE salaId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('salaId')) or (colPickMode==1 and !item.containsKey('salaId'))">
+                            when a.id=#{item.id} then #{item.salaId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('salaIdIncrement')) or (colPickMode==1 and !item.containsKey('salaIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.salaId,0) + #{item.salaIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="salaName=(case" suffix="ELSE salaName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('salaName')) or (colPickMode==1 and !item.containsKey('salaName'))">
+                        when a.id=#{item.id} then #{item.salaName}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1614,18 +1650,444 @@
             ${_conditionType_} a.homeLeave <![CDATA[ <= ]]> #{${_conditionParam_}.homeLeaveEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('salaId')">
+            <if test="conditionParamRef.salaId != null ">
+                ${_conditionType_} a.salaId = #{${_conditionParam_}.salaId}
+            </if>
+            <if test="conditionParamRef.salaId == null">
+                ${_conditionType_} a.salaId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
+            ${_conditionType_} a.salaId in
+            <foreach collection="conditionParamRef.salaIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('salaIdNotList') and conditionParamRef.salaIdNotList.size() > 0">
+            ${_conditionType_} a.salaId not in
+            <foreach collection="conditionParamRef.salaIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('salaIdStart') and conditionParamRef.salaIdStart != null">
+            ${_conditionType_} a.salaId <![CDATA[ >= ]]> #{${_conditionParam_}.salaIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('salaIdEnd') and conditionParamRef.salaIdEnd != null">
+            ${_conditionType_} a.salaId <![CDATA[ <= ]]> #{${_conditionParam_}.salaIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('salaName')">
+            <if test="conditionParamRef.salaName != null and conditionParamRef.salaName != ''">
+                ${_conditionType_} a.salaName like #{${_conditionParam_}.salaName}
+            </if>
+            <if test="conditionParamRef.salaName == null">
+                ${_conditionType_} a.salaName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('salaNameList') and conditionParamRef.salaNameList.size() > 0">
+            ${_conditionType_} a.salaName in
+            <foreach collection="conditionParamRef.salaNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('salaNameNotList') and conditionParamRef.salaNameNotList.size() > 0">
+            ${_conditionType_} a.salaName not in
+            <foreach collection="conditionParamRef.salaNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
+                field(a.staffId,
+                <foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+                field(a.deptId,
+                <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('personalLeaveDaysList') and conditionParamRef.personalLeaveDaysList.size() > 0">
+                field(a.personalLeaveDays,
+                <foreach collection="conditionParamRef.personalLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
+                field(a.compensatedLeaveDays,
+                <foreach collection="conditionParamRef.compensatedLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sickLeaveDaysList') and conditionParamRef.sickLeaveDaysList.size() > 0">
+                field(a.sickLeaveDays,
+                <foreach collection="conditionParamRef.sickLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
+                field(a.annualLeaveDays,
+                <foreach collection="conditionParamRef.annualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
+                field(a.marriageLeaveDays,
+                <foreach collection="conditionParamRef.marriageLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                field(a.updateUserId,
+                <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('maternityLeaveDaysList') and conditionParamRef.maternityLeaveDaysList.size() > 0">
+                field(a.maternityLeaveDays,
+                <foreach collection="conditionParamRef.maternityLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('paternityLeaveDaysList') and conditionParamRef.paternityLeaveDaysList.size() > 0">
+                field(a.paternityLeaveDays,
+                <foreach collection="conditionParamRef.paternityLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('menstrualLeaveDaysList') and conditionParamRef.menstrualLeaveDaysList.size() > 0">
+                field(a.menstrualLeaveDays,
+                <foreach collection="conditionParamRef.menstrualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('breastfeedingLeaveDaysList') and conditionParamRef.breastfeedingLeaveDaysList.size() > 0">
+                field(a.breastfeedingLeaveDays,
+                <foreach collection="conditionParamRef.breastfeedingLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('bereavementLeaveDaysList') and conditionParamRef.bereavementLeaveDaysList.size() > 0">
+                field(a.bereavementLeaveDays,
+                <foreach collection="conditionParamRef.bereavementLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
+                field(a.backToUnit,
+                <foreach collection="conditionParamRef.backToUnitList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
+                field(a.onDutyLeave,
+                <foreach collection="conditionParamRef.onDutyLeaveList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
+                field(a.outOfOffice,
+                <foreach collection="conditionParamRef.outOfOfficeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
+                field(a.shiftCompensation,
+                <foreach collection="conditionParamRef.shiftCompensationList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
+                field(a.physicalExamination,
+                <foreach collection="conditionParamRef.physicalExaminationList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
+                field(a.quarantine,
+                <foreach collection="conditionParamRef.quarantineList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
+                field(a.businessTrip,
+                <foreach collection="conditionParamRef.businessTripList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
+                field(a.publicHoliday,
+                <foreach collection="conditionParamRef.publicHolidayList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
+                field(a.childRearingLeave,
+                <foreach collection="conditionParamRef.childRearingLeaveList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
+                field(a.transferBack,
+                <foreach collection="conditionParamRef.transferBackList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
+                field(a.homeLeave,
+                <foreach collection="conditionParamRef.homeLeaveList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
+                field(a.salaId,
+                <foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    ${item.colName} ${item.sortKind}
+                    a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
+                field(a.staffId,
+                <foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+                field(a.deptId,
+                <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('personalLeaveDaysList') and conditionParamRef.personalLeaveDaysList.size() > 0">
+                field(a.personalLeaveDays,
+                <foreach collection="conditionParamRef.personalLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
+                field(a.compensatedLeaveDays,
+                <foreach collection="conditionParamRef.compensatedLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sickLeaveDaysList') and conditionParamRef.sickLeaveDaysList.size() > 0">
+                field(a.sickLeaveDays,
+                <foreach collection="conditionParamRef.sickLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
+                field(a.annualLeaveDays,
+                <foreach collection="conditionParamRef.annualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
+                field(a.marriageLeaveDays,
+                <foreach collection="conditionParamRef.marriageLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                field(a.updateUserId,
+                <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('maternityLeaveDaysList') and conditionParamRef.maternityLeaveDaysList.size() > 0">
+                field(a.maternityLeaveDays,
+                <foreach collection="conditionParamRef.maternityLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('paternityLeaveDaysList') and conditionParamRef.paternityLeaveDaysList.size() > 0">
+                field(a.paternityLeaveDays,
+                <foreach collection="conditionParamRef.paternityLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('menstrualLeaveDaysList') and conditionParamRef.menstrualLeaveDaysList.size() > 0">
+                field(a.menstrualLeaveDays,
+                <foreach collection="conditionParamRef.menstrualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('breastfeedingLeaveDaysList') and conditionParamRef.breastfeedingLeaveDaysList.size() > 0">
+                field(a.breastfeedingLeaveDays,
+                <foreach collection="conditionParamRef.breastfeedingLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('bereavementLeaveDaysList') and conditionParamRef.bereavementLeaveDaysList.size() > 0">
+                field(a.bereavementLeaveDays,
+                <foreach collection="conditionParamRef.bereavementLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
+                field(a.backToUnit,
+                <foreach collection="conditionParamRef.backToUnitList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
+                field(a.onDutyLeave,
+                <foreach collection="conditionParamRef.onDutyLeaveList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
+                field(a.outOfOffice,
+                <foreach collection="conditionParamRef.outOfOfficeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
+                field(a.shiftCompensation,
+                <foreach collection="conditionParamRef.shiftCompensationList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
+                field(a.physicalExamination,
+                <foreach collection="conditionParamRef.physicalExaminationList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
+                field(a.quarantine,
+                <foreach collection="conditionParamRef.quarantineList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
+                field(a.businessTrip,
+                <foreach collection="conditionParamRef.businessTripList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
+                field(a.publicHoliday,
+                <foreach collection="conditionParamRef.publicHolidayList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
+                field(a.childRearingLeave,
+                <foreach collection="conditionParamRef.childRearingLeaveList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
+                field(a.transferBack,
+                <foreach collection="conditionParamRef.transferBackList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
+                field(a.homeLeave,
+                <foreach collection="conditionParamRef.homeLeaveList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
+                field(a.salaId,
+                <foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1787,8 +2249,20 @@
                     <if test='orderCol.homeLeave != null and "DESC".equalsIgnoreCase(orderCol.homeLeave)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('salaId')">
+                    a.salaId
+                    <if test='orderCol.salaId != null and "DESC".equalsIgnoreCase(orderCol.salaId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('salaName')">
+                    a.salaName
+                    <if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">