1

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDSaveDTO.java

@@ -72,6 +72,8 @@ public class ErpCgDDSaveDTO {
     private String orderNumber;
 
 
+    @Schema(description="关联码")
+    private String linkCode;
     /**
      * @Link SmCgPlanSaveItemDTO
      */

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SimpleUserAllListVO.java

@@ -0,0 +1,14 @@
+package com.bsd.pjcloud.admin.api.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "简要用户信息")
+public class SimpleUserAllListVO {
+
+    private Long id;
+
+    private String nameWithMobile;
+}

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java

@@ -21,11 +21,13 @@ package com.bsd.pjcloud.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
+import com.bsd.pjcloud.admin.api.vo.SimpleUserAllListVO;
 import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
 import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
 import com.bsd.pjcloud.admin.api.vo.UserVO;
@@ -41,10 +43,12 @@ import com.bsd.pjcloud.common.security.annotation.HasPermission;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.HttpHeaders;
 import org.springframework.transaction.annotation.Transactional;
@@ -373,4 +377,16 @@ public class SysUserController {
     public R<List<SysUser>> getUserByMobile(@RequestParam("mobile") String mobile) {
         return R.ok(userService.list(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getPhone, mobile)));
     }
+
+    @GetMapping("/ getSimpleUserAll")
+    @Schema(description = "简要用户信息")
+    public R<List<SimpleUserAllListVO>> getSimpleUserAllList(@RequestParam(value = "mobile",required = false) String mobile,
+                                                       @RequestParam(value = "name",required = false) String name){
+        LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysUserLambdaQueryWrapper.like(StringUtils.isNotBlank(mobile),SysUser::getPhone,mobile);
+        sysUserLambdaQueryWrapper.like(StringUtils.isNotBlank(name),SysUser::getName,name);
+        List<SimpleUserAllListVO> list = userService.listScope(sysUserLambdaQueryWrapper);
+
+        return R.ok(list);
+    }
 }

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java

@@ -19,12 +19,14 @@
 
 package com.bsd.pjcloud.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
+import com.bsd.pjcloud.admin.api.vo.SimpleUserAllListVO;
 import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
 import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
 import com.bsd.pjcloud.admin.api.vo.UserVO;
@@ -191,4 +193,12 @@ public interface SysUserService extends IService<SysUser> {
     R<Boolean> resetUserPassword(UserDTO userDto);
 
     List<UserVO> getUserDeptByIds(List<Long> userIds);
+
+
+    /**
+     * 查询所有用户简单信息
+     * @param sysUserLambdaQueryWrapper
+     * @return
+     */
+    List<SimpleUserAllListVO> listScope(LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper);
 }

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

@@ -26,6 +26,7 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,10 +39,7 @@ import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.*;
 import com.bsd.pjcloud.admin.api.utils.DataUtil;
-import com.bsd.pjcloud.admin.api.vo.SysUserFaceVo;
-import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
-import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
-import com.bsd.pjcloud.admin.api.vo.UserVO;
+import com.bsd.pjcloud.admin.api.vo.*;
 import com.bsd.pjcloud.admin.mapper.SysUserFaceMapper;
 import com.bsd.pjcloud.admin.mapper.SysUserMapper;
 import com.bsd.pjcloud.admin.mapper.SysUserPostMapper;
@@ -767,4 +765,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<UserVO> getUserDeptByIds(List<Long> userIds) {
         return baseMapper.selectVoListByScope(new UserDTO(), userIds.toArray(new Long[0]), null);
     }
+
+    @Override
+    public List<SimpleUserAllListVO> listScope(LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper) {
+        List<SysUser> sysUsers = baseMapper.selectListByScope(sysUserLambdaQueryWrapper,DataScope.of());
+        List<SimpleUserAllListVO> collect = sysUsers.stream().map(sysUser -> {
+            SimpleUserAllListVO vo = new SimpleUserAllListVO();
+            vo.setId(sysUser.getUserId());
+            vo.setNameWithMobile(sysUser.getName() + "-" + sysUser.getPhone());
+            return vo;
+        }).collect(Collectors.toList());
+
+        return collect;
+    }
 }