Skip to content

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

修改考勤汇总

parent 8631caac
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 32 deletions
attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
View file @ d62a02f4
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
{ label: "姓名", prop: "staffName" }, { label: "姓名", prop: "staffName" },
{ label: "工号", prop: "workNum" }, { label: "工号", prop: "workNum" },
{ label: "手机号", prop: "phoneNumber" }, { label: "手机号", prop: "phoneNumber" },
{ label: "所属部门", prop: "deptName" }, { label: "所属部门", prop: "deptName" },
...@@ -103,15 +103,16 @@ export default { ...@@ -103,15 +103,16 @@ export default {
}, },
}, },
{ label: "考勤绩效", prop: "attendScore", formatter: this.formatter }, { label: "考勤绩效指标分数", prop: "attendScore", formatter: this.formatter },
{ label: "评价绩效", prop: "assessScore", formatter: this.formatter }, { label: "评价绩效指标分数", prop: "reviewScore", formatter: this.formatter },
{ label: "投诉绩效指标分数", prop: "reviewScore", formatter: this.formatter },
{ label: "办件绩效", prop: "workScore", formatter: this.formatter }, { label: "办件绩效分数", prop: "workScore", formatter: this.formatter },
{ label: "效能绩效", prop: "effectScore", formatter: this.formatter }, { label: "效能绩效分数", prop: "effectScore", formatter: this.formatter },
{ label: "其它绩效", prop: "otherScore", formatter: this.formatter }, { label: "其它绩效分数", prop: "otherScore", formatter: this.formatter },
{ {
label: "累计异常分数", label: "累计异常分数",
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/MockDataController.java
View file @ d62a02f4
...@@ -199,13 +199,13 @@ public class MockDataController { ...@@ -199,13 +199,13 @@ public class MockDataController {
statEntity.setWorkNum(item.getWorkNum()); statEntity.setWorkNum(item.getWorkNum());
statEntity.setDeptId(item.getDeptId()); statEntity.setDeptId(item.getDeptId());
statEntity.setDeptName(item.getDeptName()); statEntity.setDeptName(item.getDeptName());
BigDecimal attendScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal attendScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal reviewScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal reviewScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal complainScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal complainScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal goworkScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal goworkScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal effectScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal effectScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal otherScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal otherScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal errorScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING); BigDecimal errorScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
BigDecimal totalScore = attendScore.add(reviewScore).add(complainScore).add(goworkScore).add(effectScore).add(otherScore).add(errorScore); BigDecimal totalScore = attendScore.add(reviewScore).add(complainScore).add(goworkScore).add(effectScore).add(otherScore).add(errorScore);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @ d62a02f4
...@@ -74,7 +74,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -74,7 +74,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
for (PersonInfo personInfo : personInfoList) { for (PersonInfo personInfo : personInfoList) {
StaffEntity staffEntity = staffService.getExtCache(StrUtil.padPre(personInfo.getJobNo(), 8, "0")); StaffEntity staffEntity = staffService.getExtCache(StrUtil.padPre(personInfo.getJobNo(), 8, "0"));
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().deptCode(personInfo.getOrgIndexCode())); DeptEntity deptEntity = deptService.selectOne(new DeptQuery().deptCode(personInfo.getOrgIndexCode()));
// AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId())); // AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
// AttendanceStatEntity statEntity = attendanceStatService.selectOne(new AttendanceStatQuery().staffId(staffEntity.getId())); // AttendanceStatEntity statEntity = attendanceStatService.selectOne(new AttendanceStatQuery().staffId(staffEntity.getId()));
//判断本地数据是否为空 //判断本地数据是否为空
if (ObjectUtils.isEmpty(staffEntity)) { if (ObjectUtils.isEmpty(staffEntity)) {
...@@ -106,7 +106,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -106,7 +106,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
balanceEntity.setCreateUserId(1L); balanceEntity.setCreateUserId(1L);
balanceEntity.setCreateTime(new Date()); balanceEntity.setCreateTime(new Date());
balanceService.save(balanceEntity); balanceService.save(balanceEntity);
//AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId())); //AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
AttendanceStatEntity attendanceStatEntity = new AttendanceStatEntity(); AttendanceStatEntity attendanceStatEntity = new AttendanceStatEntity();
attendanceStatEntity.initAttrValue(); attendanceStatEntity.initAttrValue();
...@@ -140,13 +140,18 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -140,13 +140,18 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
attendanceStatEntity.setPersonalLeave(balanceEntity.getPersonalLeaveDays()); attendanceStatEntity.setPersonalLeave(balanceEntity.getPersonalLeaveDays());
attendanceStatService.save(attendanceStatEntity); attendanceStatService.save(attendanceStatEntity);
//统计各级部门员工数量 todo 优化统计 //统计各级部门员工数量 todo 优化统计
String ancestor = deptEntity.getAncestors().split(",", 2)[1]; if (!ObjectUtils.isEmpty(deptEntity.getAncestors())) {
String[] ancestors = ancestor.split(","); String[] split = deptEntity.getAncestors().split(",", 2);
for (String newAncestor : ancestors) { if (split.length > 1) {
DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor)); String ancestor = split[1];
if (Objects.nonNull(deptEntity2)) { String[] ancestors = ancestor.split(",");
deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1); for (String newAncestor : ancestors) {
deptService.update(deptEntity2); DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
if (Objects.nonNull(deptEntity2)) {
deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
deptService.update(deptEntity2);
}
}
} }
} }
} else { } else {
...@@ -166,13 +171,18 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -166,13 +171,18 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
staffEntity.setUpdateTime(new Date()); staffEntity.setUpdateTime(new Date());
staffService.update(staffEntity); staffService.update(staffEntity);
//统计各级部门员工数量 //统计各级部门员工数量
String ancestor = deptEntity.getAncestors().split(",", 2)[1]; if (!ObjectUtils.isEmpty(deptEntity.getAncestors())) {
String[] ancestors = ancestor.split(","); String[] split = deptEntity.getAncestors().split(",", 2);
for (String newAncestor : ancestors) { if(split.length>1){
DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor)); String ancestor = split[1];
if (Objects.nonNull(deptEntity2)) { String[] ancestors = ancestor.split(",");
deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1); for (String newAncestor : ancestors) {
deptService.update(deptEntity2); DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
if (Objects.nonNull(deptEntity2)) {
deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
deptService.update(deptEntity2);
}
}
} }
} }
} }
...@@ -220,6 +230,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -220,6 +230,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
} }
} }
} }
@Override @Override
public void stopTask(ITask task) throws AppException { public void stopTask(ITask task) throws AppException {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
View file @ d62a02f4
...@@ -122,7 +122,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID ...@@ -122,7 +122,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config(); com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
config.protocol = "https"; config.protocol = "https";
config.regionId = "central"; config.regionId = "central";
config.endpoint = domain.replace("http://", ""); // config.endpoint = domain.replace("http://", "");
return new com.aliyun.dingtalkworkflow_1_0.Client(config); return new com.aliyun.dingtalkworkflow_1_0.Client(config);
} }
...@@ -132,11 +132,11 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID ...@@ -132,11 +132,11 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
com.aliyun.dingtalkworkflow_1_0.Client client = createClient(); com.aliyun.dingtalkworkflow_1_0.Client client = createClient();
com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders(); com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken(); getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken();
HashMap<String, String> map = new HashMap<>(); /* HashMap<String, String> map = new HashMap<>();
getProcessInstanceHeaders.setCommonHeaders(map); getProcessInstanceHeaders.setCommonHeaders(map);
getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113"); getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113");
getProcessInstanceHeaders.getCommonHeaders().put("port", "8918"); getProcessInstanceHeaders.getCommonHeaders().put("port", "8918");
getProcessInstanceHeaders.getCommonHeaders().put("protocol", "http"); getProcessInstanceHeaders.getCommonHeaders().put("protocol", "http");*/
com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest() com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
.setProcessInstanceId(processInstanceId); .setProcessInstanceId(processInstanceId);
......
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