|
@@ -30,6 +30,8 @@ import cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetai
|
|
|
import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetailEmployee;
|
|
|
import cn.ezhizao.project.system.domain.SysUser;
|
|
|
import cn.ezhizao.project.system.service.ISysUserService;
|
|
|
+import cn.ezhizao.project.tenant.domain.Tenant;
|
|
|
+import cn.ezhizao.project.tenant.service.ITenantService;
|
|
|
import com.alibaba.fastjson2.JSONArray;
|
|
|
import com.alibaba.fastjson2.schema.ArraySchema;
|
|
|
import org.apache.commons.io.IOUtils;
|
|
@@ -75,7 +77,8 @@ public class BizCompanyController extends BaseController
|
|
|
private IDictRegionService dictRegionService;
|
|
|
@Resource
|
|
|
private IBizCompanyFollowDetailService companyFollowDetailService;
|
|
|
-
|
|
|
+ @Resource
|
|
|
+ private ITenantService tenantService;
|
|
|
/**
|
|
|
* 查询company列表
|
|
|
*/
|
|
@@ -283,5 +286,19 @@ public class BizCompanyController extends BaseController
|
|
|
return success(regions);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param fromTenantId 接受迁移客户的账套id
|
|
|
+ *
|
|
|
+ * */
|
|
|
+ @GetMapping(value = "/companyMigration")
|
|
|
+ @PreAuthorize("@ss.hasPermi('business:company:Migration')")
|
|
|
+ public void saveMigrationCom(Long fromTenantId,List<Long> fromTenantComId){
|
|
|
+ System.out.println(fromTenantId);
|
|
|
+ }
|
|
|
+ @GetMapping(value = "/getTenant")
|
|
|
+ public AjaxResult getTenant(){
|
|
|
+ Tenant tenant = tenantService.query().eq("id",getTenantId()).eq("deleted",0).list().get(0);
|
|
|
+ return success(tenantService.query().eq("version_id",tenant.getVersionId()).notIn("id",getTenantId()).list());
|
|
|
+ }
|
|
|
}
|