添加照片海康下载

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-10
-*/
+ * 考勤绩效记录核查信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-15
+ */
 @Data
 public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     private static final long serialVersionUID = 1L;
@@ -110,7 +110,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
      */
     private Integer checkStatus;
     /**
-    * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查,4.申诉冲销)
+     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
      */
     private Integer subMethod;
     /**
@@ -133,9 +133,18 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
      */
     private Long categoryId;
     /**
-    * 规则分类名称
+     * 规则名称
      */
     private String categoryName;
+    /**
+     * 扣分人员
+     */
+    @Excel(name = "扣分人员")
+    private String deductPerson;
+    /**
+     * 扣分时间
+     */
+    private Date deductTime;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -209,5 +218,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
         this.categoryId = -1L;
 
         this.categoryName = "";
+
+        this.deductPerson = "";
+
+        this.deductTime = null;
     }
 }
\ 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-10
-*/
+ * 考勤绩效记录核查信息查询对象
+ *
+ * @author zxfei
+ * @date 2023-07-15
+ */
 public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -312,6 +312,17 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 扣分人员 */
+    private List<String> deductPersonList;
+
+    /** 扣分人员排除列表 */
+    private List <String> deductPersonNotList;
+    /** 开始 扣分时间 */
+    private String deductTimeStart;
+
+    /** 结束 扣分时间 */
+    private String deductTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckAttendRecordQuery> orConditionList;
 
@@ -2013,6 +2024,70 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+     * 获取 扣分人员
+     * @return deductPersonList
+     */
+    public List<String> getDeductPersonList(){
+        return this.deductPersonList;
+    }
+
+    /**
+     * 设置 扣分人员
+     * @param deductPersonList
+     */
+    public void setDeductPersonList(List<String> deductPersonList){
+        this.deductPersonList = deductPersonList;
+    }
+
+    /**
+     * 获取 扣分人员
+     * @return deductPersonNotList
+     */
+    public List<String> getDeductPersonNotList(){
+        return this.deductPersonNotList;
+    }
+
+    /**
+     * 设置 扣分人员
+     * @param deductPersonNotList
+     */
+    public void setDeductPersonNotList(List<String> deductPersonNotList){
+        this.deductPersonNotList = deductPersonNotList;
+    }
+
+    /**
+     * 获取 开始 扣分时间
+     * @return deductTimeStart
+     */
+    public String getDeductTimeStart(){
+        return this.deductTimeStart;
+    }
+
+    /**
+     * 设置 开始 扣分时间
+     * @param deductTimeStart
+     */
+    public void setDeductTimeStart(String deductTimeStart){
+        this.deductTimeStart = deductTimeStart;
+    }
+
+    /**
+     * 获取 结束 扣分时间
+     * @return deductTimeEnd
+     */
+    public String getDeductTimeEnd(){
+        return this.deductTimeEnd;
+    }
+
+    /**
+     * 设置 结束 扣分时间
+     * @param deductTimeEnd
+     */
+    public void setDeductTimeEnd(String deductTimeEnd){
+        this.deductTimeEnd = deductTimeEnd;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2987,6 +3062,26 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
         return this;
     }
 
+
+    /**
+     * 设置 扣分人员
+     * @param deductPerson
+     */
+    public CheckAttendRecordQuery deductPerson(String deductPerson){
+        setDeductPerson(deductPerson);
+        return this;
+    }
+
+    /**
+     * 设置 扣分人员
+     * @param deductPersonList
+     */
+    public CheckAttendRecordQuery deductPersonList(List<String> deductPersonList){
+        this.deductPersonList = deductPersonList;
+        return this;
+    }
+
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

db/add.sql

@@ -651,3 +651,9 @@ ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN `deductPerson` varchar(
 ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN  `deductTime` datetime      COMMENT '扣分时间' AFTER deductPerson;
 
 ALTER TABLE mortals_xhx_user ADD COLUMN  `dingUserId` varchar(64) DEFAULT ''     COMMENT '钉钉userId' AFTER customerId;
+
+
+
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `deductPerson` varchar(128) DEFAULT ''     COMMENT '扣分人员' AFTER subMethod;
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN  `deductTime` datetime      COMMENT '扣分时间' AFTER deductPerson;
+