123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -10,12 +10,14 @@ import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
 import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyBaseVo;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
+import groovyjarjarpicocli.CommandLine;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.genid.GenId;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -28,6 +30,9 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
      @Autowired
     BranchCompanyStockRightBiz stockRightBiz;
 
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
      @Autowired
      BranchCompanyStockInfoMapper stockInfoMapper;
 
@@ -96,14 +101,36 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         Integer companyId=companyVo.getCompanyId();
         if (companyId==null||companyId==0){
             branchCompany.setId(null);
-            insertSelective(companyBase);
+            branchCompanyBiz.insertSelective(branchCompany);
         }else {
             branchCompany.setId(companyId);
-            updateSelectiveById(companyBase);
+            branchCompanyBiz.updateSelectiveById(branchCompany);
         }
         return  ObjectRestResponse.succ();
     }
 
+    public  ObjectRestResponse getCompanyDetail(CompanyVo companyVo){
+        if (companyVo==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        Integer companyBaseId=companyVo.getId();
+        Integer companyId=companyVo.getCompanyId();
+        Integer stockId=companyVo.getStockId();
+        if (companyBaseId!=null&&companyBaseId>0){
+            CompanyBase companyBase=selectById(companyBaseId);
+            BeanUtils.copyProperties(companyBase,companyVo);
+        }
+        if (companyId!=null&&companyId>0){
+            BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
+            BeanUtils.copyProperties(branchCompany,companyVo);
+        }
+        if (stockId!=null&&stockId>0){
+            BranchCompanyStockRight stockRight=stockRightBiz.selectById(stockId);
+            BeanUtils.copyProperties(stockRight,companyVo);
+        }
+        return  ObjectRestResponse.succ(companyVo);
+    }
+
     //设置股权信息
     public  ObjectRestResponse updStockInfo(CompanyVo companyVo){
 
@@ -152,10 +179,10 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         Integer companyId=companyVo.getCompanyId();
         if (companyId==null||companyId==0){
             branchCompany.setId(null);
-            insertSelective(companyBase);
+            branchCompanyBiz.insertSelective(branchCompany);
         }else {
             branchCompany.setId(companyId);
-            updateSelectiveById(companyBase);
+            branchCompanyBiz.updateSelectiveById(branchCompany);
         }
         return  ObjectRestResponse.succ();
     }