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

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -86,6 +86,11 @@ public class UserEntity extends UserVo implements IUser {
      */
     private String lastLoginAddress;
 
+    /**
+     * 员工id
+     */
+    private Long customerId;
+
 
 
     public UserEntity(){}
@@ -253,7 +258,7 @@ public class UserEntity extends UserVo implements IUser {
 
     @Override
     public Long getCustomerId() {
-        return null;
+        return this.customerId;
     }
 
     @Override
@@ -358,7 +363,9 @@ public class UserEntity extends UserVo implements IUser {
     }
 
 
-
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
 
     @Override
     public int hashCode() {

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/FeedbackReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+
+@Data
+public class FeedbackReq extends BaseReq {
+
+    //反馈开始时间
+    private String feedBackStartDate;
+    //反馈结束时间
+    private String feedBackEndDate;
+
+    //反馈状态（1.未反馈，2.已反馈）
+    private Integer feedbackStatus;
+    //详细
+    private Long Id;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java

@@ -55,5 +55,10 @@ public class PerformInfo {
      */
     private BigDecimal score;
 
+    /**
+     * 类型
+     */
+    private String performType;
+
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java

@@ -40,7 +40,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 
 @RestController
 @Slf4j
-@RequestMapping("/api/v1/")
+@RequestMapping("/api/v1/login")
 public class ApiLoginController extends BaseJsonBodyController {
 
     @Autowired

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@RequestMapping("/api/v1/")
+@RequestMapping("/api/v1/appeal")
 public class AppealApiController extends BaseJsonBodyController {
 
     @Autowired

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java

+package com.mortals.xhx.busiz.web;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.busiz.req.AppealReq;
+import com.mortals.xhx.busiz.req.FeedbackReq;
+import com.mortals.xhx.busiz.rsp.AppealStatInfo;
+import com.mortals.xhx.module.check.service.*;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * h5 申诉
+ *
+ * @author: zxfei
+ * @date: 2023/7/7 15:08
+ */
+@RestController
+@Slf4j
+@RequestMapping("/api/v1/feedback")
+public class FeedbackApiController extends BaseJsonBodyController {
+
+    @Autowired
+    private CheckAttendRecordService checkAttendRecordService;
+    @Autowired
+    private CheckReviewRecordService checkReviewRecordService;
+    @Autowired
+    private CheckComplainRecordService checkComplainRecordService;
+    @Autowired
+    private CheckEffectRecordService checkEffectRecordService;
+    @Autowired
+    private CheckGoworkRecordService checkGoworkRecordService;
+    @Autowired
+    private CheckOtherRecordService checkOtherRecordService;
+
+    /**
+     * 反馈列表
+     */
+    @PostMapping(value = "feedback/list")
+    public Rest<List<PerformAttendAppealEntity>> feedbackList(@RequestBody FeedbackReq feedbackReq) {
+        String busiDesc = "个人反馈列表";
+        Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(feedbackReq.getFeedbackStatus())) {
+                //未设置时间的情况，默认为当月
+                feedbackReq.setFeedBackStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
+                feedbackReq.setFeedBackEndDate(DateUtil.today());
+            }
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 反馈详细
+     */
+    @PostMapping(value = "feedback/question")
+    public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
+        String busiDesc = "个人申诉详细";
+        Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(appealReq.getId())) {
+                throw new AppException("详细查询id不能为空!");
+            }
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 申诉新增
+     */
+    @PostMapping(value = "appeal/save")
+    public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
+        String busiDesc = "个人申诉新增";
+        Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    public static void main(String[] args) {
+
+    }
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
-@RequestMapping("/api/v1/")
+@RequestMapping("/api/v1/perform")
 public class PerformApiController extends BaseJsonBodyController {
 
     @Autowired

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/***
+ * 核查类型枚举(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
+ */
+public enum CheckTypeEnum {
+    考勤绩效(1, "考勤绩效"),
+    效能绩效(2, "效能绩效"),
+    评价绩效(3, "评价绩效"),
+    办件绩效(4, "办件绩效"),
+    差评绩效(5, "差评绩效"),
+    其它绩效(6, "其它绩效"),
+    ;
+    private Integer value;
+    private String desc;
+
+    CheckTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static CheckTypeEnum getByValue(Integer value) {
+        for (CheckTypeEnum checkTypeEnum : CheckTypeEnum.values()) {
+            if (checkTypeEnum.getValue() == value) {
+                return checkTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取Map集合
+     *
+     * @param eItem 不包含项
+     * @return
+     */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (CheckTypeEnum item : CheckTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAllRecordDao.java

+package com.mortals.xhx.module.check.dao;
+
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+
+import java.util.List;
+
+/**
+ * 全部类型核查信息Dao
+ */
+public interface CheckAllRecordDao {
+
+    List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAllRecordDaoImpl.java

+package com.mortals.xhx.module.check.dao.ibatis;
+
+import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.support.SqlSessionDaoSupport;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 全部类型核查信息Dao
+ */
+@Repository("checkAllRecordDao")
+public class CheckAllRecordDaoImpl extends SqlSessionDaoSupport implements CheckAllRecordDao {
+
+    protected String namespace = this.getClass().getName();
+
+    @Autowired
+    public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
+        super.setSqlSessionFactory(sqlSessionFactory);
+    }
+
+    protected String getSqlId(String id) {
+        return this.namespace + "." + id;
+    }
+
+    @Override
+    public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getList"), query);
+    }
+}

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

+package com.mortals.xhx.module.check.model;
+
+import lombok.Data;
+
+@Data
+public class CheckAllRecordQuery {
+    /**
+     * 员工ID
+     */
+    private Long staffId;
+    /**
+     * 处理状态(1.未处理,2.已处理)
+     */
+    private Integer checkStatus;
+
+    private String createTimeStart;
+
+    private String createTimeEnd;
+
+    private Long createUserId;
+}

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

@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
 import lombok.Data;
 /**
- * 考勤绩效记录核查信息实体对象
- *
- * @author zxfei
- * @date 2023-07-07
- */
+* 考勤绩效记录核查信息实体对象
+*
+* @author zxfei
+* @date 2023-07-08
+*/
 @Data
 public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     private static final long serialVersionUID = 1L;
@@ -113,6 +113,21 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
     */
     private Integer subMethod;
+    /**
+    * 说明
+    */
+    @Excel(name = "说明")
+    private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -176,5 +191,11 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
             this.checkStatus = 1;
 
             this.subMethod = 1;
+
+            this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 /**
- * 考勤绩效记录核查信息查询对象
- *
- * @author zxfei
- * @date 2023-07-07
- */
+* 考勤绩效记录核查信息查询对象
+*
+* @author zxfei
+* @date 2023-07-08
+*/
 public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -277,6 +277,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */
     private List <Integer> subMethodNotList;
 
+    /** 说明 */
+    private List<String> remarkList;
+
+    /** 说明排除列表 */
+    private List <String> remarkNotList;
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckAttendRecordQuery> orConditionList;
 
@@ -1769,6 +1784,102 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
 
+    /**
+    * 获取 说明
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 说明
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 说明
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 说明
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2613,6 +2724,63 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
         return this;
         }
 
+
+	/**
+    * 设置 说明
+    * @param remark
+    */
+    public CheckAttendRecordQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 说明
+    * @param remarkList
+    */
+    public CheckAttendRecordQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public CheckAttendRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public CheckAttendRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public CheckAttendRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public CheckAttendRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/check/model/CheckComplainRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价绩效投诉核查信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckComplainRecordEntity extends CheckComplainRecordVo {
@@ -29,14 +29,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
     */
+    @Excel(name = "工号")
     private String workNum;
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -45,14 +48,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
     * 投诉标题
     */
+    @Excel(name = "投诉标题")
     private String complainTitle;
     /**
     * 投诉内容
     */
+    @Excel(name = "投诉内容")
     private String complainContent;
     /**
     * 投诉人真实姓名
@@ -61,6 +67,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     /**
     * 联系电话
     */
+    @Excel(name = "联系电话")
     private String contact;
     /**
     * 投诉时间
@@ -89,6 +96,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -101,6 +109,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     /**
     * 核查人员
     */
+    @Excel(name = "核查人员")
     private String checkPerson;
     /**
     * 核查时间
@@ -109,10 +118,12 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     /**
     * 核查说明
     */
+    @Excel(name = "核查说明")
     private String checkDesc;
     /**
     * 核查结果
     */
+    @Excel(name = "核查结果")
     private String checkResult;
     /**
     * 处理状态(1.未处理,2.已处理)
@@ -122,6 +133,16 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -191,5 +212,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
             this.checkStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 * 评价绩效投诉核查信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -271,6 +271,16 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckComplainRecordQuery> orConditionList;
 
@@ -1761,6 +1771,70 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2610,6 +2684,44 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public CheckComplainRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public CheckComplainRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public CheckComplainRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public CheckComplainRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/check/model/CheckEffectRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 效能绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckEffectRecordEntity extends CheckEffectRecordVo {
@@ -29,14 +29,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
     */
+    @Excel(name = "工号")
     private String workNum;
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -45,14 +48,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
     * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
     */
+    @Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
     private Integer irregularType;
     /**
     * 发生时间
     */
+    @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date happenTime;
     /**
     * 持续时间，秒
@@ -81,6 +87,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -93,6 +100,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     /**
     * 核查人员
     */
+    @Excel(name = "核查人员")
     private String checkPerson;
     /**
     * 核查时间
@@ -101,10 +109,12 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     /**
     * 核查说明
     */
+    @Excel(name = "核查说明")
     private String checkDesc;
     /**
     * 核查结果
     */
+    @Excel(name = "核查结果")
     private String checkResult;
     /**
     * 处理状态(1.未处理,2.已处理)
@@ -114,6 +124,16 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -179,5 +199,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
             this.checkStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 * 效能绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -282,6 +282,16 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckEffectRecordQuery> orConditionList;
 
@@ -1806,6 +1816,70 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2669,6 +2743,44 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public CheckEffectRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public CheckEffectRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public CheckEffectRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public CheckEffectRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/check/model/CheckGoworkRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 办件绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
@@ -29,6 +29,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
@@ -37,6 +38,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -45,22 +47,27 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
     * 办件编码
     */
+    @Excel(name = "办件编码")
     private String goworkCode;
     /**
     * 办件所属部门
     */
+    @Excel(name = "办件所属部门")
     private String goworkDepts;
     /**
     * 事项名称
     */
+    @Excel(name = "事项名称")
     private String matterlName;
     /**
     * 办理时间
     */
+    @Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date goworkTime;
     /**
     * 绩效规则id
@@ -69,6 +76,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
     private String ruleName;
     /**
     * 扣分方式(1.系统自动,2.人工添加)
@@ -77,6 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -85,10 +94,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 扣分或增加分值
     */
+    @Excel(name = "扣分或增加分值")
     private BigDecimal score;
     /**
     * 核查人员
     */
+    @Excel(name = "核查人员")
     private String checkPerson;
     /**
     * 核查时间
@@ -97,10 +108,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     /**
     * 核查说明
     */
+    @Excel(name = "核查说明")
     private String checkDesc;
     /**
     * 核查结果
     */
+    @Excel(name = "核查结果")
     private String checkResult;
     /**
     * 处理状态(1.未处理,2.已处理)
@@ -110,6 +123,16 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -173,5 +196,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
             this.checkStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 * 办件绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -256,6 +256,16 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckGoworkRecordQuery> orConditionList;
 
@@ -1650,6 +1660,70 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2442,6 +2516,44 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public CheckGoworkRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public CheckGoworkRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public CheckGoworkRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public CheckGoworkRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/check/model/CheckOtherRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 其它绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckOtherRecordEntity extends CheckOtherRecordVo {
@@ -89,6 +89,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
     /**
     * 核查人员
     */
+    @Excel(name = "核查人员")
     private String checkPerson;
     /**
     * 核查时间
@@ -97,10 +98,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
     /**
     * 核查说明
     */
+    @Excel(name = "核查说明")
     private String checkDesc;
     /**
     * 核查结果
     */
+    @Excel(name = "核查结果")
     private String checkResult;
     /**
     * 处理状态(1.未处理,2.已处理)
@@ -110,6 +113,16 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -173,5 +186,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
             this.checkStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 * 其它绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -276,6 +276,16 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckOtherRecordQuery> orConditionList;
 
@@ -1768,6 +1778,70 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2630,6 +2704,44 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public CheckOtherRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public CheckOtherRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public CheckOtherRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public CheckOtherRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/check/model/CheckReviewRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价差评绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckReviewRecordEntity extends CheckReviewRecordVo {
@@ -29,14 +29,17 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
     */
+    @Excel(name = "工号")
     private String workNum;
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -57,6 +60,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     /**
     * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
     */
+    @Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
     private String reviewSource;
     /**
     * 评价设备
@@ -69,6 +73,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
     private String ruleName;
     /**
     * 扣分方式(1.系统自动,2.人工添加)
@@ -77,6 +82,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -85,10 +91,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     /**
     * 扣分或增加分值
     */
+    @Excel(name = "扣分或增加分值")
     private BigDecimal score;
     /**
     * 核查人员
     */
+    @Excel(name = "核查人员")
     private String checkPerson;
     /**
     * 核查时间
@@ -97,10 +105,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     /**
     * 核查说明
     */
+    @Excel(name = "核查说明")
     private String checkDesc;
     /**
     * 核查结果
     */
+    @Excel(name = "核查结果")
     private String checkResult;
     /**
     * 处理状态(1.未处理,2.已处理)
@@ -110,6 +120,16 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -173,5 +193,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
             this.checkStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 * 评价差评绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -266,6 +266,16 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckReviewRecordQuery> orConditionList;
 
@@ -1709,6 +1719,70 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2536,6 +2610,44 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public CheckReviewRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public CheckReviewRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public CheckReviewRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public CheckReviewRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/check/model/vo/CheckAllRecordVo.java

+package com.mortals.xhx.module.check.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 全部类型核查信息视图对象
+ */
+@Data
+public class CheckAllRecordVo extends BaseEntityLong {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录ID
+     */
+    private Long recordId;
+    /**
+     * 员工ID
+     */
+    private Long staffId;
+    /**
+     * 员工姓名
+     */
+    private String staffName;
+    /**
+     * 工号
+     */
+    private String workNum;
+    /**
+     * 所属部门
+     */
+    private Long deptId;
+    /**
+     * 所属部门名称
+     */
+    private String deptName;
+    /**
+     * 绩效规则id
+     */
+    private Long ruleId;
+    /**
+     * 规则名称
+     */
+    private String ruleName;
+    /**
+     * 增减类型(1.增加,2.扣除)
+     */
+    private Integer subAddType;
+    /**
+     * 扣分或增加分值
+     */
+    private BigDecimal score;
+    /**
+     * 核查时间
+     */
+    private Date checkTime;
+    /**
+     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     */
+    private Integer subMethod;
+    /**
+     * 扣分时间
+     */
+    private Date deductTime;
+    /**
+     * 核查类型(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
+     */
+    private Integer checkType;
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java

 package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 考勤绩效记录核查信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckAttendRecordVo extends BaseEntityLong {
 
-        /**
-        * 核查人员
-        */
-        @Excel(name = "核查人员")
-        private String checkPerson;
-        /**
-        * 核查说明
-        */
-        @Excel(name = "核查说明")
-        private String checkDesc;
-        /**
-        * 核查结果
-        */
-        @Excel(name = "核查结果")
-        private String checkResult;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java

 package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 评价绩效投诉核查信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckComplainRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 工号
-        */
-        @Excel(name = "工号")
-        private String workNum;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 所属部门名称
-        */
-        @Excel(name = "所属部门名称")
-        private String deptName;
-        /**
-        * 投诉标题
-        */
-        @Excel(name = "投诉标题")
-        private String complainTitle;
-        /**
-        * 投诉内容
-        */
-        @Excel(name = "投诉内容")
-        private String complainContent;
-        /**
-        * 联系电话
-        */
-        @Excel(name = "联系电话")
-        private String contact;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 核查人员
-        */
-        @Excel(name = "核查人员")
-        private String checkPerson;
-        /**
-        * 核查说明
-        */
-        @Excel(name = "核查说明")
-        private String checkDesc;
-        /**
-        * 核查结果
-        */
-        @Excel(name = "核查结果")
-        private String checkResult;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java

 package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 效能绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckEffectRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 工号
-        */
-        @Excel(name = "工号")
-        private String workNum;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 所属部门名称
-        */
-        @Excel(name = "所属部门名称")
-        private String deptName;
-        /**
-        * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
-        */
-        @Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
-        private Integer irregularType;
-        /**
-        * 发生时间
-        */
-        @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
-        private Date happenTime;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 核查人员
-        */
-        @Excel(name = "核查人员")
-        private String checkPerson;
-        /**
-        * 核查说明
-        */
-        @Excel(name = "核查说明")
-        private String checkDesc;
-        /**
-        * 核查结果
-        */
-        @Excel(name = "核查结果")
-        private String checkResult;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java

 package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 办件绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckGoworkRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 所属部门名称
-        */
-        @Excel(name = "所属部门名称")
-        private String deptName;
-        /**
-        * 办件编码
-        */
-        @Excel(name = "办件编码")
-        private String goworkCode;
-        /**
-        * 办件所属部门
-        */
-        @Excel(name = "办件所属部门")
-        private String goworkDepts;
-        /**
-        * 事项名称
-        */
-        @Excel(name = "事项名称")
-        private String matterlName;
-        /**
-        * 办理时间
-        */
-        @Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
-        private Date goworkTime;
-        /**
-        * 规则名称
-        */
-        @Excel(name = "规则名称")
-        private String ruleName;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 扣分或增加分值
-        */
-        @Excel(name = "扣分或增加分值")
-        private BigDecimal score;
-        /**
-        * 核查人员
-        */
-        @Excel(name = "核查人员")
-        private String checkPerson;
-        /**
-        * 核查说明
-        */
-        @Excel(name = "核查说明")
-        private String checkDesc;
-        /**
-        * 核查结果
-        */
-        @Excel(name = "核查结果")
-        private String checkResult;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java

 package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 其它绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckOtherRecordVo extends BaseEntityLong {
 
-        /**
-        * 核查人员
-        */
-        @Excel(name = "核查人员")
-        private String checkPerson;
-        /**
-        * 核查说明
-        */
-        @Excel(name = "核查说明")
-        private String checkDesc;
-        /**
-        * 核查结果
-        */
-        @Excel(name = "核查结果")
-        private String checkResult;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java

 package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 评价差评绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class CheckReviewRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 工号
-        */
-        @Excel(name = "工号")
-        private String workNum;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
-        */
-        @Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
-        private String reviewSource;
-        /**
-        * 规则名称
-        */
-        @Excel(name = "规则名称")
-        private String ruleName;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 扣分或增加分值
-        */
-        @Excel(name = "扣分或增加分值")
-        private BigDecimal score;
-        /**
-        * 核查人员
-        */
-        @Excel(name = "核查人员")
-        private String checkPerson;
-        /**
-        * 核查说明
-        */
-        @Excel(name = "核查说明")
-        private String checkDesc;
-        /**
-        * 核查结果
-        */
-        @Excel(name = "核查结果")
-        private String checkResult;
-
-
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.check.service;
+
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+
+import java.util.List;
+
+/**
+ * 全部类型核查信息Dao
+ */
+public interface CheckAllRecordService {
+
+    List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
+}

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

+package com.mortals.xhx.module.check.service.impl;
+
+import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+import com.mortals.xhx.module.check.service.CheckAllRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("checkAllRecordService")
+@Slf4j
+public class CheckAllRecordServiceImpl implements CheckAllRecordService {
+
+    @Autowired
+    private CheckAllRecordDao checkAllRecordDao;
+
+    @Override
+    public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
+        return checkAllRecordDao.getAllCheckRecord(query);
+    }
+}

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

+package com.mortals.xhx.module.check.web;
+
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+import com.mortals.xhx.module.check.service.CheckAllRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 全部类型核查信息Dao
+ */
+@RestController
+@RequestMapping("check/all/record")
+public class CheckAllRecordController extends BaseJsonBodyController {
+
+    @Autowired
+    private CheckAllRecordService checkAllRecordService;
+
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+    }
+
+    @PostMapping({"list"})
+    @UnAuth
+    public Rest<Object> list(@RequestBody CheckAllRecordQuery query) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询所以类型绩效核查信息";
+
+        int code=1;
+        try {
+
+            List<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query);
+
+            model.put("data", result);
+
+            model.put("message_info", busiDesc + "成功");
+            if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
+                this.recordSysLog(this.request, busiDesc + " 【成功】");
+            }
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+}

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 考勤绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformAttendRecordEntity extends PerformAttendRecordVo {
@@ -81,6 +81,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -102,6 +103,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -161,5 +172,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
             this.processStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 * 考勤绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -257,6 +257,16 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformAttendRecordQuery> orConditionList;
 
@@ -1636,6 +1646,70 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2407,6 +2481,44 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public PerformAttendRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public PerformAttendRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public PerformAttendRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public PerformAttendRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/perform/model/PerformComplainRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价绩效投诉记录信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformComplainRecordEntity extends PerformComplainRecordVo {
@@ -25,14 +25,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
     */
+    @Excel(name = "工号")
     private String workNum;
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -41,14 +44,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
     * 投诉标题
     */
+    @Excel(name = "投诉标题")
     private String complainTitle;
     /**
     * 投诉内容
     */
+    @Excel(name = "投诉内容")
     private String complainContent;
     /**
     * 投诉人真实姓名
@@ -57,6 +63,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     /**
     * 联系电话
     */
+    @Excel(name = "联系电话")
     private String contact;
     /**
     * 投诉时间
@@ -85,6 +92,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -97,11 +105,22 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     /**
     * 处理状态(1.未核查,2.已核查)
     */
+    @Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
     private Integer processStatus;
     /**
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -161,5 +180,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
             this.processStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 * 评价绩效投诉记录信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -235,6 +235,16 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformComplainRecordQuery> orConditionList;
 
@@ -1516,6 +1526,70 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2253,6 +2327,44 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public PerformComplainRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public PerformComplainRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public PerformComplainRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public PerformComplainRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/perform/model/PerformEffectRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 效能绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformEffectRecordEntity extends PerformEffectRecordVo {
@@ -25,14 +25,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
     */
+    @Excel(name = "工号")
     private String workNum;
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -41,14 +44,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
     /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
     * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
     */
+    @Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
     private Integer irregularType;
     /**
     * 发生时间
     */
+    @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date happenTime;
     /**
     * 持续时间，秒
@@ -77,6 +83,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -89,11 +96,22 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
     /**
     * 处理状态(1.未核查,2.已核查)
     */
+    @Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
     private Integer processStatus;
     /**
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -149,5 +167,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
             this.processStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
 * 效能绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -246,6 +246,16 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformEffectRecordQuery> orConditionList;
 
@@ -1561,6 +1571,70 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2312,6 +2386,44 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public PerformEffectRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public PerformEffectRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public PerformEffectRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public PerformEffectRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/perform/model/PerformGoworkRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 办件绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
@@ -25,6 +25,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
@@ -33,6 +34,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -41,22 +43,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
     * 办件编码
     */
+    @Excel(name = "办件编码")
     private String goworkCode;
     /**
     * 办件所属部门
     */
+    @Excel(name = "办件所属部门")
     private String goworkDepts;
     /**
     * 事项名称
     */
+    @Excel(name = "事项名称")
     private String matterlName;
     /**
     * 办理时间
     */
+    @Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date goworkTime;
     /**
     * 绩效规则id
@@ -65,6 +72,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
     private String ruleName;
     /**
     * 扣分方式(1.系统自动,2.人工添加)
@@ -73,6 +81,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -81,15 +90,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     /**
     * 扣分或增加分值
     */
+    @Excel(name = "扣分或增加分值")
     private BigDecimal score;
     /**
     * 处理状态(1.未核查,2.已核查)
     */
+    @Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
     private Integer processStatus;
     /**
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -143,5 +164,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
             this.processStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
 * 办件绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -220,6 +220,16 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformGoworkRecordQuery> orConditionList;
 
@@ -1405,6 +1415,70 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2085,6 +2159,44 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public PerformGoworkRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public PerformGoworkRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public PerformGoworkRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public PerformGoworkRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/perform/model/PerformOtherRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 其它绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformOtherRecordEntity extends PerformOtherRecordVo {
@@ -90,6 +90,16 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -143,5 +153,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
             this.processStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
 * 其它绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -240,6 +240,16 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformOtherRecordQuery> orConditionList;
 
@@ -1523,6 +1533,70 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2273,6 +2347,44 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public PerformOtherRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public PerformOtherRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public PerformOtherRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public PerformOtherRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/perform/model/PerformReviewRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价差评绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformReviewRecordEntity extends PerformReviewRecordVo {
@@ -25,14 +25,17 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
     * 工号
     */
+    @Excel(name = "工号")
     private String workNum;
     /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
     private String windowNum;
     /**
     * 所属部门
@@ -53,6 +56,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     /**
     * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
     */
+    @Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
     private String reviewSource;
     /**
     * 评价设备
@@ -65,6 +69,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
     private String ruleName;
     /**
     * 扣分方式(1.系统自动,2.人工添加)
@@ -73,6 +78,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     /**
     * 扣分人员
     */
+    @Excel(name = "扣分人员")
     private String deductPerson;
     /**
     * 扣分时间
@@ -81,6 +87,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     /**
     * 扣分或增加分值
     */
+    @Excel(name = "扣分或增加分值")
     private BigDecimal score;
     /**
     * 处理状态(1.未核查,2.已核查)
@@ -90,6 +97,16 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     * 备注
     */
     private String remark;
+    /**
+    * 附件名称，多个逗号分割
+    */
+    @Excel(name = "附件名称，多个逗号分割")
+    private String fileNames;
+    /**
+    * 附件下载地址，多个逗号分割
+    */
+    @Excel(name = "附件下载地址，多个逗号分割")
+    private String filePaths;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -143,5 +160,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
             this.processStatus = 1;
 
             this.remark = "";
+
+            this.fileNames = "";
+
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
 * 评价差评绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -230,6 +230,16 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 附件名称，多个逗号分割 */
+    private List<String> fileNamesList;
+
+    /** 附件名称，多个逗号分割排除列表 */
+    private List <String> fileNamesNotList;
+    /** 附件下载地址，多个逗号分割 */
+    private List<String> filePathsList;
+
+    /** 附件下载地址，多个逗号分割排除列表 */
+    private List <String> filePathsNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformReviewRecordQuery> orConditionList;
 
@@ -1464,6 +1474,70 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesList
+    */
+    public List<String> getFileNamesList(){
+        return this.fileNamesList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public void setFileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+    }
+
+    /**
+    * 获取 附件名称，多个逗号分割
+    * @return fileNamesNotList
+    */
+    public List<String> getFileNamesNotList(){
+        return this.fileNamesNotList;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesNotList
+    */
+    public void setFileNamesNotList(List<String> fileNamesNotList){
+        this.fileNamesNotList = fileNamesNotList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsList
+    */
+    public List<String> getFilePathsList(){
+        return this.filePathsList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public void setFilePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+    }
+
+    /**
+    * 获取 附件下载地址，多个逗号分割
+    * @return filePathsNotList
+    */
+    public List<String> getFilePathsNotList(){
+        return this.filePathsNotList;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsNotList
+    */
+    public void setFilePathsNotList(List<String> filePathsNotList){
+        this.filePathsNotList = filePathsNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2179,6 +2253,44 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
         }
 
 
+
+	/**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNames
+    */
+    public PerformReviewRecordQuery fileNames(String fileNames){
+        setFileNames(fileNames);
+		return this;
+    }
+
+    /**
+    * 设置 附件名称，多个逗号分割
+    * @param fileNamesList
+    */
+    public PerformReviewRecordQuery fileNamesList(List<String> fileNamesList){
+        this.fileNamesList = fileNamesList;
+		return this;
+    }
+
+
+	/**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePaths
+    */
+    public PerformReviewRecordQuery filePaths(String filePaths){
+        setFilePaths(filePaths);
+		return this;
+    }
+
+    /**
+    * 设置 附件下载地址，多个逗号分割
+    * @param filePathsList
+    */
+    public PerformReviewRecordQuery filePathsList(List<String> filePathsList){
+        this.filePathsList = filePathsList;
+		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/perform/model/vo/PerformAttendRecordVo.java

 package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 考勤绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformAttendRecordVo extends BaseEntityLong {
 
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java

 package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 评价绩效投诉记录信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformComplainRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 工号
-        */
-        @Excel(name = "工号")
-        private String workNum;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 所属部门名称
-        */
-        @Excel(name = "所属部门名称")
-        private String deptName;
-        /**
-        * 投诉标题
-        */
-        @Excel(name = "投诉标题")
-        private String complainTitle;
-        /**
-        * 投诉内容
-        */
-        @Excel(name = "投诉内容")
-        private String complainContent;
-        /**
-        * 联系电话
-        */
-        @Excel(name = "联系电话")
-        private String contact;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 处理状态(1.未核查,2.已核查)
-        */
-        @Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
-        private Integer processStatus;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java

 package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 效能绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformEffectRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 工号
-        */
-        @Excel(name = "工号")
-        private String workNum;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 所属部门名称
-        */
-        @Excel(name = "所属部门名称")
-        private String deptName;
-        /**
-        * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
-        */
-        @Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
-        private Integer irregularType;
-        /**
-        * 发生时间
-        */
-        @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
-        private Date happenTime;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 处理状态(1.未核查,2.已核查)
-        */
-        @Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
-        private Integer processStatus;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java

 package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 办件绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformGoworkRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 所属部门名称
-        */
-        @Excel(name = "所属部门名称")
-        private String deptName;
-        /**
-        * 办件编码
-        */
-        @Excel(name = "办件编码")
-        private String goworkCode;
-        /**
-        * 办件所属部门
-        */
-        @Excel(name = "办件所属部门")
-        private String goworkDepts;
-        /**
-        * 事项名称
-        */
-        @Excel(name = "事项名称")
-        private String matterlName;
-        /**
-        * 办理时间
-        */
-        @Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
-        private Date goworkTime;
-        /**
-        * 规则名称
-        */
-        @Excel(name = "规则名称")
-        private String ruleName;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 扣分或增加分值
-        */
-        @Excel(name = "扣分或增加分值")
-        private BigDecimal score;
-        /**
-        * 处理状态(1.未核查,2.已核查)
-        */
-        @Excel(name = "处理状态", readConverterExp = "1=未核查,2.已核查")
-        private Integer processStatus;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java

@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 其它绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformOtherRecordVo extends BaseEntityLong {
 
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java

 package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 评价差评绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
 */
 @Data
 public class PerformReviewRecordVo extends BaseEntityLong {
 
-        /**
-        * 员工姓名
-        */
-        @Excel(name = "员工姓名")
-        private String staffName;
-        /**
-        * 工号
-        */
-        @Excel(name = "工号")
-        private String workNum;
-        /**
-        * 窗口编号
-        */
-        @Excel(name = "窗口编号")
-        private String windowNum;
-        /**
-        * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
-        */
-        @Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
-        private String reviewSource;
-        /**
-        * 规则名称
-        */
-        @Excel(name = "规则名称")
-        private String ruleName;
-        /**
-        * 扣分人员
-        */
-        @Excel(name = "扣分人员")
-        private String deductPerson;
-        /**
-        * 扣分或增加分值
-        */
-        @Excel(name = "扣分或增加分值")
-        private BigDecimal score;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml

@@ -20,6 +20,7 @@
         <result property="siteIds" column="siteIds" />
         <result property="areaCodes" column="areaCodes" />
         <result property="status" column="status" />
+        <result property="customerId" column="customerId" />
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="createUserName" column="createUserName" />
@@ -77,6 +78,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
                 a.status,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('customerId') or colPickMode == 1 and data.containsKey('customerId')))">
+                a.customerId,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
                 a.createTime,
             </if>
@@ -97,18 +101,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="UserEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_user
-        (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
+        (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
         VALUES
-        (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
+        (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_user
-        (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
+        (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
+            (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
         </foreach>
     </insert>
 
@@ -169,6 +173,12 @@
             <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
                 a.status=ifnull(a.status,0) + #{data.statusIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('customerId')) or (colPickMode==1 and !data.containsKey('customerId'))">
+                a.customerId=#{data.customerId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('customerIdIncrement')) or (colPickMode==1 and !data.containsKey('customerIdIncrement'))">
+                a.customerId=ifnull(a.customerId,0) + #{data.customerIdIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
             </if>
@@ -312,6 +322,18 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="customerId=(case" suffix="ELSE customerId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('customerId')) or (colPickMode==1 and !item.containsKey('customerId'))">
+                            when a.id=#{item.id} then #{item.customerId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('customerIdIncrement')) or (colPickMode==1 and !item.containsKey('customerIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.customerId,0) + #{item.customerIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
             <trim prefix="createTime=(case" suffix="ELSE createTime end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
@@ -807,6 +829,33 @@
             ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('customerId')">
+            <if test="conditionParamRef.customerId != null ">
+                ${_conditionType_} a.customerId = #{${_conditionParam_}.customerId}
+            </if>
+            <if test="conditionParamRef.customerId == null">
+                ${_conditionType_} a.customerId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
+            ${_conditionType_} a.customerId in
+            <foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
+            ${_conditionType_} a.customerId not in
+            <foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
+            ${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('customerIdEnd') and conditionParamRef.customerIdEnd != null">
+            ${_conditionType_} a.customerId <![CDATA[ <= ]]> #{${_conditionParam_}.customerIdEnd}
+        </if>
+
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -994,6 +1043,11 @@
                     <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('customerId')">
+                    a.customerId
+                    <if test='orderCol.customerId != null and "DESC".equalsIgnoreCase(orderCol.customerId)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('createTime')">
                     a.createTime
                     <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
+
+    <select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
+        <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+        <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+        UNION
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
+        <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+        <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+        UNION
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
+        <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+        <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+        UNION
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
+        <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+        <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+        UNION
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
+        <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+        <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+        UNION
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
+        <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+        <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+    </select>
+</mapper>
\ No newline at end of file

db/add.sql

@@ -278,3 +278,54 @@ PRIMARY KEY  (`id`)
 -- ----------------------------
 INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-查看', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0);
 INSERT INTO `mortals_xhx_resource` VALUES (null, '员工反馈问卷-菜单管理-维护', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0);
+
+
+
+-- ----------------------------
+2023-7-08
+-- ----------------------------
+
+ALTER TABLE mortals_xhx_user ADD COLUMN `customerId`  bigint(20) DEFAULT -1   COMMENT '员工id' AFTER status;
+
+
+ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `remark`  varchar(256)  DEFAULT ''   COMMENT '备注' AFTER checkStatus;
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `fileNames`  varchar(256)  DEFAULT ''   COMMENT '附件名称，多个逗号分割' AFTER remark;
+ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `filePaths`  varchar(256)  DEFAULT ''   COMMENT '附件下载地址，多个逗号分割' AFTER fileNames;
+