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,113 +9,128 @@ 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;
 
     /**
-     * 记录ID
-     */
+    * 记录ID
+    */
     private Long recordId;
     /**
-     * 员工ID
-     */
+    * 员工ID
+    */
     private Long staffId;
     /**
-     * 员工姓名
-     */
+    * 员工姓名
+    */
     private String staffName;
     /**
-     * 工号
-     */
+    * 工号
+    */
     private String workNum;
     /**
-     * 所属部门
-     */
+    * 所属部门
+    */
     private Long deptId;
     /**
-     * 所属部门名称
-     */
+    * 所属部门名称
+    */
     private String deptName;
     /**
-     * 所属考勤组ID
-     */
+    * 所属考勤组ID
+    */
     private Long attendanceGroupId;
     /**
-     * 所属考勤组名称
-     */
+    * 所属考勤组名称
+    */
     private String attendanceGroupName;
     /**
-     * 考勤时间
-     */
+    * 考勤时间
+    */
     private Date attendanceDate;
     /**
-     * 绩效规则id
-     */
+    * 绩效规则id
+    */
     private Long ruleId;
     /**
-     * 规则名称
-     */
+    * 规则名称
+    */
     private String ruleName;
     /**
-     * 增减类型(1.增加,2.扣除)
-     */
+    * 增减类型(1.增加,2.扣除)
+    */
     private Integer subAddType;
     /**
-     * 扣分或增加分值
-     */
+    * 扣分或增加分值
+    */
     private BigDecimal score;
     /**
-     * 上下班时间
-     */
+    * 上下班时间
+    */
     private String goOffTimeStr;
     /**
-     * 异常时间
-     */
+    * 异常时间
+    */
     private Date errorTime;
     /**
-     * 实际打卡时间
-     */
+    * 实际打卡时间
+    */
     private Date actualAttendTime;
     /**
-     * 异常处理结果
-     */
+    * 异常处理结果
+    */
     private String errorResult;
     /**
-     * 核查人员
-     */
+    * 核查人员
+    */
     @Excel(name = "核查人员")
     private String checkPerson;
     /**
-     * 核查时间
-     */
+    * 核查时间
+    */
     private Date checkTime;
     /**
-     * 核查说明
-     */
+    * 核查说明
+    */
     @Excel(name = "核查说明")
     private String checkDesc;
     /**
-     * 核查结果
-     */
+    * 核查结果
+    */
     @Excel(name = "核查结果")
     private String checkResult;
     /**
-     * 处理状态(1.未处理,2.已处理)
-     */
+    * 处理状态(1.未处理,2.已处理)
+    */
     private Integer checkStatus;
     /**
-     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
-     */
+    * 扣分方式(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();
+         return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -123,7 +138,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
         if (obj instanceof CheckAttendRecordEntity) {
             CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj;
             if (this.getId() == tmp.getId()) {
-                return true;
+                 return true;
             }
         }
         return false;
@@ -131,50 +146,56 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
 
     public void initAttrValue(){
 
-        this.recordId = -1L;
+            this.recordId = -1L;
+
+            this.staffId = -1L;
+
+            this.staffName = "";
+
+            this.workNum = "";
 
-        this.staffId = -1L;
+            this.deptId = -1L;
 
-        this.staffName = "";
+            this.deptName = "";
 
-        this.workNum = "";
+            this.attendanceGroupId = -1L;
 
-        this.deptId = -1L;
+            this.attendanceGroupName = "";
 
-        this.deptName = "";
+            this.attendanceDate = null;
 
-        this.attendanceGroupId = -1L;
+            this.ruleId = -1L;
 
-        this.attendanceGroupName = "";
+            this.ruleName = "";
 
-        this.attendanceDate = null;
+            this.subAddType = 1;
 
-        this.ruleId = -1L;
+            this.score = BigDecimal.valueOf(0.00);
 
-        this.ruleName = "";
+            this.goOffTimeStr = "";
 
-        this.subAddType = 1;
+            this.errorTime = null;
 
-        this.score = BigDecimal.valueOf(0.00);
+            this.actualAttendTime = null;
 
-        this.goOffTimeStr = "";
+            this.errorResult = "";
 
-        this.errorTime = null;
+            this.checkPerson = "";
 
-        this.actualAttendTime = null;
+            this.checkTime = null;
 
-        this.errorResult = "";
+            this.checkDesc = "";
 
-        this.checkPerson = "";
+            this.checkResult = "";
 
-        this.checkTime = null;
+            this.checkStatus = 1;
 
-        this.checkDesc = "";
+            this.subMethod = 1;
 
-        this.checkResult = "";
+            this.remark = "";
 
-        this.checkStatus = 1;
+            this.fileNames = "";
 
-        this.subMethod = 1;
+            this.filePaths = "";
     }
 }
\ No newline at end of file

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