添加用户反馈问答表

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

@@ -9,106 +9,113 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
 import lombok.Data;
 /**
-* 考勤绩效记录核查信息实体对象
-*
-* @author zxfei
-* @date 2023-05-18
-*/
+ * 考勤绩效记录核查信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 @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.大厅巡查)
+     */
+    private Integer subMethod;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -116,7 +123,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;
@@ -124,48 +131,50 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
 
     public void initAttrValue(){
 
-            this.recordId = -1L;
+        this.recordId = -1L;
+
+        this.staffId = -1L;
 
-            this.staffId = -1L;
+        this.staffName = "";
 
-            this.staffName = "";
+        this.workNum = "";
 
-            this.workNum = "";
+        this.deptId = -1L;
 
-            this.deptId = -1L;
+        this.deptName = "";
 
-            this.deptName = "";
+        this.attendanceGroupId = -1L;
 
-            this.attendanceGroupId = -1L;
+        this.attendanceGroupName = "";
 
-            this.attendanceGroupName = "";
+        this.attendanceDate = null;
 
-            this.attendanceDate = null;
+        this.ruleId = -1L;
 
-            this.ruleId = -1L;
+        this.ruleName = "";
 
-            this.ruleName = "";
+        this.subAddType = 1;
 
-            this.subAddType = 1;
+        this.score = BigDecimal.valueOf(0.00);
 
-            this.score = BigDecimal.valueOf(0.00);
+        this.goOffTimeStr = "";
 
-            this.goOffTimeStr = "";
+        this.errorTime = null;
 
-            this.errorTime = null;
+        this.actualAttendTime = null;
 
-            this.actualAttendTime = null;
+        this.errorResult = "";
 
-            this.errorResult = "";
+        this.checkPerson = "";
 
-            this.checkPerson = "";
+        this.checkTime = null;
 
-            this.checkTime = null;
+        this.checkDesc = "";
 
-            this.checkDesc = "";
+        this.checkResult = "";
 
-            this.checkResult = "";
+        this.checkStatus = 1;
 
-            this.checkStatus = 1;
+        this.subMethod = 1;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackEntity.java

@@ -10,57 +10,61 @@ import com.mortals.xhx.module.feedback.model.vo.FeedbackVo;
 import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
 import lombok.Data;
 /**
-* 绩效反馈记录信息实体对象
-*
-* @author zxfei
-* @date 2023-07-05
-*/
+ * 绩效反馈记录信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 @Data
 public class FeedbackEntity extends FeedbackVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 问卷标题
-    */
+     * 问卷标题
+     */
     private String title;
     /**
-    * 反馈开始时间
-    */
+     * 反馈开始时间
+     */
     private Date feedbackTimeStart;
     /**
-    * 反馈结束时间
-    */
+     * 反馈结束时间
+     */
     private Date feedbackTimeEnd;
     /**
-    * 邀请人数
-    */
+     * 邀请人数
+     */
     private Integer inviteNum;
     /**
-    * 反馈人数
-    */
+     * 反馈人数
+     */
     private Integer feedbackNum;
     /**
-    * 状态 (0.未开始,1.进行中,2.已结束)
-    */
+     * 状态 (0.未开始,1.进行中,2.已结束)
+     */
     private Integer processStatus;
     /**
-    * 问卷是否外链(0.否,1.是)
-    */
+     * 问卷是否外链(0.否,1.是)
+     */
     private Integer weblink;
     /**
-    * 问题外链地址
-    */
+     * 问题外链地址
+     */
     private String webUrl;
     /**
-    * 备注说明
-    */
+     * 备注说明
+     */
     private String remark;
     /**
-    * 绩效反馈问题信息
-    */
+     * 表单内容
+     */
+    private String formContent;
+    /**
+     * 绩效反馈问题信息
+     */
     private List<FeedbackQuestionEntity> feedbackQuestionList=new ArrayList<>();;
     public List<FeedbackQuestionEntity> getFeedbackQuestionList(){
-      return feedbackQuestionList;
+        return feedbackQuestionList;
     }
 
     public void setFeedbackQuestionList(List<FeedbackQuestionEntity> feedbackQuestionList){
@@ -68,7 +72,7 @@ public class FeedbackEntity extends FeedbackVo {
     }
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -76,7 +80,7 @@ public class FeedbackEntity extends FeedbackVo {
         if (obj instanceof FeedbackEntity) {
             FeedbackEntity tmp = (FeedbackEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -84,22 +88,24 @@ public class FeedbackEntity extends FeedbackVo {
 
     public void initAttrValue(){
 
-            this.title = "";
+        this.title = "";
+
+        this.feedbackTimeStart = null;
 
-            this.feedbackTimeStart = null;
+        this.feedbackTimeEnd = null;
 
-            this.feedbackTimeEnd = null;
+        this.inviteNum = 0;
 
-            this.inviteNum = 0;
+        this.feedbackNum = 0;
 
-            this.feedbackNum = 0;
+        this.processStatus = 0;
 
-            this.processStatus = 0;
+        this.weblink = 0;
 
-            this.weblink = 0;
+        this.webUrl = "";
 
-            this.webUrl = "";
+        this.remark = "";
 
-            this.remark = "";
+        this.formContent = "";
     }
 }
\ No newline at end of file

db/add.sql

@@ -74,6 +74,7 @@ CREATE TABLE mortals_xhx_feedback(
     `processStatus` tinyint(2)    DEFAULT '0'  COMMENT '状态 (0.未开始,1.进行中,2.已结束)',
     `weblink` tinyint(2)    DEFAULT '0'  COMMENT '问卷是否外链(0.否,1.是)',
     `webUrl` varchar(255)      COMMENT '问题外链地址',
+    `formContent` mediumtext      COMMENT '表单内容',
     `remark` varchar(255)      COMMENT '备注说明',
     `createUserId` bigint(20)      COMMENT '创建用户',
     `createTime` datetime      COMMENT '创建时间',
@@ -81,6 +82,7 @@ CREATE TABLE mortals_xhx_feedback(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效反馈记录信息';
+
 -- ----------------------------
 -- 绩效反馈问题表
 -- ----------------------------

db/module.sql

@@ -1484,6 +1484,7 @@ CREATE TABLE mortals_xhx_perform_review_record(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='评价差评绩效记录信息';
+
 -- ----------------------------
 -- 考勤绩效记录核查信息表
 -- ----------------------------
@@ -1516,8 +1517,10 @@ CREATE TABLE mortals_xhx_check_attend_record(
     `createTime` datetime NOT NULL     COMMENT '创建时间',
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '更新时间',
+    `subMethod` tinyint(1)    DEFAULT '1'  COMMENT '扣分方式(1.系统自动,2.人工添加,3.大厅巡查)',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤绩效记录核查信息';
+
 -- ----------------------------
 -- 考勤绩效记录信息表
 -- ----------------------------