diff --git a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
index 3f5b1ee65e5ee920b0a04ce0156e44b01f99b975..70df0fc75c8742850eae2fe6c4e0b4ae5ca90d27 100644
--- a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
@@ -133,6 +133,12 @@ export default {
this.$post("/check/all/record/list", {
checkStatus: 2,
staffId: id,
+ checkTimeStart: this.$route.query.yearmonth
+ ? this.$route.query.yearmonth + "-01"
+ : "",
+ checkTimeEnd: this.$route.query.yearmonth
+ ? this.$route.query.yearmonth + "-31"
+ : "",
}).then((res) => {
const { code, data, dict } = res;
if (code == 1) {
@@ -164,7 +170,9 @@ export default {
/** 鏌ョ湅*/
view(row) {
this.reset();
- this.query = { id: row.id };
+ this.query = {
+ id: row.id,
+ };
this.urls.currUrl = "staff/perform/summary/view";
this.getData();
this.pageInfo.type = "view";
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java
index 334069f484cfa69bb6f39c908f1bd3b4cfc696be..c3b7bb214b13709af4b146fc0ff02919801bc5b3 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java
@@ -39,4 +39,6 @@ public class UserVo extends BaseEntityLong {
* 杩囨湡鏃堕棿
*/
private Long expireTime;
+
+ String roleIdStrs;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
index b6ece9781403409df7ab8021d46717210c31154e..83bc66237a383884c8a8e3bd391a4c6da05c5357 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
@@ -24,6 +24,7 @@ import com.mortals.xhx.base.system.resource.model.ResourceEntity;
import com.mortals.xhx.base.system.resource.service.ResourceService;
import com.mortals.xhx.base.system.role.dao.RoleUserDao;
import com.mortals.xhx.base.system.role.model.RoleUserEntity;
+import com.mortals.xhx.base.system.role.model.RoleUserQuery;
import com.mortals.xhx.base.system.user.dao.UserDao;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.model.UserQuery;
@@ -33,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>Title: 鐢ㄦ埛淇℃伅</p>
@@ -149,6 +151,12 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
roleIds.add(role.getRoleId());
});
item.setRoleIds(roleIds);
+ String roleIdStrs = StringUtils.join(roleIds, ",");
+ item.setRoleIdStrs(roleIdStrs);
+ RoleUserQuery roleUserQuery = new RoleUserQuery();
+ roleUserQuery.setUserId(item.getId());
+
+
});
}
}
@@ -338,4 +346,5 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
public UserDao getUserDao() {
return this.getDao();
}
+
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java
index 02a4774abd7b342f360a59cc51365850aa44eaf0..289b4d548a4da02a20e6666a356599f34a49f029 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java
@@ -43,6 +43,32 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptName;
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ private String phoneNumer;
+
+ @Excel(name = "鍑哄嫟澶╂暟")
+ private Integer workDays;
+ /**
+ * 鍑哄嫟澶╂暟
+ */
+ @Excel(name = "瀹為檯鍑哄嫟澶╂暟")
+ private Integer goTimes;
+ /**
+ * 鑰冨嫟姹囨€�-鍑哄嫟鐜囷紙%锛�
+ */
+ @Excel(name = "鑰冨嫟姹囨€�-鍑哄嫟鐜�",percentEnabled = true,suffix="%",scale=2)
+ private BigDecimal attendanceRate;
+ /**
+ * 涓婂崍缂哄崱娆℃暟
+ */
+ @Excel(name = "缂哄崱娆℃暟")
+ private Integer morningTimes;
+ /**
+ * 涓嬪崍缂哄崱娆℃暟
+ */
+ private Integer afternoonTimes;
/**
* 鍥炲崟浣嶏紙澶╋級
*/
@@ -133,11 +159,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/
@Excel(name = "鑰冨嫟姹囨€�-鍏朵粬")
private BigDecimal otherDays;
- /**
- * 鑰冨嫟姹囨€�-鍑哄嫟鐜囷紙%锛�
- */
- @Excel(name = "鑰冨嫟姹囨€�-鍑哄嫟鐜�",percentEnabled = true,suffix="%",scale=2)
- private BigDecimal attendanceRate;
+
/**
* 鑰冨嫟姹囨€�-鏈寜瑙勫畾鎵撳崱锛堝惈蹇樿鎵撳崱锛�
*/
@@ -219,26 +241,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/
@Excel(name = "闄骇鍋�")
private BigDecimal paternityLeaveDays;
- /**
- * 鎵嬫満鍙风爜
- */
- private String phoneNumer;
- @Excel(name = "搴斿埌澶╂暟")
- private Integer workDays;
- /**
- * 鍑哄嫟澶╂暟
- */
- @Excel(name = "鍑哄嫟澶╂暟")
- private Integer goTimes;
- /**
- * 涓婂崍缂哄崱娆℃暟
- */
- @Excel(name = "缂哄崱娆℃暟")
- private Integer morningTimes;
- /**
- * 涓嬪崍缂哄崱娆℃暟
- */
- private Integer afternoonTimes;
+
@Override
public int hashCode() {
return this.getId().hashCode();