Commit b2d2303f authored by 赵啸非's avatar 赵啸非

添加用户类型修改

parent 62ce8b36
......@@ -12,7 +12,7 @@ import lombok.Data;
* 考勤绩效记录核查信息实体对象
*
* @author zxfei
* @date 2023-07-15
* @date 2023-07-16
*/
@Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo {
......@@ -145,6 +145,11 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
* 扣分时间
*/
private Date deductTime;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -222,5 +227,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.deductPerson = "";
this.deductTime = null;
this.windowNum = "";
}
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
* 考勤绩效记录核查信息查询对象
*
* @author zxfei
* @date 2023-07-15
* @date 2023-07-16
*/
public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 开始 序号,主键,自增长 */
......@@ -323,6 +323,11 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 结束 扣分时间 */
private String deductTimeEnd;
/** 窗口编号 */
private List<String> windowNumList;
/** 窗口编号排除列表 */
private List <String> windowNumNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckAttendRecordQuery> orConditionList;
......@@ -2088,6 +2093,38 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
this.deductTimeEnd = deductTimeEnd;
}
/**
* 获取 窗口编号
* @return windowNumList
*/
public List<String> getWindowNumList(){
return this.windowNumList;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
public void setWindowNumList(List<String> windowNumList){
this.windowNumList = windowNumList;
}
/**
* 获取 窗口编号
* @return windowNumNotList
*/
public List<String> getWindowNumNotList(){
return this.windowNumNotList;
}
/**
* 设置 窗口编号
* @param windowNumNotList
*/
public void setWindowNumNotList(List<String> windowNumNotList){
this.windowNumNotList = windowNumNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
......@@ -3082,6 +3119,25 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
}
/**
* 设置 窗口编号
* @param windowNum
*/
public CheckAttendRecordQuery windowNum(String windowNum){
setWindowNum(windowNum);
return this;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
public CheckAttendRecordQuery windowNumList(List<String> windowNumList){
this.windowNumList = windowNumList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
......@@ -121,6 +121,11 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
* 规则名称
*/
private String ruleName;
/**
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -188,5 +193,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
this.categoryName = "";
this.ruleName = "";
this.windowNum = "";
}
}
\ No newline at end of file
......@@ -287,6 +287,11 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 规则名称排除列表 */
private List <String> ruleNameNotList;
/** 窗口编号 */
private List<String> windowNumList;
/** 窗口编号排除列表 */
private List <String> windowNumNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformAttendRecordQuery> orConditionList;
......@@ -1843,6 +1848,38 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
this.ruleNameNotList = ruleNameNotList;
}
/**
* 获取 窗口编号
* @return windowNumList
*/
public List<String> getWindowNumList(){
return this.windowNumList;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
public void setWindowNumList(List<String> windowNumList){
this.windowNumList = windowNumList;
}
/**
* 获取 窗口编号
* @return windowNumNotList
*/
public List<String> getWindowNumNotList(){
return this.windowNumNotList;
}
/**
* 设置 窗口编号
* @param windowNumNotList
*/
public void setWindowNumNotList(List<String> windowNumNotList){
this.windowNumNotList = windowNumNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
......@@ -2725,6 +2762,25 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
return this;
}
/**
* 设置 窗口编号
* @param windowNum
*/
public PerformAttendRecordQuery windowNum(String windowNum){
setWindowNum(windowNum);
return this;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
public PerformAttendRecordQuery windowNumList(List<String> windowNumList){
this.windowNumList = windowNumList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
......@@ -40,6 +40,7 @@
<result property="categoryName" column="categoryName" />
<result property="deductPerson" column="deductPerson" />
<result property="deductTime" column="deductTime" />
<result property="windowNum" column="windowNum" />
</resultMap>
......@@ -152,23 +153,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deductTime') or colPickMode == 1 and data.containsKey('deductTime')))">
a.deductTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowNum') or colPickMode == 1 and data.containsKey('windowNum')))">
a.windowNum,
</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,deductPerson,deductTime)
(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,windowNum)
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},#{deductPerson},#{deductTime})
(#{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},#{windowNum})
</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,deductPerson,deductTime)
(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,windowNum)
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.deductPerson},#{item.deductTime})
(#{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},#{item.windowNum})
</foreach>
</insert>
......@@ -316,6 +320,9 @@
<if test="(colPickMode==0 and data.containsKey('deductTime')) or (colPickMode==1 and !data.containsKey('deductTime'))">
a.deductTime=#{data.deductTime},
</if>
<if test="(colPickMode==0 and data.containsKey('windowNum')) or (colPickMode==1 and !data.containsKey('windowNum'))">
a.windowNum=#{data.windowNum},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -626,6 +633,13 @@
</if>
</foreach>
</trim>
<trim prefix="windowNum=(case" suffix="ELSE windowNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('windowNum')) or (colPickMode==1 and !item.containsKey('windowNum'))">
when a.id=#{item.id} then #{item.windowNum}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1513,6 +1527,27 @@
<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>
<if test="conditionParamRef.containsKey('windowNum')">
<if test="conditionParamRef.windowNum != null and conditionParamRef.windowNum != ''">
${_conditionType_} a.windowNum like #{${_conditionParam_}.windowNum}
</if>
<if test="conditionParamRef.windowNum == null">
${_conditionType_} a.windowNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('windowNumList') and conditionParamRef.windowNumList.size() > 0">
${_conditionType_} a.windowNum in
<foreach collection="conditionParamRef.windowNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowNumNotList') and conditionParamRef.windowNumNotList.size() > 0">
${_conditionType_} a.windowNum not in
<foreach collection="conditionParamRef.windowNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1701,6 +1736,11 @@
<if test='orderCol.deductTime != null and "DESC".equalsIgnoreCase(orderCol.deductTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('windowNum')">
a.windowNum
<if test='orderCol.windowNum != null and "DESC".equalsIgnoreCase(orderCol.windowNum)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
......@@ -35,6 +35,7 @@
<result property="categoryId" column="categoryId" />
<result property="categoryName" column="categoryName" />
<result property="ruleName" column="ruleName" />
<result property="windowNum" column="windowNum" />
</resultMap>
......@@ -132,23 +133,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleName') or colPickMode == 1 and data.containsKey('ruleName')))">
a.ruleName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowNum') or colPickMode == 1 and data.containsKey('windowNum')))">
a.windowNum,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_attend_record
(staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,ruleName)
(staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,ruleName,windowNum)
VALUES
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{ruleName})
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{ruleName},#{windowNum})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_attend_record
(staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,ruleName)
(staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,ruleName,windowNum)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.ruleName})
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.ruleName},#{item.windowNum})
</foreach>
</insert>
......@@ -278,6 +282,9 @@
<if test="(colPickMode==0 and data.containsKey('ruleName')) or (colPickMode==1 and !data.containsKey('ruleName'))">
a.ruleName=#{data.ruleName},
</if>
<if test="(colPickMode==0 and data.containsKey('windowNum')) or (colPickMode==1 and !data.containsKey('windowNum'))">
a.windowNum=#{data.windowNum},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -548,6 +555,13 @@
</if>
</foreach>
</trim>
<trim prefix="windowNum=(case" suffix="ELSE windowNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('windowNum')) or (colPickMode==1 and !item.containsKey('windowNum'))">
when a.id=#{item.id} then #{item.windowNum}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1330,6 +1344,27 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowNum')">
<if test="conditionParamRef.windowNum != null and conditionParamRef.windowNum != ''">
${_conditionType_} a.windowNum like #{${_conditionParam_}.windowNum}
</if>
<if test="conditionParamRef.windowNum == null">
${_conditionType_} a.windowNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('windowNumList') and conditionParamRef.windowNumList.size() > 0">
${_conditionType_} a.windowNum in
<foreach collection="conditionParamRef.windowNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('windowNumNotList') and conditionParamRef.windowNumNotList.size() > 0">
${_conditionType_} a.windowNum not in
<foreach collection="conditionParamRef.windowNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1493,6 +1528,11 @@
<if test='orderCol.ruleName != null and "DESC".equalsIgnoreCase(orderCol.ruleName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('windowNum')">
a.windowNum
<if test='orderCol.windowNum != null and "DESC".equalsIgnoreCase(orderCol.windowNum)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
......@@ -688,3 +688,7 @@ CREATE TABLE mortals_xhx_staff_onboard(
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工入职信息';
ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `windowNum` varchar(64) DEFAULT '' COMMENT '窗口编号' AFTER deductPerson;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `windowNum` varchar(64) DEFAULT '' 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