Skip to content

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

添加申诉统计业务

parent 028824c4
Hide whitespace changes
Inline Side-by-side
Showing with 3433 additions and 3395 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java
View file @ 2e67a0e7
...@@ -63,8 +63,6 @@ public class ApiWebPerformController extends AbstractBaseControll ...@@ -63,8 +63,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部考勤新增"; String busiDesc = "外部考勤新增";
Rest rest = Rest.ok(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 { try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
...@@ -90,9 +88,7 @@ public class ApiWebPerformController extends AbstractBaseControll ...@@ -90,9 +88,7 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部评价新增"; String busiDesc = "外部评价新增";
Rest rest = Rest.ok(busiDesc + "成功！"); Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder(); try {
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.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
boolean bool = review(req); boolean bool = review(req);
...@@ -117,8 +113,6 @@ public class ApiWebPerformController extends AbstractBaseControll ...@@ -117,8 +113,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部投诉新增"; String busiDesc = "外部投诉新增";
Rest rest = Rest.ok(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 { try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
...@@ -144,8 +138,6 @@ public class ApiWebPerformController extends AbstractBaseControll ...@@ -144,8 +138,6 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部办件新增"; String busiDesc = "外部办件新增";
Rest rest = Rest.ok(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 { try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
...@@ -171,9 +163,7 @@ public class ApiWebPerformController extends AbstractBaseControll ...@@ -171,9 +163,7 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部效能新增"; String busiDesc = "外部效能新增";
Rest rest = Rest.ok(busiDesc + "成功！"); Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder(); try {
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.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
boolean bool = effect(req); boolean bool = effect(req);
...@@ -198,9 +188,7 @@ public class ApiWebPerformController extends AbstractBaseControll ...@@ -198,9 +188,7 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "外部其它绩效新增"; String busiDesc = "外部其它绩效新增";
Rest rest = Rest.ok(busiDesc + "成功！"); Rest rest = Rest.ok(busiDesc + "成功！");
StringBuilder message = new StringBuilder(); try {
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.getPhone())) throw new AppException("手机号码不能为空！");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
boolean bool = other(req); boolean bool = other(req);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
View file @ 2e67a0e7
package com.mortals.xhx.module.feedback.web; package com.mortals.xhx.module.feedback.web;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
...@@ -181,4 +182,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba ...@@ -181,4 +182,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
return ret; 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 @ 2e67a0e7
package com.mortals.xhx.module.staff.model; package com.mortals.xhx.module.staff.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo; import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
import lombok.Data; import lombok.Data;
/** /**
* 员工绩效统计实体对象 * 员工绩效统计实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-11 * @date 2023-07-13
*/ */
@Data @Data
public class StaffPerformStatEntity extends StaffPerformStatVo { public class StaffPerformStatEntity extends StaffPerformStatVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 部门id号 * 部门id号
*/ */
private Long deptId; private Long staffId;
/** /**
* 部门名称 * 部门名称
*/ */
private String deptName; private String staffName;
/** /**
* 员工绩效总分数 * 员工绩效总分数
*/ */
@Excel(name = "员工绩效总分数") @Excel(name = "员工绩效总分数")
private BigDecimal totalScore; private BigDecimal totalScore;
/** /**
* 备注 * 员工绩效加分总分数汇总
*/ */
private String remark; @Excel(name = "员工绩效加分总分数汇总")
/** private BigDecimal totalAddScore;
* 年
*/
private Integer year;
/** /**
* 月 * 员工绩效减分总分数汇总
*/ */
private Integer month; @Excel(name = "员工绩效减分总分数汇总")
private BigDecimal totalSubScore;
/** /**
* 考勤绩效指标增加分数 * 考勤绩效指标增加分数
*/ */
private BigDecimal attendScoreAdd; private BigDecimal attendScoreAdd;
/** /**
* 考勤绩效指标扣减分数 * 考勤绩效指标扣减分数
*/ */
private BigDecimal attendScoreSub; private BigDecimal attendScoreSub;
/** /**
* 评价绩效指标增加分数 * 评价绩效指标增加分数
*/ */
private BigDecimal assessScoreAdd; private BigDecimal assessScoreAdd;
/** /**
* 评价绩效指标扣减分数 * 评价绩效指标扣减分数
*/ */
private BigDecimal assessScoreSub; private BigDecimal assessScoreSub;
/** /**
* 办件绩效指标增加分数 * 投诉绩效指标增加分数
*/ */
private BigDecimal complainScoreAdd;
/**
* 投诉绩效指标扣减分数
*/
private BigDecimal complainScoreSub;
/**
* 办件绩效指标增加分数
*/
private BigDecimal workScoreAdd; private BigDecimal workScoreAdd;
/** /**
* 办件绩效指标扣减分数 * 办件绩效指标扣减分数
*/ */
private BigDecimal workScoreSub; private BigDecimal workScoreSub;
/** /**
* 效能绩效指标增加分数 * 效能绩效指标增加分数
*/ */
private BigDecimal effectScoreAdd; private BigDecimal effectScoreAdd;
/** /**
* 效能绩效指标扣减分数 * 效能绩效指标扣减分数
*/ */
private BigDecimal effectScoreSub; private BigDecimal effectScoreSub;
/** /**
* 其它绩效指标增加分数 * 其它绩效指标增加分数
*/ */
private BigDecimal otherScoreAdd; private BigDecimal otherScoreAdd;
/** /**
* 其它绩效指标扣减分数 * 其它绩效指标扣减分数
*/ */
private BigDecimal otherScoreSub; private BigDecimal otherScoreSub;
/** /**
* 日 * 备注
*/ */
private Integer day; private String remark;
/**
* 员工绩效加分总分数汇总
*/
@Excel(name = "员工绩效加分总分数汇总")
private BigDecimal totalAddScore;
/** /**
* 员工绩效减分总分数汇总 * 年
*/ */
@Excel(name = "员工绩效减分总分数汇总") private Integer year;
private BigDecimal totalSubScore;
/** /**
* 投诉绩效指标增加分数 * 月
*/ */
private BigDecimal complainScoreAdd; private Integer month;
/** /**
* 投诉绩效指标扣减分数 * 日
*/ */
private BigDecimal complainScoreSub; private Integer day;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) return false; if (obj == null) return false;
if (obj instanceof StaffPerformStatEntity) { if (obj instanceof StaffPerformStatEntity) {
StaffPerformStatEntity tmp = (StaffPerformStatEntity) obj; StaffPerformStatEntity tmp = (StaffPerformStatEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue() {
this.deptId = 0L; this.staffId = 0L;
this.deptName = ""; this.staffName = "";
this.totalScore = new BigDecimal(0); this.totalScore = new BigDecimal(0);
this.remark = ""; this.totalAddScore = new BigDecimal(0);
this.year = -1; this.totalSubScore = new BigDecimal(0);
this.month = -1; this.attendScoreAdd = new BigDecimal(0);
this.attendScoreAdd = new BigDecimal(0); this.attendScoreSub = new BigDecimal(0);
this.attendScoreSub = new BigDecimal(0); this.assessScoreAdd = new BigDecimal(0);
this.assessScoreAdd = new BigDecimal(0); this.assessScoreSub = new BigDecimal(0);
this.assessScoreSub = new BigDecimal(0); this.complainScoreAdd = new BigDecimal(0);
this.workScoreAdd = new BigDecimal(0); this.complainScoreSub = new BigDecimal(0);
this.workScoreSub = new BigDecimal(0); this.workScoreAdd = new BigDecimal(0);
this.effectScoreAdd = new BigDecimal(0); this.workScoreSub = new BigDecimal(0);
this.effectScoreSub = new BigDecimal(0); this.effectScoreAdd = new BigDecimal(0);
this.otherScoreAdd = new BigDecimal(0); this.effectScoreSub = new BigDecimal(0);
this.otherScoreSub = new BigDecimal(0); this.otherScoreAdd = new BigDecimal(0);
this.day = -1; this.otherScoreSub = new BigDecimal(0);
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 @ 2e67a0e7
...@@ -503,3 +503,40 @@ CREATE TABLE mortals_xhx_window_owner_detail( ...@@ -503,3 +503,40 @@ CREATE TABLE mortals_xhx_window_owner_detail(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口负责人详细'; ) 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