Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -252,7 +252,27 @@ export default {
     this.$route.name == "attendance/stat/list"
       ? (this.visible = true)
       : (this.visible = false);
-    this.$route.name == "attendance/stat/list" ? this.getArr() : "";
+    if (
+      this.$route.name == "attendance/stat/list" ||
+      this.$route.name == "check/window/perform/list" ||
+      this.$route.name == "check/window/workman/perform/list" ||
+      this.$route.name == "check/attend/record/list" ||
+      this.$route.name == "check/review/record/list" ||
+      this.$route.name == "check/complain/record/list" ||
+      this.$route.name == "check/gowork/record/list" ||
+      this.$route.name == "check/effect/record/list" ||
+      this.$route.name == "window/perform/list" ||
+      this.$route.name == "window/workman/perform/list" ||
+      this.$route.name == "perform/attend/record/list" ||
+      this.$route.name == "perform/review/record/list" ||
+      this.$route.name == "perform/complain/record/list" ||
+      this.$route.name == "perform/gowork/record/list" ||
+      this.$route.name == "perform/effect/record/list" ||
+      this.$route.name == "staff/perform/summary/list"
+    ) {
+      this.getArr();
+    }
+
     this.initForm(this.$route.query);
   },
   methods: {

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -175,6 +175,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -202,6 +208,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue

@@ -176,6 +176,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -209,6 +215,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
@@ -216,7 +224,7 @@ export default {
             prop: "complainTitle",
             formatter: this.formatter,
           },
-
+          
           {
             label: "投诉内容",
             prop: "complainContent",

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -176,6 +176,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -204,6 +210,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue

@@ -176,6 +176,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -203,6 +209,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           { label: "办件编码", prop: "goworkCode", formatter: this.formatter },

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -175,6 +175,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -202,6 +208,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue

@@ -175,6 +175,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -208,6 +214,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -78,6 +78,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -122,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -79,6 +79,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -123,7 +129,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue

@@ -192,7 +192,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -177,6 +177,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "processStatus",
             type: "select",
@@ -209,6 +215,7 @@ export default {
           { label: "姓名", prop: "staffName", formatter: this.formatter },
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue

@@ -245,7 +245,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -216,6 +222,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue

@@ -220,7 +220,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -184,6 +184,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -212,6 +218,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue

@@ -197,7 +197,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -210,6 +216,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           { label: "办件编码", prop: "goworkCode", formatter: this.formatter },

attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue

@@ -156,7 +156,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -210,6 +216,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           // {

attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue

@@ -210,7 +210,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -216,6 +222,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -269,7 +269,7 @@ export default {
 
     handleNodeClick(node) {
       this.currentNode = node;
-      this.query = { deptId: node.id };
+      this.query = Object.assign({}, { deptId: node.id }, this.query);
       this.getData();
     },
     doExport() {

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -84,6 +84,13 @@ export default {
             fuzzy: false,
           },
 
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
+
           {
             name: "deptId",
             type: "select",
@@ -108,6 +115,8 @@ export default {
 
           { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
           {
             label: "所属中心",

attendance-performance-manager-ui/admin/src/views/window/perform/list.vue

@@ -80,6 +80,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -124,7 +130,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/window/workman/perform/list.vue

@@ -78,6 +78,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -122,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

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/AttendanceStatMapperExt.xml

@@ -10,7 +10,7 @@
         s.staffName,
         s.deptId,
         s.deptName,
-        s.phoneNumer,
+        MAX(s.phoneNumer) as phoneNumer,
         s.salaId,
         s.salaName,
         count(1) as workDays,
@@ -69,9 +69,8 @@
         s.deptId,
         s.deptName,
         s.staffId,
-        s.staffName,
-        s.phoneNumer
-        ) AS a
+        s.staffName
+        ) AS a ORDER BY a.salaName,a.deptName,a.staffName
     </select>
 
     <select id="getListCountExt" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="int">
@@ -82,7 +81,7 @@
         s.staffName,
         s.deptId,
         s.deptName,
-        s.phoneNumer,
+        MAX(s.phoneNumer) as phoneNumer,
         s.salaId,
         s.salaName,
         ROUND(IFNULL(sum(s.goTimes),0)/count(1),4) as attendanceRate,
@@ -140,8 +139,7 @@
         s.deptId,
         s.deptName,
         s.staffId,
-        s.staffName,
-        s.phoneNumer
+        s.staffName
         ) AS a
     </select>
 </mapper>
\ No newline at end of file

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_attend_record
-        WHERE auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_complain_record
-        WHERE auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_effect_record
-        WHERE auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_gowork_record
-        WHERE auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_other_record
-        WHERE auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_review_record
-        WHERE auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>