人员列表

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/UserMapperDto.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/4/22
+ */
+@Data
+public class UserMapperDto {
+
+    private String  sequenceNbr;
+    //头像
+    private String  headphoto;
+    //姓名
+    private String  name;
+    //性别
+    private String  sex;
+    //联系电话
+    private String  phone;
+    //所属场站
+    private String  projectName;
+    //岗位名称
+    private String   postName;
+    //系统账户
+    private String  accountName;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

 package com.yeejoin.amos.boot.module.jxiop.api.mapper;
 
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 人员基本信息 Mapper 接口
  *
@@ -11,4 +15,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
 
+
+    List<UserMapperDto> queryPage(Long current, Long size,
+                                  String name,
+                                  String accountName,
+                                  String projectId);
+
+    List<UserMapperDto> queryPagecount(
+            String name,
+            String accountName,
+            String projectId);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -2,4 +2,62 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper">
 
+
+
+    <select id="queryPage" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto">
+
+        select
+        person_basic.sequence_nbr sequenceNbr,
+        person_basic.head_photo headphoto,
+        person_basic.`name` name,
+        person_basic.sex,
+        person_basic.phone phone,
+        person_ascription.project_name projectName,
+        person_ascription.post_name postName,
+        person_account.account_name accountName
+        from person_basic
+        LEFT JOIN person_ascription
+        on person_ascription.person_id=person_basic.sequence_nbr
+        LEFT JOIN person_account
+        on person_account.person_id=person_basic.sequence_nbr
+        <where>
+            person_basic.is_delete=0
+            <if test="name != null and name != ''">
+                AND person_basic.name like concat(#{name},'%')
+            </if>
+            <if test="accountName != null and accountName != ''">
+                AND person_account.account_name like concat(#{accountName},'%')
+            </if>
+            <if test="projectId != null and projectId != ''">
+                AND person_ascription.project_id = #{projectId}
+            </if>
+        </where>
+        ORDER BY  person_basic.rec_date DESC
+        limit #{current},#{size}
+    </select>
+
+    <select id="queryPagecount" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto">
+
+        select
+        person_basic.sequence_nbr sequenceNbr
+        from person_basic
+        LEFT JOIN person_ascription
+        on person_ascription.person_id=person_basic.sequence_nbr
+        LEFT JOIN person_account
+        on person_account.person_id=person_basic.sequence_nbr
+        <where>
+            person_basic.is_delete=0
+            <if test="name != null and name != ''">
+                AND person_basic.name like concat(#{name},'%')
+            </if>
+            <if test="accountName != null and accountName != ''">
+                AND person_account.account_name like concat(#{accountName},'%')
+            </if>
+            <if test="projectId != null and projectId != ''">
+                AND person_ascription.project_id = #{projectId}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -95,14 +97,23 @@ public class PersonBasicController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "人员基本信息分页查询",  notes = "人员基本信息分页查询")
-	public ResponseModel<Page<PersonBasicDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<PersonBasicDto> page = new Page<PersonBasicDto>();
+	public ResponseModel<Page<UserMapperDto>> queryForPage(
+	        @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size,
+            @RequestParam(value = "name",required = false) String name,
+            @RequestParam(value = "accountName",required = false)String accountName,
+            @RequestParam(value = "projectId",required = false)String projectId
+
+    ) {
+        Page<UserMapperDto> page = new Page<UserMapperDto>();
         page.setCurrent(current);
         page.setSize(size);
-	    return ResponseHelper.buildResponse(personBasicServiceImpl.queryForPersonBasicPage(page));
+        return ResponseHelper.buildResponse(personBasicServiceImpl.queryPage(page, name,
+                accountName,
+                projectId));
     }
 
+    
 	/**
 	 * 列表全部数据查询
      *

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
-import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonDto;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonUser;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -34,7 +31,8 @@ import java.util.*;
 @Service
 public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBasic,PersonBasicMapper> implements IPersonBasicService {
 
-
+    @Autowired
+    PersonBasicMapper personBasicMapper;
 
     @Autowired
     PrivilegeFeignClient privilegeFeignClient;
@@ -113,4 +111,26 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
 
 
+    /**
+     * 分页查询
+     */
+    public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
+                                           String name,
+                                           String accountName,
+                                           String projectId)   {
+        List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  name,
+                accountName,
+                projectId);
+        List<UserMapperDto> listcount=personBasicMapper.queryPagecount( name,
+                accountName,
+                projectId);
+        page.setTotal(listcount.size());
+        page.setRecords(list);
+        return page;
+    }
+
+
+
+
+
 }
\ No newline at end of file