Merge remote-tracking branch 'origin/master'

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";

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

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

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();