Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/controller/EpiAdminController.java

@@ -52,7 +52,8 @@ public class EpiAdminController {
             if (list1.size() >= 2) {
                 return ModelOps.newFail("该电话已经升级过业委会角色");
             }
-            return ModelOps.newSuccess(epiAdminService.addYwhRole(we));
+            UserRole userRole = userRoleMapper.getUserRoleByPropertyId(list.get(0).getHouseId(), 1);
+            return ModelOps.newSuccess(epiAdminService.addYwhRole(list.get(0), userRole.getUserId()));
         }
         return null;
     }

whepi-web/src/main/java/com/bofeng/dao/UptownMapper.java

@@ -21,4 +21,7 @@ public interface UptownMapper extends BaseMapper<Uptown> {
     List<Uptown> getUptowns(PageDb pageDb, Map<String, Object> queryParam);
 
     List<Uptown> getUptowns(Map<String, Object> queryParam);
+
+    @Select("select * from sys_uptown u INNER JOIN sys_uptown_unit uu on uu.uptown_id = u.uptown_id INNER JOIN sys_uptown_house uh on uh.unit_id = uu.unit_id where uh.house_id = #{houseId}")
+    Uptown getUptownByHouseId(@Param("houseId")Long houseId);
 }

whepi-web/src/main/java/com/bofeng/dao/UserRoleMapper.java

@@ -23,4 +23,7 @@ public interface UserRoleMapper extends BaseMapper<UserRole> {
     @Select("select * from sys_user_role where user_id=#{userId} and role_id=2")
     List<UserRole> getUserRoleYwhsByUserId(@Param("userId") Long userId);
 
+    @Select("select * from sys_user_role where property_id=#{propertyId} and role_id=#{roleId}")
+    UserRole getUserRoleByPropertyId(@Param("propertyId") Long propertyId, @Param("roleId") Integer roleId);
+
 }

whepi-web/src/main/java/com/bofeng/service/EpiAdminService.java

@@ -1,7 +1,11 @@
 package com.bofeng.service;
 
-import com.bofeng.dao.EpiAdminMapper;
-import com.bofeng.dao.IdRuleMapper;
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.dao.*;
+import com.bofeng.entity.Uptown;
+import com.bofeng.entity.UptownHome;
+import com.bofeng.entity.UserRole;
+import com.bofeng.entity.Owner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -13,6 +17,12 @@ public class EpiAdminService {
 
     @Autowired
     private EpiAdminMapper epiAdminMapper;
+    @Autowired
+    private UptownMapper uptownMapper;
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+    @Autowired
+    private OwnerMapper ownerMapper;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public int addYwhRole(String we) {
@@ -22,4 +32,28 @@ public class EpiAdminService {
 
         return 1;
     }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public int addYwhRole(UptownHome uptownHome, Long userId) {
+        Uptown uptown = uptownMapper.getUptownByHouseId(uptownHome.getHouseId());
+        Owner owner = new Owner();
+        owner.setOwnerId(IdWorker.getId());
+        owner.setUptownId(uptown.getUptownId());
+        owner.setType(1L);
+        owner.setUserId(userId);
+        owner.setLinkman(uptownHome.getLinkman());
+        owner.setPhone(uptownHome.getPhone());
+        owner.setUserCreate(userId);
+        owner.setUserUpdate(userId);
+        ownerMapper.insert(owner);
+        UserRole userRole = new UserRole();
+        userRole.setUrId(IdWorker.getId());
+        userRole.setUserId(userId);
+        userRole.setRoleId(2);
+        userRole.setStatus(1);
+        userRole.setPropertyId(owner.getOwnerId());
+        userRole.setUserCreate(userId);
+        userRole.setUserUpdate(userId);
+        return userRoleMapper.insert(userRole);
+    }
 }