用户导出调整

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -164,10 +164,18 @@ public class UserDTO extends BaseDTO implements Serializable {
     /**
      * 手机
      */
-    @Length(min = 0, max = 100)
+    @Length(min = 1, max = 100)
     @ExcelProperty("手机")
     private String mobile;
 
+    @Length(min = 1, max = 100)
+    @ExcelProperty("角色")
+    private String role;
+
+    @Length(min = 1, max = 100)
+    @ExcelProperty("岗位")
+    private String post;
+
     /**
      * 最后登录IP
      */

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -109,6 +109,12 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         if (StringUtils.isNotBlank(projectReportData.getName())) {
             queryWrapper.like("a.name",projectReportData.getName());
         }
+        if (StringUtils.isNotBlank(projectReportData.getDepartment())) {
+            queryWrapper.eq("a.department",projectReportData.getDepartment());
+        }
+        if (StringUtils.isNotBlank(projectReportData.getCompanyId())) {
+            queryWrapper.eq("so.parent_id",projectReportData.getCompanyId());
+        }
         IPage<ExportDTO> list = mapper.exportList(page, queryWrapper);
         for (ExportDTO record : list.getRecords()) {
             //根据用户查询岗位和角色信息

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/dto/ExportDTO.java

@@ -48,4 +48,7 @@ public class ExportDTO extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @Excel(name = "进所日期",exportFormat = "yyyy-MM-dd",importFormat = "yyyy-MM-dd")
     private Date inDate;  //进所日期
+
+    private String department;
+    private String companyId;
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -807,6 +807,10 @@ public class UserController {
             page.setCurrent ( 0 );
             result = userService.findPage ( page, queryWrapper ).getRecords ( );
         }
+        List<String> exportFields = options.getExportFields();
+        exportFields.add("mobile");//手机号
+        exportFields.add("role");//角色
+        exportFields.add("post");//岗位
 
         UserEasyExcel.newInstance ( ).exportExcel ( result, options.getSheetName ( ), UserDTO.class, fileName, options.getExportFields ( ), response );
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -167,9 +167,19 @@
     <!-- 分页查询用户信息 -->
     <select id="findList" resultMap="userResult">
         SELECT
-        <include refid="userColumns"/>
+        <include refid="userColumns"/>,
+        r.id AS "roleDTO.id",
+        r.name AS "roleDTO.name",
+        r.en_name AS "roleDTO.enname",
+        p.id AS "postDTO.id",
+        p.code AS "postDTO.code",
+        p.name AS "postDTO.name"
         FROM sys_user a
         left join sys_cert sc on a.id = sc.user_id and sc.del_flag = '0'
+        LEFT JOIN sys_user_role ur ON ur.user_id = a.id
+        LEFT JOIN sys_role r ON r.id = ur.role_id
+        LEFT JOIN sys_user_post up ON up.user_id = a.id
+        LEFT JOIN sys_post p ON p.id = up.post_id
         <include refid="userJoins"/>
         ${ew.customSqlSegment}
     </select>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -22,9 +22,7 @@ import com.jeeplus.sys.domain.*;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.mapper.OfficeMapper;
 import com.jeeplus.sys.mapper.UserMapper;
-import com.jeeplus.sys.service.dto.CertDTO;
-import com.jeeplus.sys.service.dto.OfficeDTO;
-import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.*;
 import com.jeeplus.sys.service.mapstruct.CertWrapper;
 import com.jeeplus.sys.service.mapstruct.UserWrapper;
 import com.jeeplus.sys.utils.UserUtils;
@@ -252,7 +250,32 @@ public class UserService extends ServiceImpl <UserMapper, User> {
      */
     public IPage <UserDTO> findPage(Page <UserDTO> page, QueryWrapper queryWrapper) {
         queryWrapper.eq ( "a.del_flag", CommonConstants.NOT_DELETED ); // 排除已经删除
-        return baseMapper.findList ( page, queryWrapper );
+        IPage<UserDTO> list = baseMapper.findList(page, queryWrapper);
+        for (UserDTO record : list.getRecords()) {
+            if (CollectionUtil.isNotEmpty(record.getRoleDTOList())){
+                StringBuilder names = new StringBuilder();
+
+                for (RoleDTO roleDTO : record.getRoleDTOList()) {
+                    if (names.length() > 0) {
+                        names.append(",");  // 只有在已有内容的情况下才添加逗号
+                    }
+                    names.append(roleDTO.getName());
+                }
+                record.setRole(names.toString());
+            }
+            if (CollectionUtil.isNotEmpty(record.getPostDTOList())){
+                StringBuilder names = new StringBuilder();
+
+                for (PostDTO postDTO : record.getPostDTOList()) {
+                    if (names.length() > 0) {
+                        names.append(",");  // 只有在已有内容的情况下才添加逗号
+                    }
+                    names.append(postDTO.getName());
+                }
+                record.setPost(names.toString());
+            }
+        }
+        return list;
 
 
     }