Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 2f9ad857 c90df895
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3432 additions and 3395 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java
View file @ ad46a442
......@@ -63,8 +63,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部考勤新增";
Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder();
message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
......@@ -90,8 +88,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部评价新增";
Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder();
message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
......@@ -117,8 +113,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部投诉新增";
Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder();
message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
......@@ -144,8 +138,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部办件新增";
Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder();
message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
......@@ -171,8 +163,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部效能新增";
Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder();
message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
......@@ -198,8 +188,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部其它绩效新增";
Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder();
message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
View file @ ad46a442
......@@ -209,4 +209,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
return ret;
}
@Override
protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
return super.infoAfter(id, model, entity, context);
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java
View file @ ad46a442
package com.mortals.xhx.module.staff.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
import lombok.Data;
/**
* 员工绩效统计实体对象
*
* @author zxfei
* @date 2023-07-11
*/
* 员工绩效统计实体对象
*
* @author zxfei
* @date 2023-07-13
*/
@Data
public class StaffPerformStatEntity extends StaffPerformStatVo {
private static final long serialVersionUID = 1L;
......@@ -20,28 +25,26 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
/**
* 部门id号
*/
private Long deptId;
private Long staffId;
/**
* 部门名称
*/
private String deptName;
private String staffName;
/**
* 员工绩效总分数
*/
@Excel(name = "员工绩效总分数")
private BigDecimal totalScore;
/**
* 备注
*/
private String remark;
/**
* 年
* 员工绩效加分总分数汇总
*/
private Integer year;
@Excel(name = "员工绩效加分总分数汇总")
private BigDecimal totalAddScore;
/**
* 月
* 员工绩效减分总分数汇总
*/
private Integer month;
@Excel(name = "员工绩效减分总分数汇总")
private BigDecimal totalSubScore;
/**
* 考勤绩效指标增加分数
*/
......@@ -58,6 +61,14 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
* 评价绩效指标扣减分数
*/
private BigDecimal assessScoreSub;
/**
* 投诉绩效指标增加分数
*/
private BigDecimal complainScoreAdd;
/**
* 投诉绩效指标扣减分数
*/
private BigDecimal complainScoreSub;
/**
* 办件绩效指标增加分数
*/
......@@ -83,31 +94,27 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
*/
private BigDecimal otherScoreSub;
/**
* 日
*/
private Integer day;
/**
* 员工绩效加分总分数汇总
* 备注
*/
@Excel(name = "员工绩效加分总分数汇总")
private BigDecimal totalAddScore;
private String remark;
/**
* 员工绩效减分总分数汇总
* 年
*/
@Excel(name = "员工绩效减分总分数汇总")
private BigDecimal totalSubScore;
private Integer year;
/**
* 投诉绩效指标增加分数
* 月
*/
private BigDecimal complainScoreAdd;
private Integer month;
/**
* 投诉绩效指标扣减分数
* 日
*/
private BigDecimal complainScoreSub;
private Integer day;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
......@@ -120,19 +127,17 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
return false;
}
public void initAttrValue(){
public void initAttrValue() {
this.deptId = 0L;
this.staffId = 0L;
this.deptName = "";
this.staffName = "";
this.totalScore = new BigDecimal(0);
this.remark = "";
this.year = -1;
this.totalAddScore = new BigDecimal(0);
this.month = -1;
this.totalSubScore = new BigDecimal(0);
this.attendScoreAdd = new BigDecimal(0);
......@@ -142,6 +147,10 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
this.assessScoreSub = new BigDecimal(0);
this.complainScoreAdd = new BigDecimal(0);
this.complainScoreSub = new BigDecimal(0);
this.workScoreAdd = new BigDecimal(0);
this.workScoreSub = new BigDecimal(0);
......@@ -154,14 +163,12 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
this.otherScoreSub = new BigDecimal(0);
this.day = -1;
this.totalAddScore = new BigDecimal(0);
this.remark = "";
this.totalSubScore = new BigDecimal(0);
this.year = DateUtil.year(new Date());
this.complainScoreAdd = new BigDecimal(0);
this.month = DateUtil.month(new Date()) + 1;
this.complainScoreSub = new BigDecimal(0);
this.day = DateUtil.dayOfMonth(new Date());
}
}
\ No newline at end of file
db/add.sql
View file @ ad46a442
......@@ -503,3 +503,40 @@ CREATE TABLE mortals_xhx_window_owner_detail(
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口负责人详细';
-- ----------------------------
-- 员工绩效统计表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_staff_perform_stat`;
CREATE TABLE mortals_xhx_staff_perform_stat(
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`staffId` bigint(20) DEFAULT '0' COMMENT '部门id号',
`staffName` varchar(64) COMMENT '部门名称',
`totalScore` decimal(10,2) NOT NULL COMMENT '员工绩效总分数',
`totalAddScore` decimal(10,2) NOT NULL COMMENT '员工绩效加分总分数汇总',
`totalSubScore` decimal(10,2) NOT NULL COMMENT '员工绩效减分总分数汇总',
`attendScoreAdd` decimal(10,2) COMMENT '考勤绩效指标增加分数',
`attendScoreSub` decimal(10,2) COMMENT '考勤绩效指标扣减分数',
`assessScoreAdd` decimal(10,2) COMMENT '评价绩效指标增加分数',
`assessScoreSub` decimal(10,2) COMMENT '评价绩效指标扣减分数',
`complainScoreAdd` decimal(10,2) COMMENT '投诉绩效指标增加分数',
`complainScoreSub` decimal(10,2) COMMENT '投诉绩效指标扣减分数',
`workScoreAdd` decimal(10,2) COMMENT '办件绩效指标增加分数',
`workScoreSub` decimal(10,2) COMMENT '办件绩效指标扣减分数',
`effectScoreAdd` decimal(10,2) COMMENT '效能绩效指标增加分数',
`effectScoreSub` decimal(10,2) COMMENT '效能绩效指标扣减分数',
`otherScoreAdd` decimal(10,2) COMMENT '其它绩效指标增加分数',
`otherScoreSub` decimal(10,2) COMMENT '其它绩效指标扣减分数',
`remark` varchar(255) COMMENT '备注',
`year` int(9) NOT NULL COMMENT '年',
`month` tinyint(2) NOT NULL COMMENT '月',
`day` tinyint(2) NOT NULL COMMENT '日',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建人id',
`updateTime` datetime COMMENT '更新时间',
`updateUserId` bigint(20) COMMENT '更新人id',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
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