优化 员工 查询接口

java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml

@@ -162,4 +162,28 @@
 
     </select>
 
+    <select id="queryStaffsNoInOrgCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from u_user t
+        inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
+        LEFT JOIN u_org_staff_rel osr on su.user_id = osr.staff_id and osr.status_cd = '0'
+        where t.level_cd = '01'
+        and su.store_id = #{storeId}
+        and (osr.org_id != #{orgId} or osr.org_id is null)
+    </select>
+
+    <select id="queryStaffsNoInOrg" parameterType="Map" resultType="Map">
+        select t.address,t.sex,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.level_cd,t.level_cd
+        levelCd,t.location_cd,t.location_cd locationCd,t.score,t.password,t.name,t.tel,t.b_id,t.b_id bId,t.email,t.age
+        from u_user t
+        inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
+        LEFT JOIN u_org_staff_rel osr on su.user_id = osr.staff_id and osr.status_cd = '0'
+        where t.level_cd = '01'
+        and su.store_id = #{storeId}
+        and (osr.org_id != #{orgId} or osr.org_id is null)
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
 </mapper>

java110-interface/src/main/java/com/java110/intf/user/IUserV1InnerServiceSMO.java

@@ -65,4 +65,18 @@ public interface IUserV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryUsersCount", method = RequestMethod.POST)
     int queryUsersCount(@RequestBody UserDto userDto);
+
+
+    @RequestMapping(value = "/queryStaffsNoInOrgCount", method = RequestMethod.POST)
+    int queryStaffsNoInOrgCount(@RequestBody UserDto userDto);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param userDto 数据对象分享
+     * @return UserDto 对象数据
+     */
+    @RequestMapping(value = "/queryStaffsNoInOrg", method = RequestMethod.POST)
+    List<UserDto> queryStaffsNoInOrg(@RequestBody UserDto userDto);
 }

service-user/src/main/java/com/java110/user/cmd/user/ListStaffsNoInOrgCmd.java

@@ -0,0 +1,63 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询不在这个这个组织中的员工
+ */
+@Java110Cmd(serviceCode = "user.listStaffsNoInOrg")
+public class ListStaffsNoInOrgCmd extends Cmd {
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "orgId", "未包含组织信息");
+        String storeId = context.getReqHeaders().get("store-id");
+        Assert.hasLength(storeId, "未找到账户信息");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String storeId = context.getReqHeaders().get("store-id");
+
+        UserDto userDto = new UserDto();
+        userDto.setStoreId(storeId);
+        userDto.setOrgId(reqJson.getString("orgId"));
+        userDto.setStaffName(reqJson.getString("staffName"));
+
+
+        int count = userV1InnerServiceSMOImpl.queryStaffsNoInOrgCount(userDto);
+
+        List<UserDto> staffsDtos = null;
+
+        if (count > 0) {
+            staffsDtos = userV1InnerServiceSMOImpl.queryStaffsNoInOrg(userDto);
+        } else {
+            staffsDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, staffsDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+
+    }
+}

service-user/src/main/java/com/java110/user/dao/IUserV1ServiceDao.java

@@ -74,4 +74,7 @@ public interface IUserV1ServiceDao {
      */
     int queryUsersCount(Map info);
 
+    int queryStaffsNoInOrgCount(Map beanCovertMap);
+
+    List<Map> queryStaffsNoInOrg(Map beanCovertMap);
 }

service-user/src/main/java/com/java110/user/dao/impl/UserV1ServiceDaoImpl.java

@@ -108,5 +108,26 @@ public class UserV1ServiceDaoImpl extends BaseServiceDao implements IUserV1Servi
         return Integer.parseInt(businessUserInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public int queryStaffsNoInOrgCount(Map info) {
+        logger.debug("查询 queryStaffsNoInOrgCount 入参 info : {}",info);
+
+        List<Map> businessUserInfos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryStaffsNoInOrgCount", info);
+        if (businessUserInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessUserInfos.get(0).get("count").toString());
+    }
+
+    @Override
+    public List<Map> queryStaffsNoInOrg(Map info) {
+        logger.debug("查询 queryStaffsNoInOrg 入参 info : {}",info);
+
+        List<Map> businessUserInfos = sqlSessionTemplate.selectList("userV1ServiceDaoImpl.queryStaffsNoInOrg",info);
+
+        return businessUserInfos;
+    }
+
 
 }

service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java

@@ -86,4 +86,23 @@ public class UserV1InnerServiceSMOImpl extends BaseServiceSMO implements IUserV1
     public int queryUsersCount(@RequestBody UserDto userDto) {
         return userV1ServiceDaoImpl.queryUsersCount(BeanConvertUtil.beanCovertMap(userDto));    }
 
+    @Override
+    public int queryStaffsNoInOrgCount(@RequestBody  UserDto userDto) {
+        return userV1ServiceDaoImpl.queryStaffsNoInOrgCount(BeanConvertUtil.beanCovertMap(userDto));
+    }
+
+    @Override
+    public List<UserDto> queryStaffsNoInOrg(@RequestBody UserDto userDto) {
+        //校验是否传了 分页信息
+
+        int page = userDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            userDto.setPage((page - 1) * userDto.getRow());
+        }
+
+        List<UserDto> users = BeanConvertUtil.covertBeanList(userV1ServiceDaoImpl.queryStaffsNoInOrg(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
+
+        return users;    }
+
 }