多公司功能添加

hx-common/src/main/java/com/fjhx/common/entity/corporation/dto/CorporationDto.java

@@ -1,17 +1,37 @@
 package com.fjhx.common.entity.corporation.dto;
 
 import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.file.entity.ObsFile;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 多公司配置新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @Getter
 @Setter
 public class CorporationDto extends Corporation {
 
+    /**
+     * 企业logo
+     */
+    List<ObsFile> enterpriseLogoList;
+    /**
+     * 法人签名
+     */
+    List<ObsFile> larSignList;
+    /**
+     * 公章
+     */
+    List<ObsFile> officialSealList;
+    /**
+     * 合同章
+     */
+    List<ObsFile> contractSealList;
+
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -77,4 +77,28 @@ public class Corporation extends BasePo {
      */
     private String yfId;
 
+    /**
+     * 国家
+     */
+    private String countryId;
+
+    /**
+     * 省
+     */
+    private String provinceId;
+
+    /**
+     * 市
+     */
+    private String cityId;
+
+    /**
+     * 详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * 海关注册代码
+     */
+    private String crCode;
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/vo/CorporationVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.common.entity.corporation.vo;
 
+import com.fjhx.area.service.ISetAreaName;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,6 +13,12 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CorporationVo extends Corporation {
+public class CorporationVo extends Corporation implements ISetAreaName {
+
+    private String countryName;
+
+    private String provinceName;
+
+    private String cityName;
 
 }

hx-common/src/main/java/com/fjhx/common/service/corporation/impl/CorporationServiceImpl.java

@@ -2,11 +2,15 @@ package com.fjhx.common.service.corporation.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.fjhx.area.utils.AreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.mapper.corporation.CorporationMapper;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.file.utils.ObsFileUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.entity.corporation.vo.CorporationVo;
@@ -15,6 +19,8 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.common.entity.corporation.dto.CorporationDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -38,6 +44,9 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
                     .or().like(Corporation::getNameEn,dto.getKeyword()));
         }
         Page<CorporationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<CorporationVo> records = page.getRecords();
+        // 赋值国省市
+        AreaUtil.setAreaName(records);
         return page;
     }
 
@@ -45,17 +54,37 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
     public CorporationVo detail(Long id) {
         Corporation Corporation = this.getById(id);
         CorporationVo result = BeanUtil.toBean(Corporation, CorporationVo.class);
+        // 赋值国省市
+        AreaUtil.setAreaName(result);
         return result;
     }
 
+    @DSTransactional
     @Override
     public void add(CorporationDto corporationDto) {
         this.save(corporationDto);
+        //企业logo
+        ObsFileUtil.saveFile(corporationDto.getEnterpriseLogoList(), corporationDto.getId(),1);
+        //法人签名
+        ObsFileUtil.saveFile(corporationDto.getLarSignList(), corporationDto.getId(),2);
+        //公章
+        ObsFileUtil.saveFile(corporationDto.getOfficialSealList(), corporationDto.getId(),3);
+        //合同章
+        ObsFileUtil.saveFile(corporationDto.getContractSealList(), corporationDto.getId(),4);
     }
 
+    @DSTransactional
     @Override
     public void edit(CorporationDto corporationDto) {
         this.updateById(corporationDto);
+        //企业logo
+        ObsFileUtil.editFile(corporationDto.getEnterpriseLogoList(), corporationDto.getId(),1);
+        //法人签名
+        ObsFileUtil.editFile(corporationDto.getLarSignList(), corporationDto.getId(),2);
+        //公章
+        ObsFileUtil.editFile(corporationDto.getOfficialSealList(), corporationDto.getId(),3);
+        //合同章
+        ObsFileUtil.editFile(corporationDto.getContractSealList(), corporationDto.getId(),4);
     }
 
     @Override

hx-common/src/main/resources/mapper/corporation/CorporationMapper.xml

@@ -17,7 +17,12 @@
             c.create_user,
             c.create_time,
             c.update_user,
-            c.update_time
+            c.update_time,
+            c.country_id,
+            c.province_id,
+            c.city_id,
+            c.detailed_address,
+            c.cr_code
         from corporation c
             ${ew.customSqlSegment}
     </select>