Skip to content

A
attendance-performance-platform
Commit 7699a2d5 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

绩效异常信息增加核查时间，申诉时间字段

parent fb08bf6c
Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 31 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java
View file @ 7699a2d5
......@@ -225,6 +225,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
updateEntity.setCheckTime(entity.getCheckTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java
View file @ 7699a2d5
......@@ -220,6 +220,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
updateEntity.setCheckTime(entity.getCheckTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java
View file @ 7699a2d5
......@@ -216,6 +216,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
updateEntity.setCheckTime(entity.getCheckTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java
View file @ 7699a2d5
......@@ -214,6 +214,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
updateEntity.setCheckTime(entity.getCheckTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java
View file @ 7699a2d5
......@@ -217,6 +217,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
updateEntity.setCheckTime(entity.getCheckTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java
View file @ 7699a2d5
......@@ -218,6 +218,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
updateEntity.setCheckTime(entity.getCheckTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformErrorMessageEntity.java
View file @ 7699a2d5
......@@ -15,7 +15,7 @@ import lombok.Data;
* 绩效异常信息实体对象
*
* @author zxfei
* @date 2024-04-28
* @date 2024-04-30
*/
@Data
public class PerformErrorMessageEntity extends PerformErrorMessageVo {
......@@ -93,6 +93,14 @@ public class PerformErrorMessageEntity extends PerformErrorMessageVo {
* 绩效类型【attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效】
*/
private String performType;
/**
* 核查时间
*/
private Date checkTime;
/**
* 申诉时间
*/
private Date appealTime;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -128,5 +136,7 @@ public class PerformErrorMessageEntity extends PerformErrorMessageVo {
this.appealStatus = 0;
this.remark = "";
this.performType = "";
this.checkTime = new Date();
this.appealTime = new Date();
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformErrorMessageQuery.java
View file @ 7699a2d5
......@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformErrorMessageEntity;
* 绩效异常信息查询对象
*
* @author zxfei
* @date 2024-04-28
* @date 2024-04-30
*/
public class PerformErrorMessageQuery extends PerformErrorMessageEntity {
/** 开始 序号，主键，自增长 */
......@@ -259,6 +259,18 @@ public class PerformErrorMessageQuery extends PerformErrorMessageEntity {
/** 绩效类型【attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效】排除列表 */
private List <String> performTypeNotList;
/** 开始 核查时间 */
private String checkTimeStart;
/** 结束 核查时间 */
private String checkTimeEnd;
/** 开始 申诉时间 */
private String appealTimeStart;
/** 结束 申诉时间 */
private String appealTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformErrorMessageQuery> orConditionList;
......@@ -1640,6 +1652,70 @@ public class PerformErrorMessageQuery extends PerformErrorMessageEntity {
this.performTypeNotList = performTypeNotList;
}
/**
* 获取 开始 核查时间
* @return checkTimeStart
*/
public String getCheckTimeStart(){
return this.checkTimeStart;
}
/**
* 设置 开始 核查时间
* @param checkTimeStart
*/
public void setCheckTimeStart(String checkTimeStart){
this.checkTimeStart = checkTimeStart;
}
/**
* 获取 结束 核查时间
* @return checkTimeEnd
*/
public String getCheckTimeEnd(){
return this.checkTimeEnd;
}
/**
* 设置 结束 核查时间
* @param checkTimeEnd
*/
public void setCheckTimeEnd(String checkTimeEnd){
this.checkTimeEnd = checkTimeEnd;
}
/**
* 获取 开始 申诉时间
* @return appealTimeStart
*/
public String getAppealTimeStart(){
return this.appealTimeStart;
}
/**
* 设置 开始 申诉时间
* @param appealTimeStart
*/
public void setAppealTimeStart(String appealTimeStart){
this.appealTimeStart = appealTimeStart;
}
/**
* 获取 结束 申诉时间
* @return appealTimeEnd
*/
public String getAppealTimeEnd(){
return this.appealTimeEnd;
}
/**
* 设置 结束 申诉时间
* @param appealTimeEnd
*/
public void setAppealTimeEnd(String appealTimeEnd){
this.appealTimeEnd = appealTimeEnd;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2478,6 +2554,8 @@ public class PerformErrorMessageQuery extends PerformErrorMessageEntity {
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/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java
View file @ 7699a2d5
......@@ -319,6 +319,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
PerformErrorMessageEntity updateEntity = new PerformErrorMessageEntity();
updateEntity.setId(errorMessageEntity.getId());
updateEntity.setAppealStatus(AppealStatusEnum.申诉中.getValue());
updateEntity.setAppealTime(entity.getAppealTime());
updateEntity.setUpdateTime(new Date());
performErrorMessageService.update(updateEntity);
}
......
attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformErrorMessageMapper.xml
View file @ 7699a2d5
......@@ -28,6 +28,8 @@
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="performType" column="performType" />
<result property="checkTime" column="checkTime" />
<result property="appealTime" column="appealTime" />
</resultMap>
......@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('performType') or colPickMode == 1 and data.containsKey('performType')))">
a.performType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkTime') or colPickMode == 1 and data.containsKey('checkTime')))">
a.checkTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appealTime') or colPickMode == 1 and data.containsKey('appealTime')))">
a.appealTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PerformErrorMessageEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_error_message
(checkRecordId,deptId,deptName,salaId,salaName,staffId,staffName,workNum,errorTime,ruleId,ruleName,subAddType,score,readStatus,checkStatus,appealStatus,remark,createTime,createUserId,updateUserId,updateTime,performType)
(checkRecordId,deptId,deptName,salaId,salaName,staffId,staffName,workNum,errorTime,ruleId,ruleName,subAddType,score,readStatus,checkStatus,appealStatus,remark,createTime,createUserId,updateUserId,updateTime,performType,checkTime,appealTime)
VALUES
(#{checkRecordId},#{deptId},#{deptName},#{salaId},#{salaName},#{staffId},#{staffName},#{workNum},#{errorTime},#{ruleId},#{ruleName},#{subAddType},#{score},#{readStatus},#{checkStatus},#{appealStatus},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{performType})
(#{checkRecordId},#{deptId},#{deptName},#{salaId},#{salaName},#{staffId},#{staffName},#{workNum},#{errorTime},#{ruleId},#{ruleName},#{subAddType},#{score},#{readStatus},#{checkStatus},#{appealStatus},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{performType},#{checkTime},#{appealTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_error_message
(checkRecordId,deptId,deptName,salaId,salaName,staffId,staffName,workNum,errorTime,ruleId,ruleName,subAddType,score,readStatus,checkStatus,appealStatus,remark,createTime,createUserId,updateUserId,updateTime,performType)
(checkRecordId,deptId,deptName,salaId,salaName,staffId,staffName,workNum,errorTime,ruleId,ruleName,subAddType,score,readStatus,checkStatus,appealStatus,remark,createTime,createUserId,updateUserId,updateTime,performType,checkTime,appealTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.checkRecordId},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.staffId},#{item.staffName},#{item.workNum},#{item.errorTime},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.readStatus},#{item.checkStatus},#{item.appealStatus},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.performType})
(#{item.checkRecordId},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.staffId},#{item.staffName},#{item.workNum},#{item.errorTime},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.readStatus},#{item.checkStatus},#{item.appealStatus},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.performType},#{item.checkTime},#{item.appealTime})
</foreach>
</insert>
......@@ -232,6 +240,12 @@
<if test="(colPickMode==0 and data.containsKey('performType')) or (colPickMode==1 and !data.containsKey('performType'))">
a.performType=#{data.performType},
</if>
<if test="(colPickMode==0 and data.containsKey('checkTime')) or (colPickMode==1 and !data.containsKey('checkTime'))">
a.checkTime=#{data.checkTime},
</if>
<if test="(colPickMode==0 and data.containsKey('appealTime')) or (colPickMode==1 and !data.containsKey('appealTime'))">
a.appealTime=#{data.appealTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -458,6 +472,20 @@
</if>
</foreach>
</trim>
<trim prefix="checkTime=(case" suffix="ELSE checkTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('checkTime')) or (colPickMode==1 and !item.containsKey('checkTime'))">
when a.id=#{item.id} then #{item.checkTime}
</if>
</foreach>
</trim>
<trim prefix="appealTime=(case" suffix="ELSE appealTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appealTime')) or (colPickMode==1 and !item.containsKey('appealTime'))">
when a.id=#{item.id} then #{item.appealTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1117,6 +1145,36 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('checkTime')">
<if test="conditionParamRef.checkTime != null ">
${_conditionType_} a.checkTime = #{${_conditionParam_}.checkTime}
</if>
<if test="conditionParamRef.checkTime == null">
${_conditionType_} a.checkTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('checkTimeStart') and conditionParamRef.checkTimeStart != null and conditionParamRef.checkTimeStart!=''">
${_conditionType_} a.checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('checkTimeEnd') and conditionParamRef.checkTimeEnd != null and conditionParamRef.checkTimeEnd!=''">
${_conditionType_} a.checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('appealTime')">
<if test="conditionParamRef.appealTime != null ">
${_conditionType_} a.appealTime = #{${_conditionParam_}.appealTime}
</if>
<if test="conditionParamRef.appealTime == null">
${_conditionType_} a.appealTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('appealTimeStart') and conditionParamRef.appealTimeStart != null and conditionParamRef.appealTimeStart!=''">
${_conditionType_} a.appealTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appealTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('appealTimeEnd') and conditionParamRef.appealTimeEnd != null and conditionParamRef.appealTimeEnd!=''">
${_conditionType_} a.appealTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appealTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1427,6 +1485,16 @@
<if test='orderCol.performType != null and "DESC".equalsIgnoreCase(orderCol.performType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('checkTime')">
a.checkTime
<if test='orderCol.checkTime != null and "DESC".equalsIgnoreCase(orderCol.checkTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appealTime')">
a.appealTime
<if test='orderCol.appealTime != null and "DESC".equalsIgnoreCase(orderCol.appealTime)'>DESC</if>
,
</if>
</trim>
</if>
......
db/add.sql
View file @ 7699a2d5
......@@ -1292,31 +1292,34 @@ ADD COLUMN `staffIds` varchar(255) COMMENT '管辖人员' AFTER `inspect`;
-- 绩效异常信息表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_perform_error_message`;
CREATE TABLE `mortals_xhx_perform_error_message` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`checkRecordId` bigint(20) DEFAULT NULL COMMENT '核查记录Id',
CREATE TABLE mortals_xhx_perform_error_message(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`checkRecordId` bigint(20) COMMENT '核查记录Id',
`deptId` bigint(20) DEFAULT '0' COMMENT '部门id号',
`deptName` varchar(64) DEFAULT NULL COMMENT '部门名称',
`salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
`salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称',
`staffId` bigint(20) DEFAULT NULL COMMENT '绩效责任人id',
`staffName` varchar(64) DEFAULT NULL COMMENT '绩效负责人名称',
`workNum` varchar(64) DEFAULT NULL COMMENT '工号',
`errorTime` datetime DEFAULT NULL COMMENT '异常时间',
`ruleId` bigint(20) DEFAULT NULL COMMENT '绩效规则id',
`ruleName` varchar(128) DEFAULT NULL COMMENT '规则名称',
`deptName` varchar(64) COMMENT '部门名称',
`salaId` bigint(20) COMMENT '所属大厅',
`salaName` varchar(128) COMMENT '所属大厅名称',
`staffId` bigint(20) COMMENT '绩效责任人id',
`staffName` varchar(64) COMMENT '绩效负责人名称',
`workNum` varchar(64) COMMENT '工号',
`errorTime` datetime COMMENT '异常时间',
`ruleId` bigint(20) COMMENT '绩效规则id',
`ruleName` varchar(128) COMMENT '规则名称',
`subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)',
`score` decimal(10,2) DEFAULT '0.00' COMMENT '扣分或增加分值',
`readStatus` tinyint(1) DEFAULT '0' COMMENT '阅读状态0未读1已读',
`checkStatus` tinyint(1) DEFAULT '0' COMMENT '核查处理状态1.未处理,2.已处理',
`checkTime` datetime COMMENT '核查时间',
`appealStatus` tinyint(1) DEFAULT '0' COMMENT '申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)',
`performType` varchar(64) DEFAULT NULL COMMENT '绩效类型【attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效】',
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
`createTime` datetime DEFAULT NULL COMMENT '创建时间',
`createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
`updateTime` datetime DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`)
`appealTime` datetime COMMENT '申诉时间',
`performType` varchar(64) COMMENT '绩效类型【attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效】',
`remark` varchar(255) COMMENT '备注',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
,KEY `score` (`score`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常信息';
ALTER TABLE `mortals_xhx_perform_attend_appeal` ADD COLUMN `appealPersonId` bigint(20) COMMENT '申诉人id' AFTER `performType`,
......
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