修改导出业务

3bf08578 · 赵啸非 · 452103c9 · 3bf08578 · 3bf08578 · 3bf08578
Commit 3bf08578 authored Jul 17, 2023 by 赵啸非
6 changed files
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
 * 考勤绩效记录核查信息实体对象
 *
 * @author zxfei
- * @date 2023-07-16
+ * @date 2023-07-17
 */
 @Data
 public class CheckAttendRecordEntity extends CheckAttendRecordVo {
@@ -29,10 +29,12 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
    private String staffName;
    /**
     * 工号
     */
+    @Excel(name = "工号")
    private String workNum;
    /**
     * 所属部门
@@ -41,6 +43,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
    private String deptName;
    /**
     * 所属考勤组ID
@@ -49,10 +52,12 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 所属考勤组名称
     */
+    @Excel(name = "所属考勤组名称")
    private String attendanceGroupName;
    /**
     * 考勤时间
     */
+    @Excel(name = "考勤时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date attendanceDate;
    /**
     * 绩效规则id
@@ -61,30 +66,37 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
    private String ruleName;
    /**
     * 增减类型(1.增加,2.扣除)
     */
+    @Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除")
    private Integer subAddType;
    /**
     * 扣分或增加分值
     */
+    @Excel(name = "扣分或增加分值")
    private BigDecimal score;
    /**
     * 上下班时间
     */
+    @Excel(name = "上下班时间")
    private String goOffTimeStr;
    /**
     * 异常时间
     */
+    @Excel(name = "异常时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date errorTime;
    /**
     * 实际打卡时间
     */
+    @Excel(name = "实际打卡时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date actualAttendTime;
    /**
     * 异常处理结果
     */
+    @Excel(name = "异常处理结果")
    private String errorResult;
    /**
     * 核查人员
@@ -94,6 +106,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 核查时间
     */
+    @Excel(name = "核查时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date checkTime;
    /**
     * 核查说明
@@ -103,7 +116,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 核查结果(1.加分或扣分,2.不扣分)
     */
-    @Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2.不扣分")
+    @Excel(name = "核查结果", readConverterExp = "加分或扣分=加分或扣分,不扣分=不扣分")
    private String checkResult;
    /**
     * 处理状态(1.未处理,2.已处理)
@@ -121,20 +134,19 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 附件名称，多个逗号分割
     */
-    @Excel(name = "附件名称，多个逗号分割")
    private String fileNames;
    /**
     * 附件下载地址，多个逗号分割
     */
-    @Excel(name = "附件下载地址，多个逗号分割")
    private String filePaths;
    /**
     * 绩效规则分类id
     */
    private Long categoryId;
    /**
-     * 规则名称
+     * 种类名称
     */
+    @Excel(name = "种类名称")
    private String categoryName;
    /**
     * 扣分人员
@@ -144,6 +156,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
    /**
     * 扣分时间
     */
+    @Excel(name = "扣分时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date deductTime;
    /**
     * 窗口编号

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
@@ -136,12 +136,10 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
    /**
    * 附件名称，多个逗号分割
    */
-    @Excel(name = "附件名称，多个逗号分割")
    private String fileNames;
    /**
    * 附件下载地址，多个逗号分割
    */
-    @Excel(name = "附件下载地址，多个逗号分割")
    private String filePaths;
    /**
    * 绩效规则分类id

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
@@ -53,7 +53,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
    /**
    * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
    */
-    @Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
+    @Excel(name = "违规类型", readConverterExp = "1=脱岗,2=离岗,3=玩手机,4=睡觉")
    private Integer irregularType;
    /**
    * 发生时间

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckGoworkRecordVo;
 import lombok.Data;
 /**
-* 办件绩效核查信息实体对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 办件绩效核查信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-17
+ */
 @Data
 public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    private static final long serialVersionUID = 1L;
@@ -34,6 +34,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    /**
     * 工号
     */
+    @Excel(name = "工号")
    private String workNum;
    /**
     * 窗口编号
@@ -81,6 +82,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    /**
     * 扣分方式(1.系统自动,2.人工添加)
     */
+    @Excel(name = "扣分方式", readConverterExp = "1=系统自动,2.人工添加")
    private Integer subMethod;
    /**
     * 扣分人员
@@ -90,6 +92,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    /**
     * 扣分时间
     */
+    @Excel(name = "扣分时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date deductTime;
    /**
     * 扣分或增加分值
@@ -104,6 +107,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    /**
     * 核查时间
     */
+    @Excel(name = "核查时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date checkTime;
    /**
     * 核查说明
@@ -126,12 +130,10 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    /**
     * 附件名称，多个逗号分割
     */
-    @Excel(name = "附件名称，多个逗号分割")
    private String fileNames;
    /**
     * 附件下载地址，多个逗号分割
     */
-    @Excel(name = "附件下载地址，多个逗号分割")
    private String filePaths;
    /**
     * 绩效规则分类id
@@ -144,6 +146,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
    /**
     * 增减类型(1.增加,2.扣除)
     */
+    @Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除")
    private Integer subAddType;
    @Override
    public int hashCode() {

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckOtherRecordVo;
 import lombok.Data;
 /**
-* 其它绩效核查信息实体对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 其它绩效核查信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-17
+ */
 @Data
 public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    private static final long serialVersionUID = 1L;
@@ -29,10 +29,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    /**
     * 员工姓名
     */
+    @Excel(name = "员工姓名")
    private String staffName;
    /**
     * 工号
     */
+    @Excel(name = "工号")
    private String workNum;
    /**
     * 所属部门
@@ -41,22 +43,27 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
    private String deptName;
    /**
     * 窗口编号
     */
+    @Excel(name = "窗口编号")
    private String windowNum;
    /**
     * 违规类型(1.工作纪律)
     */
+    @Excel(name = "违规类型", readConverterExp = "1=工作纪律")
    private Integer irregularOtherType;
    /**
     * 发生时间
     */
+    @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date happenTime;
    /**
     * 持续时间，秒
     */
+    @Excel(name = "持续时间，秒")
    private Integer duration;
    /**
     * 绩效规则id
@@ -65,10 +72,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
    private String ruleName;
    /**
     * 评分标准
     */
+    @Excel(name = "评分标准")
    private String ruleDesc;
    /**
     * 扣分方式(1.系统自动,2.人工添加)
@@ -85,6 +94,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    /**
     * 扣分或增加分值
     */
+    @Excel(name = "扣分或增加分值")
    private BigDecimal score;
    /**
     * 核查人员
@@ -116,12 +126,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    /**
     * 附件名称，多个逗号分割
     */
-    @Excel(name = "附件名称，多个逗号分割")
    private String fileNames;
    /**
     * 附件下载地址，多个逗号分割
     */
-    @Excel(name = "附件下载地址，多个逗号分割")
    private String filePaths;
    /**
     * 绩效规则分类id
@@ -130,10 +138,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
    /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
    private String categoryName;
    /**
     * 增减类型(1.增加,2.扣除)
     */
+    @Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
    private Integer subAddType;
    @Override
    public int hashCode() {

--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckReviewRecordVo;
 import lombok.Data;
 /**
-* 评价差评绩效核查信息实体对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 评价差评绩效核查信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-17
+ */
 @Data
 public class CheckReviewRecordEntity extends CheckReviewRecordVo {
    private static final long serialVersionUID = 1L;
@@ -48,23 +48,27 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
    /**
     * 所属部门名称
     */
+    @Excel(name = "所属部门名称")
    private String deptName;
    /**
     * 评价结果(1.非常不满意,2.差评)
     */
+    @Excel(name = "评价结果", readConverterExp = "1=非常不满意,2=差评")
    private Integer reviewResult;
    /**
     * 评价时间
     */
+    @Excel(name = "评价时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date reviewTime;
    /**
     * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
     */
-    @Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
+    @Excel(name = "评价来源", readConverterExp = "评价来源")
    private String reviewSource;
    /**
     * 评价设备
     */
+    @Excel(name = "评价设备")
    private String reviewDevice;
    /**
     * 绩效规则id
@@ -115,6 +119,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
    /**
     * 处理状态(1.未处理,2.已处理)
     */
+    @Excel(name = "处理状态", readConverterExp = "1=未处理,2=已处理")
    private Integer checkStatus;
    /**
     * 备注
@@ -123,12 +128,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
    /**
     * 附件名称，多个逗号分割
     */
-    @Excel(name = "附件名称，多个逗号分割")
    private String fileNames;
    /**
     * 附件下载地址，多个逗号分割
     */
-    @Excel(name = "附件下载地址，多个逗号分割")
    private String filePaths;
    /**
     * 绩效规则分类id
@@ -137,10 +140,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
    /**
     * 规则名称
     */
+    @Excel(name = "规则名称")
    private String categoryName;
    /**
     * 增减类型(1.增加,2.扣除)
     */
+    @Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
    private Integer subAddType;
    @Override
    public int hashCode() {