提交

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -30,6 +30,7 @@ import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,6 +87,12 @@ public class TaUserController extends BaseController {
     @Autowired
     private TaRoleMapper taRoleMapper;
 
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -381,6 +388,11 @@ public class TaUserController extends BaseController {
             taUserList.forEach(e -> {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
                 e.setTaTagsList(taTagsList);
+
+                QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+                personQueryWrapper.eq("user_id", e.getUserId());
+                TaPerson person = iTaPersonService.getOne(personQueryWrapper);
+                e.setMiniStatus(null == person ? 0 : 1);
             });
             result.setRecords(taUserList);
             responseBean.addSuccess(result);
@@ -482,4 +494,17 @@ public class TaUserController extends BaseController {
         ResponseBean taUser = iTaUserService.cityTree();
         return taUser;
     }
+
+    /**
+     * 员工离职
+     * @return
+     */
+    @RequestMapping(value = "/admin/user/departure/{userId}", method = RequestMethod.PUT)
+    public ResponseBean departureUser(@PathVariable("userId") Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.departureUser(userId);
+
+
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -190,4 +190,12 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Integer defaultCityId;
+
+    /**
+     * 小程序绑定状态
+     *
+     * 0 未绑定 1 绑定
+     */
+    @TableField(exist = false)
+    private Integer miniStatus;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -42,4 +42,11 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     ResponseBean cityTree();
+
+    /**
+     * 员工离职
+     * @param userId
+     * @return
+     */
+    ResponseBean departureUser(Integer userId);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +20,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaBuildingReportService;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITdReportService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,6 +81,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private  TaOrgCityMapper taOrgCityMapper;
+
+	@Autowired
+	private ITaPersonService iTaPersonService;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -455,4 +460,52 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         responseBean.addSuccess(taUser);
         return responseBean;
     }
+
+	@Override
+	public ResponseBean departureUser(Integer userId) {
+		ResponseBean responseBean = new ResponseBean();
+		TaUser user = this.getById(userId);
+		if (null == user) {
+			responseBean.addError("此员工不存在！");
+			return responseBean;
+		}
+
+		// 不是置业顾问
+		if (user.getIsConsultant() == false) {
+			// 设置员工离职
+			updateUserStatus(user);
+			return ResponseBean.success("操作成功！");
+		}
+		/**
+		 * 是置业顾问
+		 */
+
+		// 更改员工表的用户类型，清空关联关系user_id
+
+		// 设置员工离职
+		updateUserStatus(user);
+
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("user_id", user.getUserId());
+		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+		// 可能存在置业顾问没有绑定小程序端
+		if (null != taPerson) {
+			UpdateWrapper<TaPerson> personUpdateWrapper = new UpdateWrapper<>();
+			personUpdateWrapper.eq("person_id", taPerson.getPersonId());
+			personUpdateWrapper.set("person_type", CommConstant.PERSON_ESTATE_CUSTOMER);
+			personUpdateWrapper.set("user_id", null);
+			iTaPersonService.update(personUpdateWrapper);
+		}
+
+
+		return ResponseBean.success("操作成功!");
+	}
+
+	private boolean updateUserStatus(TaUser user) {
+		user.setStatus(-1);
+		UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
+		updateWrapper.eq("user_id", user.getUserId());
+		updateWrapper.set("status", -1);
+		return this.update(updateWrapper);
+	}
 }

src/test/java/com/huiju/estateagents/TdCityServiceImplTest.java

@@ -16,15 +16,15 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class TdCityServiceImplTest {
 	
-	@Autowired
-	private ITdCityService iTdCityService;
-	
+//	@Autowired
+//	private ITdCityService iTdCityService;
+
 	@Test
 	public void getLocationCity() {
-		TdCity locationCity = iTdCityService.getLocationCity("116.310003,39.991957");
-		//断言 对象不为null
-		Assert.assertNotNull(locationCity);
-		//断言获取的是北京市
-		Assert.assertEquals("北京市",locationCity.getName());
+//		TdCity locationCity = iTdCityService.getLocationCity("116.310003,39.991957");
+//		//断言 对象不为null
+//		Assert.assertNotNull(locationCity);
+//		//断言获取的是北京市
+//		Assert.assertEquals("北京市",locationCity.getName());
 	}
 }