Skip to content

N
notes2.0
提交 c8c0b1ed authored 作者: gongwenjie's avatar gongwenjie
浏览文件
操作

通知

上级 5f2b40fb
隐藏空白字符变更
内嵌 并排
正在显示 包含 248 行增加 和 46 行删除
notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/AttendanceController.java
浏览文件 @ c8c0b1ed
......@@ -2,6 +2,7 @@ package com.zjty.tynotes.attendance.controller;
import com.zjty.tynotes.attendance.entity.ApprovalInformation;
import com.zjty.tynotes.attendance.entity.vo.UserAttenList;
import com.zjty.tynotes.attendance.entity.vo.UserOverWorkVo;
import com.zjty.tynotes.attendance.entity.vo.request.AttenRequest;
import com.zjty.tynotes.attendance.service.AttendanceDetailsService;
import com.zjty.tynotes.misc.config.AutoDocument;
......@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static org.springframework.http.ResponseEntity.ok;
/**
......@@ -46,5 +49,38 @@ public class AttendanceController {
return ok(userAttenList);
}
// @ApiOperation(value = "查询加班时长", response = ApprovalInformation.class)
// @PostMapping("/findOverWork/{type}")
// public ResponseEntity findAttenList(@RequestBody AttenRequest request,@PathVariable String type){
// UserAttenList userAttenList = attendanceDetailsService.findAttenList(request,type);
// return ok(userAttenList);
// }
@ApiOperation(value = "查询个人加班时长", response = ApprovalInformation.class)
@GetMapping("/findOverWork/{userId}")
public ResponseEntity findOverWork(@PathVariable String userId){
UserOverWorkVo userOverWorkVo = attendanceDetailsService.findOverWork(userId);
return ok(userOverWorkVo);
}
@ApiOperation(value = "清空加班时长", response = ApprovalInformation.class)
@GetMapping("/clearUserWork")
public ResponseEntity clearUserWork(){
try {
attendanceDetailsService.clearUserWork();
return ok("清空加班时长成功");
} catch (Exception e) {
e.printStackTrace();
}
return ok("清空加班时长失败");
}
@ApiOperation(value = "查询所有人加班时长", response = ApprovalInformation.class)
@GetMapping("/findAllOverWork/{userId}")
public ResponseEntity findAllOverWork(@PathVariable String userId){
List<UserOverWorkVo> userOverWorkVos = attendanceDetailsService.findAllOverWork(userId);
return ok(userOverWorkVos);
}
}
notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/exl/DepartmentExl.java
浏览文件 @ c8c0b1ed
......@@ -34,26 +34,26 @@ public class DepartmentExl {
@Excel(name = "出差天数", orderNum = "7", width = 20)
private Float outWorkDay;
@Excel(name = "病假天数", orderNum = "8", width = 20)
private Float sickLeaveDay;
@Excel(name = "事假天数", orderNum = "9", width = 20)
private Float thingLeaveDay;
@Excel(name = "旷工天数", orderNum = "10", width = 20)
private Float absenteeismDay;
@Excel(name = "迟到15分钟", orderNum = "11", width = 20)
private Integer lateOne;
@Excel(name = "迟到一小时", orderNum = "12", width = 20)
private Integer lateTwo;
@Excel(name = "迟到半天", orderNum = "13", width = 20)
private Integer lateThree;
@Excel(name = "迟到一天", orderNum = "14", width = 20)
private Integer lateFour;
@Excel(name = "请假天数", orderNum = "8", width = 20)
private Float leaveDay;
@Excel(name = "备注", orderNum = "9", width = 20)
private String details;
// @Excel(name = "旷工天数", orderNum = "10", width = 20)
// private Float absenteeismDay;
//
// @Excel(name = "迟到15分钟", orderNum = "11", width = 20)
// private Integer lateOne;
//
// @Excel(name = "迟到一小时", orderNum = "12", width = 20)
// private Integer lateTwo;
//
// @Excel(name = "迟到半天", orderNum = "13", width = 20)
// private Integer lateThree;
//
// @Excel(name = "迟到一天", orderNum = "14", width = 20)
// private Integer lateFour;
}
notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/UserAttenVo.java
浏览文件 @ c8c0b1ed
......@@ -29,6 +29,9 @@ public class UserAttenVo {
@ApiModelProperty(value = "实际出勤天数",example = "1")
private Float realAttendanceDay;
@ApiModelProperty(value = "调休天数",example = "1")
private Float paidLeaveDay;
@ApiModelProperty(value = "公出天数",example = "1")
private Float outSideBusinessDay;
......@@ -65,6 +68,9 @@ public class UserAttenVo {
@ApiModelProperty(value = "旷工天数",example = "1")
private Float absenteeismDay;
@ApiModelProperty(value = "备注",example = "1")
private String details;
public UserAttenVo() {
this.attendanceDay = 0;
......@@ -81,20 +87,21 @@ public class UserAttenVo {
this.thingDay = 0f;
this.overWorkHours = 0;
this.absenteeismDay = 0f;
this.paidLeaveDay = 0f;
}
public void computerRealAttendanceDay(){
realAttendanceDay = attendanceDay - outSideBusinessDay - outWorkDay - sickLeaveDay - absenteeismDay;
realAttendanceDay = attendanceDay - outSideBusinessDay - outWorkDay - sickLeaveDay - absenteeismDay - paidLeaveDay;
}
public DepartmentExl convert(){
Float leaveDay = thingDay+sickLeaveDay;
return new DepartmentExl(name,attendanceDay,realAttendanceDay,
outSideBusinessDay,lateDay,leaveEarlyDay,outWorkDay,
sickLeaveDay,thingDay,absenteeismDay,lateOne,lateTwo,
lateThree,lateFour);
leaveDay,null);
}
......
notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/UserOverWorkVo.java 0 → 100644
浏览文件 @ c8c0b1ed
package com.zjty.tynotes.attendance.entity.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author gwj
* @create 2020/5/29 14:18
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "返回前端员工加班时长", description = "返回前端员工加班时长")
public class UserOverWorkVo {
@ApiModelProperty(value = "名字",example = "gwj")
private String name;
@ApiModelProperty(value = "加班时长",example = "2")
private Long overWorkHour;
}
notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/AttendanceDetailsService.java
浏览文件 @ c8c0b1ed
......@@ -2,6 +2,7 @@ package com.zjty.tynotes.attendance.service;
import com.zjty.tynotes.attendance.entity.vo.UserAttenList;
import com.zjty.tynotes.attendance.entity.vo.UserAttenVo;
import com.zjty.tynotes.attendance.entity.vo.UserOverWorkVo;
import com.zjty.tynotes.attendance.entity.vo.request.AttenRequest;
import com.zjty.tynotes.pas.entity.Department;
......@@ -41,4 +42,23 @@ public interface AttendanceDetailsService {
* @return
*/
UserAttenList findAttenList(AttenRequest request, String type);
/**
* 查询加班时长
* @param userId
* @return
*/
UserOverWorkVo findOverWork(String userId);
/**
* 清空加班时长
*/
void clearUserWork();
/**
* 查询所有人加班时长
* @param userId
* @return
*/
List<UserOverWorkVo> findAllOverWork(String userId);
}
notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java
浏览文件 @ c8c0b1ed
package com.zjty.tynotes.attendance.service.impl;
import com.zjty.tynotes.attendance.dao.AttendanceDetailsDao;
import com.zjty.tynotes.attendance.dao.UserOverWorkDao;
import com.zjty.tynotes.attendance.entity.AttendanceDetails;
import com.zjty.tynotes.attendance.entity.UserOverWork;
import com.zjty.tynotes.attendance.entity.vo.UserAttenList;
import com.zjty.tynotes.attendance.entity.vo.UserAttenVo;
import com.zjty.tynotes.attendance.entity.vo.UserOverWorkVo;
import com.zjty.tynotes.attendance.entity.vo.request.AttenRequest;
import com.zjty.tynotes.attendance.service.AttendanceDetailsService;
import com.zjty.tynotes.pas.dao.*;
......@@ -42,12 +45,15 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
private AuthorityDao authorityDao;
@Autowired
private DepartmentDao departmentDao;
@Autowired
private UserOverWorkDao userOverWorkDao;
@Override
public UserAttenVo findPersonnel(AttenRequest request) {
UserAttenVo userAttenVo = new UserAttenVo();
SimpleDateFormat sdf = null;
sdf = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
String date = request.getStartDate();
String endDate = request.getEndDate();
......@@ -99,9 +105,16 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
}
if(attendanceDetails.getSickLeaveDay()!=null){
userAttenVo.setSickLeaveDay(userAttenVo.getSickLeaveDay()+attendanceDetails.getSickLeaveDay());
String format = simpleDateFormat.format(attendanceDetails.getAttenDate());
userAttenVo.setDetails(userAttenVo.getDetails()+format+"病假");
}
if(attendanceDetails.getThingLeaveDay()!=null){
userAttenVo.setThingDay(userAttenVo.getThingDay()+attendanceDetails.getThingLeaveDay());
String format = simpleDateFormat.format(attendanceDetails.getAttenDate());
userAttenVo.setDetails(userAttenVo.getDetails()+format+"事假");
}
if(attendanceDetails.getPaidLeaveDay()!=null){
userAttenVo.setPaidLeaveDay(userAttenVo.getPaidLeaveDay()+attendanceDetails.getPaidLeaveDay());
}
if(("0").equals(attendanceDetails.getIsLateDay())){
if(attendanceDetails.getLateStatus().equals("0")){
......@@ -313,6 +326,109 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
return userAttenList;
}
/**
* 查询个人加班时长
* @param userId
* @return
*/
@Override
public UserOverWorkVo findOverWork(String userId) {
UserOverWorkVo userOverWorkVo = new UserOverWorkVo();
UserOverWork userOverWork = userOverWorkDao.findByUserId(userId);
Optional<User> optional = pasUserDao.findById(userId);
if(optional.isPresent()){
User user = optional.get();
userOverWorkVo.setName(user.getUsername());
}
if(userOverWork!=null){
userOverWorkVo.setOverWorkHour(userOverWork.getOverWorkHour());
}else{
userOverWorkVo.setOverWorkHour(0L);
}
return userOverWorkVo;
}
/**
* 清空加班时长
*/
@Override
public void clearUserWork() {
userOverWorkDao.deleteAll();
}
/**
* 查询所有人加班时长
* @param userId
* @return
*/
@Override
public List<UserOverWorkVo> findAllOverWork(String userId) {
List<UserOverWorkVo> userOverWorkVos = new ArrayList<>();
List<User> users = pasUserDao.findAll();
List<User> userList = new ArrayList<>();
List<String> departIds = new ArrayList<>();
List<String> departmentIds = new ArrayList<>();
Optional<User> byId = pasUserDao.findById(userId);
if(byId.isPresent()){
User user = byId.get();
List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
if(userRoles!=null){
List<String> roleIds = new ArrayList<>();
userRoles.forEach(userRole -> {
roleIds.add(userRole.getRoleId());
});
List<Role> roles = roleDao.findAllByIdIn(roleIds);
if(roles!=null){
roles.forEach(role -> {
if(role.getIsLeader().equals("0")){
departmentIds.add(role.getDepartmentId());
}
});
}
}
}
if(departmentIds!=null){
List<String> deIds = new ArrayList<>();
for (String s : departmentIds) {
deIds = getDepartIds(deIds,s);
if(deIds!=null){
for (String s1 : deIds) {
if(!departIds.contains(s1)){
departIds.add(s1);
}
}
}
}
}
if(users!=null){
for (User user : users) {
if(departIds!=null){
List<String> departmentIds1 = user.getDepartmentIds();
if(departmentIds1!=null){
for (String s : departmentIds1) {
if(departIds.contains(s)){
userList.add(user);
break;
}
}
}
}
}
}
List<String> userIds = new ArrayList<>();
userList.forEach(user -> {
userIds.add(user.getId());
});
if(userIds!=null){
userIds.forEach(uId->{
UserOverWorkVo overWork = findOverWork(uId);
userOverWorkVos.add(overWork);
});
}
return userOverWorkVos;
}
/**
* 递归获得部门树
......
notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java
浏览文件 @ c8c0b1ed
......@@ -47,22 +47,22 @@ public class UnionApplication
SpringApplication.run(UnionApplication.class, args);
}
// 开始支持http
@Bean
public ServletWebServerFactory servletContainer() {
TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
return tomcat;
}
private Connector createHTTPConnector() {
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
//同时启用http（8080）、https（8443）两个端口
connector.setScheme("http");
connector.setSecure(false);
connector.setPort(8084);
connector.setRedirectPort(8289);
return connector;
}
// @Bean
// public ServletWebServerFactory servletContainer() {
// TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
// tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
// return tomcat;
// }
//
// private Connector createHTTPConnector() {
// Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
// //同时启用http（8080）、https（8443）两个端口
// connector.setScheme("http");
// connector.setSecure(false);
// connector.setPort(8084);
// connector.setRedirectPort(8289);
// return connector;
// }
}
notes-union/src/main/resources/application.properties
浏览文件 @ c8c0b1ed
......@@ -3,13 +3,13 @@ spring.application.name=workbook
## https端口号.
server.port=8289
# 证书的路径.
server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
# 证书密码，请修改为您自己证书的密码.
server.ssl.key-store-password=bMEPW9BG
# 秘钥库类型
server.ssl.keyStoreType=PKCS12
# 证书别名
server.ssl.keyAlias= alias
#server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
## 证书密码，请修改为您自己证书的密码.
#server.ssl.key-store-password=bMEPW9BG
## 秘钥库类型
#server.ssl.keyStoreType=PKCS12
## 证书别名
#server.ssl.keyAlias= alias
#mongodb configuration
spring.data.mongodb.uri=mongodb://localhost:27017/notes5
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论