Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultAddEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 核查结果(1.加分或扣分,2.不扣分)枚举类
+*
+* @author zxfei
+*/
+public enum CheckResultAddEnum {
+    核查加分("核查加分", "核查加分"),
+    核查不加分("核查不加分", "核查不加分");
+    private String value;
+    private String desc;
+
+    CheckResultAddEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static CheckResultAddEnum getByValue(String value) {
+        for (CheckResultAddEnum checkResultEnum : CheckResultAddEnum.values()) {
+            if (checkResultEnum.getValue() == value) {
+                return checkResultEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (CheckResultAddEnum item : CheckResultAddEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultSubEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 核查结果(1.加分或扣分,2.不扣分)枚举类
+*
+* @author zxfei
+*/
+public enum CheckResultSubEnum {
+    核查扣分("核查扣分", "核查扣分"),
+    核查不扣分("核查不扣分", "核查不扣分");
+    private String value;
+    private String desc;
+
+    CheckResultSubEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static CheckResultSubEnum getByValue(String value) {
+        for (CheckResultSubEnum checkResultEnum : CheckResultSubEnum.values()) {
+            if (checkResultEnum.getValue() == value) {
+                return checkResultEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (CheckResultSubEnum item : CheckResultSubEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

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

@@ -75,11 +75,11 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
     protected void saveAfter(CheckAttendRecordEntity entity, Context context) throws AppException {
         //发送钉钉通知信息
         if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
-            AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
-            ThreadPool.getInstance().execute(attendPostServiceThread);
-           //sendCheckDingTalk(entity);
+/*            AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
+            ThreadPool.getInstance().execute(attendPostServiceThread);*/
+           sendCheckDingTalk(entity);
         }
-     /*   try {
+        try {
             StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
             query.setStaffId(entity.getStaffId());
             query.setCheckTimeStart(DateUtils.getStrDate(entity.getCheckTime()));
@@ -87,7 +87,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
             summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
-        }*/
+        }
     }
 
     @Override
@@ -132,17 +132,16 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
 
 
 
-      //  sendCheckDingTalk(entity);
+
         try {
             CheckAttendRecordEntity temp = this.get(entity.getId());
             if (temp != null) {
-
-                AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
-                ThreadPool.getInstance().execute(attendPostServiceThread);
-
-/*                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+/*                AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
+                ThreadPool.getInstance().execute(attendPostServiceThread);*/
+                sendCheckDingTalk(entity);
+                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
                 query.setStaffId(temp.getStaffId());
-                summaryCheck(query);*/
+                summaryCheck(query);
             }
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

@@ -59,6 +59,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
 
         super.init(model, context);
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java

@@ -51,6 +51,8 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java

@@ -52,6 +52,8 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java

@@ -52,6 +52,8 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java

@@ -52,6 +52,8 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java

 package com.mortals.xhx.module.check.web;
+
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -10,44 +11,51 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.service.CheckReviewRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 评价差评绩效核查信息
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 评价差评绩效核查信息
+ *
+ * @author zxfei
+ * @date 2023-07-11
+ */
 @RestController
 @RequestMapping("check/review/record")
-public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingController<CheckReviewRecordService,CheckReviewRecordEntity,Long> {
+public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingController<CheckReviewRecordService, CheckReviewRecordEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public CheckReviewRecordController(){
-        super.setModuleDesc( "评价差评绩效核查信息");
+    public CheckReviewRecordController() {
+        super.setModuleDesc("评价差评绩效核查信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewResult"));
-        this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource"));
+        this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord", "reviewResult"));
+        this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord", "reviewSource"));
 
         this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
@@ -55,6 +63,8 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
 
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override
@@ -69,6 +79,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
 
     /**
      * 审核
+     *
      * @param entity
      * @return
      */

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

@@ -41,10 +41,10 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         checkAttendRecordEntity.setRecordId(entity.getId());
         if (entity.getSubMethod() == SubMethodEnum.系统自动.getValue()) {
             checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
+            checkAttendRecordEntity.setCheckTime(new Date());
         } else {
             checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
-        checkAttendRecordEntity.setCheckTime(new Date());
         checkAttendRecordService.save(checkAttendRecordEntity, context);
     }
 

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

@@ -40,10 +40,10 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
         checkComplainRecordEntity.setRecordId(entity.getId());
         if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
             checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
+            checkComplainRecordEntity.setCheckTime(new Date());
         }else {
             checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
-        checkComplainRecordEntity.setCheckTime(new Date());
         checkComplainRecordService.save(checkComplainRecordEntity,context);
     }
 

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

@@ -40,10 +40,10 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         checkEffectRecordEntity.setRecordId(entity.getId());
         if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
             checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
+            checkEffectRecordEntity.setCheckTime(new Date());
         }else {
             checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
-        checkEffectRecordEntity.setCheckTime(new Date());
         checkEffectRecordService.save(checkEffectRecordEntity,context);
     }
 

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

@@ -40,10 +40,10 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         checkGoworkRecordEntity.setRecordId(entity.getId());
         if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
             checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
+            checkGoworkRecordEntity.setCheckTime(new Date());
         }else {
             checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
-        checkGoworkRecordEntity.setCheckTime(new Date());
         checkGoworkRecordService.save(checkGoworkRecordEntity,context);
     }
 

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

@@ -40,10 +40,10 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
         checkOtherRecordEntity.setRecordId(entity.getId());
         if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
             checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
+            checkOtherRecordEntity.setCheckTime(new Date());
         }else {
             checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
-        checkOtherRecordEntity.setCheckTime(new Date());
         checkOtherRecordService.save(checkOtherRecordEntity,context);
     }
 

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

@@ -39,12 +39,11 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         checkReviewRecordEntity.setRecordId(entity.getId());
         if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
             checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
+            checkReviewRecordEntity.setCheckTime(new Date());
         }else {
             checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
         }
 
-        //checkReviewRecordEntity.s
-
         checkReviewRecordService.save(checkReviewRecordEntity,context);
     }
 

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

 package com.mortals.xhx.module.staff.model;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffPerformSummaryVo;
 import lombok.Data;
 /**
-* 员工绩效统计实体对象
-*
-* @author zxfei
-* @date 2023-07-14
-*/
+ * 员工绩效统计实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-18
+ */
 @Data
 public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     private static final long serialVersionUID = 1L;
@@ -21,13 +24,20 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
      * 人员id
      */
     private Long staffId;
+    /**
+     * 所属中心
+     */
+    @Excel(name = "所属中心")
+    private String belongCenter;
     /**
      * 工号
      */
+    @Excel(name = "工号")
     private String workNum;
     /**
      * 人员名称
      */
+    @Excel(name = "人员名称")
     private String staffName;
     /**
      * 部门id号
@@ -36,38 +46,47 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 部门名称
      */
+    @Excel(name = "部门名称")
     private String deptName;
     /**
      * 考勤绩效指标分数
      */
+    @Excel(name = "考勤绩效指标分数")
     private BigDecimal attendScore;
     /**
      * 评价绩效指标分数
      */
+    @Excel(name = "评价绩效指标分数")
     private BigDecimal reviewScore;
     /**
      * 投诉绩效指标分数
      */
+    @Excel(name = "投诉绩效指标分数")
     private BigDecimal complainScore;
     /**
      * 办件绩效分数
      */
+    @Excel(name = "办件绩效分数")
     private BigDecimal goworkScore;
     /**
      * 效能绩效分数
      */
+    @Excel(name = "效能绩效分数")
     private BigDecimal effectScore;
     /**
      * 其它绩效分数
      */
+    @Excel(name = "其它绩效分数")
     private BigDecimal otherScore;
     /**
      * 累计异常分数
      */
+    @Excel(name = "累计异常分数")
     private BigDecimal errorScore;
     /**
      * 当月得分数
      */
+    @Excel(name = "当月得分数")
     private BigDecimal totalScore;
     /**
      * 备注
@@ -76,10 +95,12 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 年
      */
+    @Excel(name = "年")
     private Integer year;
     /**
      * 月
      */
+    @Excel(name = "月")
     private Integer month;
     @Override
     public int hashCode() {
@@ -127,8 +148,10 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
 
         this.remark = "";
 
-            this.year = -1;
+        this.year = DateUtil.year(new Date());
+
+        this.month = DateUtil.month(new Date())+1;
 
-            this.month = -1;
+        this.belongCenter = "宜宾市民中心";
     }
 }
\ No newline at end of file

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

@@ -4,11 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
 /**
-* 员工绩效统计查询对象
-*
-* @author zxfei
-* @date 2023-07-14
-*/
+ * 员工绩效统计查询对象
+ *
+ * @author zxfei
+ * @date 2023-07-18
+ */
 public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -267,6 +267,11 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
     /** 更新人id排除列表 */
     private List <Long> updateUserIdNotList;
 
+    /** 所属中心 */
+    private List<String> belongCenterList;
+
+    /** 所属中心排除列表 */
+    private List <String> belongCenterNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffPerformSummaryQuery> orConditionList;
 
@@ -1682,6 +1687,38 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
     }
 
 
+    /**
+     * 获取 所属中心
+     * @return belongCenterList
+     */
+    public List<String> getBelongCenterList(){
+        return this.belongCenterList;
+    }
+
+    /**
+     * 设置 所属中心
+     * @param belongCenterList
+     */
+    public void setBelongCenterList(List<String> belongCenterList){
+        this.belongCenterList = belongCenterList;
+    }
+
+    /**
+     * 获取 所属中心
+     * @return belongCenterNotList
+     */
+    public List<String> getBelongCenterNotList(){
+        return this.belongCenterNotList;
+    }
+
+    /**
+     * 设置 所属中心
+     * @param belongCenterNotList
+     */
+    public void setBelongCenterNotList(List<String> belongCenterNotList){
+        this.belongCenterNotList = belongCenterNotList;
+    }
+
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -2570,6 +2607,25 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
         return this;
     }
 
+
+    /**
+     * 设置 所属中心
+     * @param belongCenter
+     */
+    public StaffPerformSummaryQuery belongCenter(String belongCenter){
+        setBelongCenter(belongCenter);
+        return this;
+    }
+
+    /**
+     * 设置 所属中心
+     * @param belongCenterList
+     */
+    public StaffPerformSummaryQuery belongCenterList(List<String> belongCenterList){
+        this.belongCenterList = belongCenterList;
+        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/staff/StaffPerformSummaryMapper.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.staff.dao.ibatis.StaffPerformSummaryDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -26,6 +26,7 @@
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="updateUserId" column="updateUserId" />
+        <result property="belongCenter" column="belongCenter" />
 
     </resultMap>
 
@@ -96,23 +97,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
                 a.updateUserId,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('belongCenter') or colPickMode == 1 and data.containsKey('belongCenter')))">
+                a.belongCenter,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StaffPerformSummaryEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_staff_perform_summary
-        (staffId,workNum,staffName,deptId,deptName,attendScore,reviewScore,complainScore,goworkScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId)
+        (staffId,workNum,staffName,deptId,deptName,attendScore,reviewScore,complainScore,goworkScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId,belongCenter)
         VALUES
-        (#{staffId},#{workNum},#{staffName},#{deptId},#{deptName},#{attendScore},#{reviewScore},#{complainScore},#{goworkScore},#{effectScore},#{otherScore},#{errorScore},#{totalScore},#{remark},#{year},#{month},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{staffId},#{workNum},#{staffName},#{deptId},#{deptName},#{attendScore},#{reviewScore},#{complainScore},#{goworkScore},#{effectScore},#{otherScore},#{errorScore},#{totalScore},#{remark},#{year},#{month},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{belongCenter})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_staff_perform_summary
-        (staffId,workNum,staffName,deptId,deptName,attendScore,reviewScore,complainScore,goworkScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId)
+        (staffId,workNum,staffName,deptId,deptName,attendScore,reviewScore,complainScore,goworkScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId,belongCenter)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.workNum},#{item.staffName},#{item.deptId},#{item.deptName},#{item.attendScore},#{item.reviewScore},#{item.complainScore},#{item.goworkScore},#{item.effectScore},#{item.otherScore},#{item.errorScore},#{item.totalScore},#{item.remark},#{item.year},#{item.month},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.staffId},#{item.workNum},#{item.staffName},#{item.deptId},#{item.deptName},#{item.attendScore},#{item.reviewScore},#{item.complainScore},#{item.goworkScore},#{item.effectScore},#{item.otherScore},#{item.errorScore},#{item.totalScore},#{item.remark},#{item.year},#{item.month},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.belongCenter})
         </foreach>
     </insert>
 
@@ -224,6 +228,9 @@
             <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
                 a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('belongCenter')) or (colPickMode==1 and !data.containsKey('belongCenter'))">
+                a.belongCenter=#{data.belongCenter},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -446,6 +453,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="belongCenter=(case" suffix="ELSE belongCenter end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('belongCenter')) or (colPickMode==1 and !item.containsKey('belongCenter'))">
+                        when a.id=#{item.id} then #{item.belongCenter}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1081,6 +1095,27 @@
             ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('belongCenter')">
+            <if test="conditionParamRef.belongCenter != null and conditionParamRef.belongCenter != ''">
+                ${_conditionType_} a.belongCenter like #{${_conditionParam_}.belongCenter}
+            </if>
+            <if test="conditionParamRef.belongCenter == null">
+                ${_conditionType_} a.belongCenter is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('belongCenterList') and conditionParamRef.belongCenterList.size() > 0">
+            ${_conditionType_} a.belongCenter in
+            <foreach collection="conditionParamRef.belongCenterList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('belongCenterNotList') and conditionParamRef.belongCenterNotList.size() > 0">
+            ${_conditionType_} a.belongCenter not in
+            <foreach collection="conditionParamRef.belongCenterNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1199,6 +1234,11 @@
                     <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('belongCenter')">
+                    a.belongCenter
+                    <if test='orderCol.belongCenter != null and "DESC".equalsIgnoreCase(orderCol.belongCenter)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

db/add.sql

@@ -767,3 +767,5 @@ ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `goTimes` int(9)   default
 ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `morningTimes` int(9) default 0   COMMENT '上午缺卡次数' AFTER goTimes;
 ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `afternoonTimes` int(9) default 0    COMMENT '下午缺卡次数' AFTER morningTimes;
 
+
+ALTER TABLE mortals_xhx_staff_perform_summary ADD COLUMN     `belongCenter` varchar(512)    DEFAULT '宜宾市民中心'  COMMENT '所属中心' AFTER staffName;