Browse Source

fix:做到一半了,不做了

ly 10 months ago
parent
commit
181013bb99

+ 19 - 2
src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -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());
+    }
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/tenant/domain/Tenant.java

@@ -228,4 +228,5 @@ public class Tenant extends BaseEntity {
     private Long applyId;
     @TableField(exist = false)
     private Integer applyStatus;
+    private Integer versionId;
 }