窗口人员考核汇总明细增加字段

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

@@ -11,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.vo.WindowWorkmanPerformDetailVo;
 import lombok.Data;
 /**
-* 窗口人员考核汇总明细实体对象
-*
-* @author zxfei
-* @date 2024-01-17
-*/
+ * 窗口人员考核汇总明细实体对象
+ *
+ * @author zxfei
+ * @date 2024-01-30
+ */
 @Data
 public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetailVo {
     private static final long serialVersionUID = 1L;
@@ -68,6 +68,22 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail
      * 备注
      */
     private String remark;
+    /**
+     * 所属部门id
+     */
+    private Long deptId;
+    /**
+     * 所属部门名称
+     */
+    private String deptName;
+    /**
+     * 所属大厅
+     */
+    private Long salaId;
+    /**
+     * 所属大厅名称
+     */
+    private String salaName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -97,5 +113,9 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail
         this.sumScore = BigDecimal.ZERO;
         this.examineLevel = 0;
         this.remark = "";
+        this.deptId = null;
+        this.deptName = "";
+        this.salaId = null;
+        this.salaName = "";
     }
 }
\ No newline at end of file

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

@@ -4,11 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
 /**
-* 窗口人员考核汇总明细查询对象
-*
-* @author zxfei
-* @date 2024-01-17
-*/
+ * 窗口人员考核汇总明细查询对象
+ *
+ * @author zxfei
+ * @date 2024-01-30
+ */
 public class WindowWorkmanPerformDetailQuery extends WindowWorkmanPerformDetailEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -227,6 +227,46 @@ public class WindowWorkmanPerformDetailQuery extends WindowWorkmanPerformDetailE
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 所属部门id */
+    private Long deptIdStart;
+
+    /** 结束 所属部门id */
+    private Long deptIdEnd;
+
+    /** 增加 所属部门id */
+    private Long deptIdIncrement;
+
+    /** 所属部门id列表 */
+    private List <Long> deptIdList;
+
+    /** 所属部门id排除列表 */
+    private List <Long> deptIdNotList;
+
+    /** 所属部门名称 */
+    private List<String> deptNameList;
+
+    /** 所属部门名称排除列表 */
+    private List <String> deptNameNotList;
+    /** 开始 所属大厅 */
+    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<WindowWorkmanPerformDetailQuery> orConditionList;
 
@@ -1416,6 +1456,232 @@ public class WindowWorkmanPerformDetailQuery extends WindowWorkmanPerformDetailE
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 所属部门id
+     * @return deptIdStart
+     */
+    public Long getDeptIdStart(){
+        return this.deptIdStart;
+    }
+
+    /**
+     * 设置 开始 所属部门id
+     * @param deptIdStart
+     */
+    public void setDeptIdStart(Long deptIdStart){
+        this.deptIdStart = deptIdStart;
+    }
+
+    /**
+     * 获取 结束 所属部门id
+     * @return $deptIdEnd
+     */
+    public Long getDeptIdEnd(){
+        return this.deptIdEnd;
+    }
+
+    /**
+     * 设置 结束 所属部门id
+     * @param deptIdEnd
+     */
+    public void setDeptIdEnd(Long deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+    }
+
+    /**
+     * 获取 增加 所属部门id
+     * @return deptIdIncrement
+     */
+    public Long getDeptIdIncrement(){
+        return this.deptIdIncrement;
+    }
+
+    /**
+     * 设置 增加 所属部门id
+     * @param deptIdIncrement
+     */
+    public void setDeptIdIncrement(Long deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+    }
+
+    /**
+     * 获取 所属部门id
+     * @return deptIdList
+     */
+    public List<Long> getDeptIdList(){
+        return this.deptIdList;
+    }
+
+    /**
+     * 设置 所属部门id
+     * @param deptIdList
+     */
+    public void setDeptIdList(List<Long> deptIdList){
+        this.deptIdList = deptIdList;
+    }
+
+    /**
+     * 获取 所属部门id
+     * @return deptIdNotList
+     */
+    public List<Long> getDeptIdNotList(){
+        return this.deptIdNotList;
+    }
+
+    /**
+     * 设置 所属部门id
+     * @param deptIdNotList
+     */
+    public void setDeptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+    }
+
+
+    /**
+     * 获取 所属部门名称
+     * @return deptNameList
+     */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+     * 设置 所属部门名称
+     * @param deptNameList
+     */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
+
+    /**
+     * 获取 所属部门名称
+     * @return deptNameNotList
+     */
+    public List<String> getDeptNameNotList(){
+        return this.deptNameNotList;
+    }
+
+    /**
+     * 设置 所属部门名称
+     * @param deptNameNotList
+     */
+    public void setDeptNameNotList(List<String> deptNameNotList){
+        this.deptNameNotList = deptNameNotList;
+    }
+
+    /**
+     * 获取 开始 所属大厅
+     * @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;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2158,6 +2424,152 @@ public class WindowWorkmanPerformDetailQuery extends WindowWorkmanPerformDetailE
     }
 
 
+    /**
+     * 设置  所属部门id
+     * @param deptId
+     */
+    public WindowWorkmanPerformDetailQuery deptId(Long deptId){
+        setDeptId(deptId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属部门id
+     * @param deptIdStart
+     */
+    public WindowWorkmanPerformDetailQuery deptIdStart(Long deptIdStart){
+        this.deptIdStart = deptIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 所属部门id
+     * @param deptIdEnd
+     */
+    public WindowWorkmanPerformDetailQuery deptIdEnd(Long deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 所属部门id
+     * @param deptIdIncrement
+     */
+    public WindowWorkmanPerformDetailQuery deptIdIncrement(Long deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 所属部门id
+     * @param deptIdList
+     */
+    public WindowWorkmanPerformDetailQuery deptIdList(List<Long> deptIdList){
+        this.deptIdList = deptIdList;
+        return this;
+    }
+
+    /**
+     * 设置 所属部门id
+     * @param deptIdNotList
+     */
+    public WindowWorkmanPerformDetailQuery deptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 所属部门名称
+     * @param deptName
+     */
+    public WindowWorkmanPerformDetailQuery deptName(String deptName){
+        setDeptName(deptName);
+        return this;
+    }
+
+    /**
+     * 设置 所属部门名称
+     * @param deptNameList
+     */
+    public WindowWorkmanPerformDetailQuery deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+        return this;
+    }
+
+    /**
+     * 设置  所属大厅
+     * @param salaId
+     */
+    public WindowWorkmanPerformDetailQuery salaId(Long salaId){
+        setSalaId(salaId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属大厅
+     * @param salaIdStart
+     */
+    public WindowWorkmanPerformDetailQuery salaIdStart(Long salaIdStart){
+        this.salaIdStart = salaIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 所属大厅
+     * @param salaIdEnd
+     */
+    public WindowWorkmanPerformDetailQuery salaIdEnd(Long salaIdEnd){
+        this.salaIdEnd = salaIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 所属大厅
+     * @param salaIdIncrement
+     */
+    public WindowWorkmanPerformDetailQuery salaIdIncrement(Long salaIdIncrement){
+        this.salaIdIncrement = salaIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdList
+     */
+    public WindowWorkmanPerformDetailQuery salaIdList(List<Long> salaIdList){
+        this.salaIdList = salaIdList;
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdNotList
+     */
+    public WindowWorkmanPerformDetailQuery salaIdNotList(List<Long> salaIdNotList){
+        this.salaIdNotList = salaIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 所属大厅名称
+     * @param salaName
+     */
+    public WindowWorkmanPerformDetailQuery salaName(String salaName){
+        setSalaName(salaName);
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅名称
+     * @param salaNameList
+     */
+    public WindowWorkmanPerformDetailQuery 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/resources/sqlmap/module/window/WindowWorkmanPerformDetailMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.window.dao.ibatis.WindowWorkmanPerformDetailDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -22,6 +22,10 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="deptId" column="deptId" />
+        <result property="deptName" column="deptName" />
+        <result property="salaId" column="salaId" />
+        <result property="salaName" column="salaName" />
 
     </resultMap>
 
@@ -80,23 +84,35 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
+                a.deptId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
+                a.deptName,
+            </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="WindowWorkmanPerformDetailEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_window_workman_perform_detail
-        (performId,staffId,staffName,discipline,specification,management,evaluation,efficiency,bonusScore,sumScore,examineLevel,remark,createUserId,createTime,updateUserId,updateTime)
+        (performId,staffId,staffName,discipline,specification,management,evaluation,efficiency,bonusScore,sumScore,examineLevel,remark,createUserId,createTime,updateUserId,updateTime,deptId,deptName,salaId,salaName)
         VALUES
-        (#{performId},#{staffId},#{staffName},#{discipline},#{specification},#{management},#{evaluation},#{efficiency},#{bonusScore},#{sumScore},#{examineLevel},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{performId},#{staffId},#{staffName},#{discipline},#{specification},#{management},#{evaluation},#{efficiency},#{bonusScore},#{sumScore},#{examineLevel},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deptId},#{deptName},#{salaId},#{salaName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_window_workman_perform_detail
-        (performId,staffId,staffName,discipline,specification,management,evaluation,efficiency,bonusScore,sumScore,examineLevel,remark,createUserId,createTime,updateUserId,updateTime)
+        (performId,staffId,staffName,discipline,specification,management,evaluation,efficiency,bonusScore,sumScore,examineLevel,remark,createUserId,createTime,updateUserId,updateTime,deptId,deptName,salaId,salaName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.performId},#{item.staffId},#{item.staffName},#{item.discipline},#{item.specification},#{item.management},#{item.evaluation},#{item.efficiency},#{item.bonusScore},#{item.sumScore},#{item.examineLevel},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.performId},#{item.staffId},#{item.staffName},#{item.discipline},#{item.specification},#{item.management},#{item.evaluation},#{item.efficiency},#{item.bonusScore},#{item.sumScore},#{item.examineLevel},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName})
         </foreach>
     </insert>
 
@@ -190,6 +206,24 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
+                a.deptId=#{data.deptId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deptIdIncrement')) or (colPickMode==1 and !data.containsKey('deptIdIncrement'))">
+                a.deptId=ifnull(a.deptId,0) + #{data.deptIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
+                a.deptName=#{data.deptName},
+            </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
@@ -374,6 +408,44 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="deptId=(case" suffix="ELSE deptId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
+                            when a.id=#{item.id} then #{item.deptId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+                        when a.id=#{item.id} then #{item.deptName}
+                    </if>
+                </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=")">
@@ -913,6 +985,102 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+        <if test="conditionParamRef.containsKey('deptId')">
+            <if test="conditionParamRef.deptId != null ">
+                ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
+            </if>
+            <if test="conditionParamRef.deptId == null">
+                ${_conditionType_} a.deptId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+            ${_conditionType_} a.deptId in
+            <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
+            ${_conditionType_} a.deptId not in
+            <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
+            ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
+            ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('deptName')">
+            <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+                ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
+            </if>
+            <if test="conditionParamRef.deptName == null">
+                ${_conditionType_} a.deptName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
+            ${_conditionType_} a.deptName in
+            <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
+            ${_conditionType_} a.deptName not in
+            <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </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()">
@@ -1008,6 +1176,20 @@
                 </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('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=",">
                     a.${item.colName} ${item.sortKind}
@@ -1107,6 +1289,20 @@
                 </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('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
@@ -1193,6 +1389,26 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('deptId')">
+                    a.deptId
+                    <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deptName')">
+                    a.deptName
+                    <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>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>
 

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

@@ -46,6 +46,10 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="deptId" column="deptId" />
+        <result property="deptName" column="deptName" />
+        <result property="salaId" column="salaId" />
+        <result property="salaName" column="salaName" />
     </resultMap>
 
 
@@ -120,7 +124,7 @@
     <!-- 子表所有列 -->
     <sql id="_columns_sub">
         <trim suffixOverrides="," suffix="">
-            b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
+            b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.deptId,b.deptName,b.salaId,b.salaName
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->

db/add.sql

@@ -1168,3 +1168,8 @@ CREATE TABLE mortals_xhx_perform_error_record(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常记录信息';
+
+ALTER TABLE `mortals_xhx_window_workman_perform_detail` ADD COLUMN `deptId` bigint(20)  COMMENT '所属部门id' AFTER `staffName`,
+ADD COLUMN  `deptName` varchar(256) COMMENT '所属部门名称' AFTER `deptId`,
+ADD COLUMN  `salaId` bigint(20) COMMENT '所属大厅' AFTER `deptName`,
+ADD COLUMN  `salaName` varchar(128) COMMENT '所属大厅名称' AFTER `salaId`;
\ No newline at end of file