Merge remote-tracking branch 'origin/develop_1' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -5,8 +5,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.dao.TsUserDao;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +35,8 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
     private ITsInstitutionService tsInstitutionService;
     @Autowired
     private ITsUserService tsUserService;
+    @Autowired
+    private TsUserDao tsUserDao;
 
     /**
      * 查询所有机构
@@ -59,15 +63,14 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
 
     /**
      * 查询机构人员
-     * @param institutionId：机构ID
      * @return ResponseMessage<List<TsUser>>
      */
     @ApiOperation("查询机构的人员")
     @PostMapping("/user")
-    public ResponseMessage<Object> getUserByInstitutionId(TsUser tsUser){
+    public ResponseMessage<IPage<TsUser>> getUserByInstitutionId(TsUser tsUser){
 //        List<TsUser> tsUsers=tsUserService.getUserByInstitutionId(institutionId);
-        List<TsUser> tsUserList =  tsUserService.getUserByInstitutionId(tsUser);
+        IPage<TsUser> tsUserIPage = tsUserService.getUserByInstitutionId(tsUser);
-        return Result.success(tsUserList);
+        return Result.success(tsUserIPage);
     }
 
     @ApiOperation("导入机构数据")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java

@@ -47,7 +47,9 @@ public interface TsUserDao extends BaseMapper<TsUser> {
      * @param institutionId：岗位ID
      * @return List<TsUser>
      */
-    List<TsUser> getUserAndPosition(@Param("TsUser") TsUser tsUser);
+    List<TsUser> getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser);
+
+    Integer getUserAndPositionCount(@Param("TsUser") TsUser tsUser);
     /**
      * 通过岗位Id列表查询用户ID列表
      * @param positionIds：岗位ID列表

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zxy
@@ -142,6 +142,12 @@ public class TsUser extends BaseEntity {
     @TableField(exist = false)
     private List<TsPosition> positions;
 
+    @ApiModelProperty("当前页")
+    private Integer current;
+
+    @ApiModelProperty("每页条数")
+    private Integer size;
+
     public TsUser() {
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu;
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.entity.UserPositionVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -25,7 +26,7 @@ public interface ITsUserService extends IService<TsUser> {
      * @param institutionId：机构ID
      * @return List<TsUser>
      */
-    List<TsUser> getUserByInstitutionId(TsUser tsUser);
+    IPage<TsUser> getUserByInstitutionId(TsUser tsUser);
 
     /**
      * 封禁、解禁用户

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -23,6 +23,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -60,13 +62,21 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
 
     /**
      * 通过机构ID查询人员
-     * @param institutionId：机构ID
      * @return List<TsUser>
      */
     @Override
-    public List<TsUser> getUserByInstitutionId(TsUser tsUser) {
+    public IPage<TsUser> getUserByInstitutionId(TsUser tsUser) {
 //        return tsUserDao.getUserAndPosition(institutionId);
-        return tsUserDao.getUserAndPosition(tsUser);
+        Page<TsUser> tsUserPage = new Page<>();
+        System.out.println(tsUser.getCurrent());
+        System.out.println(tsUser.getSize());
+        List<TsUser> tsUserList =  tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),1*tsUser.getSize(),tsUser);
+        Integer total = tsUserDao.getUserAndPositionCount(tsUser);
+        tsUserPage.setRecords(tsUserList);
+        tsUserPage.setCurrent(tsUser.getCurrent());
+        tsUserPage.setSize(tsUser.getSize());
+        tsUserPage.setTotal(total);
+        return tsUserPage;
     }
 
     /**

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -28,7 +28,7 @@
         </collection>
     </resultMap>
 
-    <select id="getUserAndPosition" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
+    <select id="getUserAndPositionPage" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
         select u.*,p.id p_id,p.name p_name from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
@@ -41,6 +41,16 @@
         <if test="TsUser.email != null and TsUser.email != '' ">
             and u.email like concat('%',#{TsUser.email},'%')
         </if>
+        limit #{start},#{end}
+    </select>
+
+    <select id="getUserAndPositionCount" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultType="java.lang.Integer">
+        select count(u.USID) from ts_user u
+        left join ts_user_position up
+        on u.usid=up.user_id
+        left join ts_position p
+        on up.position_id=p.id
+        where u.institution_id=#{TsUser.institutionId}
     </select>
 
     <select id="getUserIdsByPositionIds" resultType="String">