Skip to content

A
attendance-performance-platform
Commit 5e443f53 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加照片海康下载

parent c569b630
Show whitespace changes
Inline Side-by-side
Showing with 2729 additions and 2541 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
View file @ 5e443f53
......@@ -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
View file @ 5e443f53
......@@ -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
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
View file @ 5e443f53
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAttendRecordDaoImpl">
<!-- 字段和属性映射 -->
......@@ -38,6 +38,8 @@
<result property="filePaths" column="filePaths" />
<result property="categoryId" column="categoryId" />
<result property="categoryName" column="categoryName" />
<result property="deductPerson" column="deductPerson" />
<result property="deductTime" column="deductTime" />
</resultMap>
......@@ -144,23 +146,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
a.categoryName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deductPerson') or colPickMode == 1 and data.containsKey('deductPerson')))">
a.deductPerson,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deductTime') or colPickMode == 1 and data.containsKey('deductTime')))">
a.deductTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_attend_record
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName)
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName,deductPerson,deductTime)
VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
(#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{deductPerson},#{deductTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_attend_record
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName)
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName,deductPerson,deductTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.deductPerson},#{item.deductTime})
</foreach>
</insert>
......@@ -302,6 +310,12 @@
<if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
a.categoryName=#{data.categoryName},
</if>
<if test="(colPickMode==0 and data.containsKey('deductPerson')) or (colPickMode==1 and !data.containsKey('deductPerson'))">
a.deductPerson=#{data.deductPerson},
</if>
<if test="(colPickMode==0 and data.containsKey('deductTime')) or (colPickMode==1 and !data.containsKey('deductTime'))">
a.deductTime=#{data.deductTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -598,6 +612,20 @@
</if>
</foreach>
</trim>
<trim prefix="deductPerson=(case" suffix="ELSE deductPerson end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deductPerson')) or (colPickMode==1 and !item.containsKey('deductPerson'))">
when a.id=#{item.id} then #{item.deductPerson}
</if>
</foreach>
</trim>
<trim prefix="deductTime=(case" suffix="ELSE deductTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deductTime')) or (colPickMode==1 and !item.containsKey('deductTime'))">
when a.id=#{item.id} then #{item.deductTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1449,6 +1477,42 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deductPerson')">
<if test="conditionParamRef.deductPerson != null and conditionParamRef.deductPerson != ''">
${_conditionType_} a.deductPerson like #{${_conditionParam_}.deductPerson}
</if>
<if test="conditionParamRef.deductPerson == null">
${_conditionType_} a.deductPerson is null
</if>
</if>
<if test="conditionParamRef.containsKey('deductPersonList') and conditionParamRef.deductPersonList.size() > 0">
${_conditionType_} a.deductPerson in
<foreach collection="conditionParamRef.deductPersonList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deductPersonNotList') and conditionParamRef.deductPersonNotList.size() > 0">
${_conditionType_} a.deductPerson not in
<foreach collection="conditionParamRef.deductPersonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deductTime')">
<if test="conditionParamRef.deductTime != null ">
${_conditionType_} a.deductTime = #{${_conditionParam_}.deductTime}
</if>
<if test="conditionParamRef.deductTime == null">
${_conditionType_} a.deductTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('deductTimeStart') and conditionParamRef.deductTimeStart != null and conditionParamRef.deductTimeStart!=''">
${_conditionType_} a.deductTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.deductTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('deductTimeEnd') and conditionParamRef.deductTimeEnd != null and conditionParamRef.deductTimeEnd!=''">
${_conditionType_} a.deductTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.deductTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1627,6 +1691,16 @@
<if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deductPerson')">
a.deductPerson
<if test='orderCol.deductPerson != null and "DESC".equalsIgnoreCase(orderCol.deductPerson)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deductTime')">
a.deductTime
<if test='orderCol.deductTime != null and "DESC".equalsIgnoreCase(orderCol.deductTime)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
db/add.sql
View file @ 5e443f53
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment