中英文切换代码提交

dgtly-api/src/main/java/com/dgtly/api/controller/SysCompanyController.java

@@ -20,6 +20,7 @@ import com.dgtly.system.service.ISysCompanyService;
 import com.dgtly.system.service.ISysDictDataService;
 import com.dgtly.system.service.ISysUserService;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -55,7 +56,10 @@ public class SysCompanyController extends ApiBaseController {
     private IGoodsInfoService goodsInfoService;
 
     @ApiOperation(value = "商家详情")
-    @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body"),
+            @ApiImplicitParam(name = "language" , paramType = "header")
+    })
     @PostMapping("/details")
     public Object detail(){
         ParameterObject obj =  getParameterObject();
@@ -96,7 +100,10 @@ public class SysCompanyController extends ApiBaseController {
 
 
     @ApiOperation(value = "热门商家列表")
-    @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body"),
+            @ApiImplicitParam(name = "language" , paramType = "header")
+    })
     @PostMapping("/hotlist")
     public Object getHotList(){
         List<SysCompany> goodsInfos =  companyService.selectCompanyHotList();
@@ -104,7 +111,10 @@ public class SysCompanyController extends ApiBaseController {
     }
 
     @ApiOperation(value = "商家列表")
-    @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body"),
+            @ApiImplicitParam(name = "language" , paramType = "header")
+    })
     @PostMapping("/list")
     public Object getList(){
         ParameterObject obj =  getParameterObject();
@@ -142,7 +152,10 @@ public class SysCompanyController extends ApiBaseController {
     }
 
     @ApiOperation(value = "商家入驻公示列表")
-    @ApiImplicitParam(name = "params" , paramType = "body",example = "{}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body"),
+            @ApiImplicitParam(name = "language" , paramType = "header")
+    })
     @PostMapping("/enterPublicity")
     public Object enterPublicity(){
         ParameterObject obj = getParameterObject();

dgtly-apiframework/src/main/java/com/dgtly/apiframework/config/SwitchEnSqlInterceptorConfig.java

@@ -29,14 +29,12 @@ public class SwitchEnSqlInterceptorConfig {
 
         @PostConstruct
         public void addPageInterceptor() {
-            System.out.println("进入拦截器配置SwitchEnSqlInterceptorConfig-------------------------------------------------");
             SwitchEnSqlInterceptor interceptor = new SwitchEnSqlInterceptor();
             Iterator var3 = this.sqlSessionFactoryList.iterator();
             Properties properties = new Properties();
             interceptor.setProperties( properties);
             while(var3.hasNext()) {
                 SqlSessionFactory sqlSessionFactory = (SqlSessionFactory)var3.next();
-                System.out.println("加入拦截器到配置------------------------------------------------------------------------");
                 sqlSessionFactory.getConfiguration().addInterceptor(interceptor);
             }
 

dgtly-apiframework/src/main/java/com/dgtly/apiframework/interceptor/SwitchEnSqlInterceptor.java

@@ -34,7 +34,6 @@ public class SwitchEnSqlInterceptor  implements Interceptor {
     }
 
     public Object intercept(Invocation invocation) throws Throwable {
-        System.out.println("进入拦截器----------------------------------------------");
         // 获取原始sql语句
         MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
         Object parameter = invocation.getArgs()[1];
@@ -53,7 +52,6 @@ public class SwitchEnSqlInterceptor  implements Interceptor {
             for(Method method : classType.getDeclaredMethods()){
                 if(method!=null && mName.equals(method.getName()) && method.isAnnotationPresent(SwitchEn.class))
                 {
-                    System.out.println("处理boundSql------------------------------------");
                     SwitchEn switchEn = method.getAnnotation(SwitchEn.class);
                     String[] oldfiles = switchEn.oldfiles();
                     String[] newfiles = switchEn.newfiles();

dgtly-system/src/main/java/com/dgtly/companyext/domain/CompanyExamine.java

@@ -34,6 +34,7 @@ public class CompanyExamine extends BaseEntity
     /** 驳回理由 */
     @Excel(name = "驳回理由")
     private String rejectReason;
+    private String rejectReasonEn;
 
     public void setId(Long id) 
     {
@@ -82,7 +83,13 @@ public class CompanyExamine extends BaseEntity
         return rejectReason;
     }
 
+    public String getRejectReasonEn() {
+        return rejectReasonEn;
+    }
 
+    public void setRejectReasonEn(String rejectReasonEn) {
+        this.rejectReasonEn = rejectReasonEn;
+    }
 
     @Override
     public String toString() {

dgtly-system/src/main/java/com/dgtly/companyext/domain/CompanyHonour.java

@@ -24,10 +24,12 @@ public class CompanyHonour extends BaseEntity
 
     /** 荣誉标题*/
     private String title;
+    private String titleEn;
 
     /** 荣誉描述 */
     @Excel(name = "荣誉描述")
     private String des;
+    private String desEn;
 
 
     /** 荣誉图片 */
@@ -79,6 +81,21 @@ public class CompanyHonour extends BaseEntity
         this.title = title;
     }
 
+    public String getTitleEn() {
+        return titleEn;
+    }
+
+    public void setTitleEn(String titleEn) {
+        this.titleEn = titleEn;
+    }
+
+    public String getDesEn() {
+        return desEn;
+    }
+
+    public void setDesEn(String desEn) {
+        this.desEn = desEn;
+    }
 
     @Override
     public String toString() {

dgtly-system/src/main/java/com/dgtly/companyext/domain/CompanyReviewed.java

@@ -27,6 +27,7 @@ public class CompanyReviewed extends BaseEntity
     /** 企业名称 */
     @Excel(name = "企业名称")
     private String companyName;
+    private String companyNameEn;
 
     /** 企业类型 */
     @Excel(name = "企业类型")
@@ -35,6 +36,7 @@ public class CompanyReviewed extends BaseEntity
     /** 详细地址 */
     @Excel(name = "详细地址")
     private String detailAddress;
+    private String detailAddressEn;
 
     /** 经度 */
     @Excel(name = "经度")
@@ -47,6 +49,7 @@ public class CompanyReviewed extends BaseEntity
     /** 企业法人 */
     @Excel(name = "企业法人")
     private String legalPerson;
+    private String legalPersonEn;
 
     /** 联系电话 */
     @Excel(name = "联系电话")
@@ -76,6 +79,7 @@ public class CompanyReviewed extends BaseEntity
     /** 企业介绍 */
     @Excel(name = "企业介绍")
     private String companyIntroduce;
+    private String companyIntroduceEn;
 
     /** 版本号 */
     @Excel(name = "版本号")
@@ -94,6 +98,7 @@ public class CompanyReviewed extends BaseEntity
 
     /** 主营业务*/
     private String primaryBusiness;
+    private String primaryBusinessEn;
 
     /** 审核信息*/
     private CompanyExamine companyExamine;
@@ -292,6 +297,46 @@ public class CompanyReviewed extends BaseEntity
         this.companyExamine = companyExamine;
     }
 
+    public String getCompanyNameEn() {
+        return companyNameEn;
+    }
+
+    public void setCompanyNameEn(String companyNameEn) {
+        this.companyNameEn = companyNameEn;
+    }
+
+    public String getDetailAddressEn() {
+        return detailAddressEn;
+    }
+
+    public void setDetailAddressEn(String detailAddressEn) {
+        this.detailAddressEn = detailAddressEn;
+    }
+
+    public String getLegalPersonEn() {
+        return legalPersonEn;
+    }
+
+    public void setLegalPersonEn(String legalPersonEn) {
+        this.legalPersonEn = legalPersonEn;
+    }
+
+    public String getCompanyIntroduceEn() {
+        return companyIntroduceEn;
+    }
+
+    public void setCompanyIntroduceEn(String companyIntroduceEn) {
+        this.companyIntroduceEn = companyIntroduceEn;
+    }
+
+    public String getPrimaryBusinessEn() {
+        return primaryBusinessEn;
+    }
+
+    public void setPrimaryBusinessEn(String primaryBusinessEn) {
+        this.primaryBusinessEn = primaryBusinessEn;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-system/src/main/java/com/dgtly/companyext/mapper/CompanyReviewedMapper.java

@@ -1,5 +1,6 @@
 package com.dgtly.companyext.mapper;
 
+import com.dgtly.common.annotation.SwitchEn;
 import com.dgtly.companyext.domain.CompanyReviewed;
 import java.util.List;
 
@@ -92,6 +93,8 @@ public interface CompanyReviewedMapper
      * @auther: qxp
      * @date: 2020/3/3 13:25
      */
+    @SwitchEn(oldfiles = {"cr.company_name","cr.company_introduce","cr.primary_business","cr.detail_address","ce.reject_reason"},
+            newfiles = {"cr.company_name_en company_name","cr.company_introduce_en company_introduce","cr.primary_business_en primary_business","cr.detail_address_en detail_address","ce.reject_reason_en reject_reason"})
     List<CompanyReviewed> selectEnterPublicityList(CompanyReviewed companyReviewed);
 
     /**

dgtly-system/src/main/java/com/dgtly/companyext/service/impl/CompanyHonourServiceImpl.java

@@ -2,6 +2,7 @@ package com.dgtly.companyext.service.impl;
 
 import java.util.List;
 import com.dgtly.common.utils.DateUtils;
+import com.dgtly.common.utils.TranslateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.dgtly.companyext.mapper.CompanyHonourMapper;
@@ -55,9 +56,16 @@ public class CompanyHonourServiceImpl implements ICompanyHonourService
     public int insertCompanyHonour(CompanyHonour companyHonour)
     {
         companyHonour.setCreateTime(DateUtils.getNowDate());
+        companyHonour = translateField(companyHonour);
         return companyHonourMapper.insertCompanyHonour(companyHonour);
     }
 
+    private CompanyHonour translateField(CompanyHonour companyHonour) {
+        companyHonour.setDesEn(TranslateUtil.getEnTranslateInfo(companyHonour.getDes()));
+        companyHonour.setTitleEn(TranslateUtil.getEnTranslateInfo(companyHonour.getTitle()));
+        return companyHonour;
+    }
+
     /**
      * 修改企业荣誉
      * 
@@ -68,6 +76,7 @@ public class CompanyHonourServiceImpl implements ICompanyHonourService
     public int updateCompanyHonour(CompanyHonour companyHonour)
     {
         companyHonour.setUpdateTime(DateUtils.getNowDate());
+        companyHonour = translateField(companyHonour);
         return companyHonourMapper.updateCompanyHonour(companyHonour);
     }
 

dgtly-system/src/main/java/com/dgtly/companyext/service/impl/CompanyReviewedServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.dgtly.common.constant.UserConstants;
 import com.dgtly.common.utils.DateUtils;
 import com.dgtly.common.utils.ShiroSaltUtil;
+import com.dgtly.common.utils.TranslateUtil;
 import com.dgtly.companyext.domain.CompanyExamine;
 import com.dgtly.companyext.mapper.CompanyExamineMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,9 +65,25 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
     public int insertCompanyReviewed(CompanyReviewed companyReviewed)
     {
         companyReviewed.setCreateTime(DateUtils.getNowDate());
+        companyReviewed = traslateField(companyReviewed);
         return companyReviewedMapper.insertCompanyReviewed(companyReviewed);
     }
 
+    /**
+     * @Description: 转换需要翻译的字段
+     * @Param: [companyReviewed]
+     * @Return: com.dgtly.companyext.domain.CompanyReviewed
+     * @Author: koucx
+     * @Date: 2020-03-30
+    **/
+    private CompanyReviewed traslateField(CompanyReviewed companyReviewed) {
+        companyReviewed.setCompanyNameEn(TranslateUtil.getEnTranslateInfo(companyReviewed.getCompanyName()));
+        companyReviewed.setDetailAddressEn(TranslateUtil.getEnTranslateInfo(companyReviewed.getDetailAddress()));
+        companyReviewed.setLegalPersonEn(TranslateUtil.getEnTranslateInfo(companyReviewed.getLegalPerson()));
+        companyReviewed.setPrimaryBusinessEn(TranslateUtil.getEnTranslateInfo(companyReviewed.getPrimaryBusiness()));
+        return companyReviewed;
+    }
+
     /**
      * 修改商户扩展信息
      * 
@@ -77,6 +94,7 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
     public int updateCompanyReviewed(CompanyReviewed companyReviewed)
     {
         companyReviewed.setUpdateTime(DateUtils.getNowDate());
+        companyReviewed = traslateField(companyReviewed);
         return companyReviewedMapper.updateCompanyReviewed(companyReviewed);
     }
 
@@ -160,7 +178,7 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
         cr.setStatus("2");
         cr.setUpdateBy(companyExamine.getCreateBy());
         companyReviewedMapper.updateCompanyReviewed(cr);
-
+        companyExamine.setRejectReasonEn(TranslateUtil.getEnTranslateInfo(companyExamine.getRejectReason()));
         return companyExamineMapper.insertCompanyExamine(companyExamine);
     }
 

dgtly-system/src/main/java/com/dgtly/system/domain/SysCompany.java

@@ -36,6 +36,7 @@ public class SysCompany extends BaseEntity
     /** 详细地址 */
     @Excel(name = "详细地址")
     private String detailAddress;
+    private String detailAddressEn;
 
     /** 经度 */
     @Excel(name = "经度")
@@ -297,6 +298,14 @@ public class SysCompany extends BaseEntity
         this.primaryBusinessEn = primaryBusinessEn;
     }
 
+    public String getDetailAddressEn() {
+        return detailAddressEn;
+    }
+
+    public void setDetailAddressEn(String detailAddressEn) {
+        this.detailAddressEn = detailAddressEn;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -306,4 +315,5 @@ public class SysCompany extends BaseEntity
             .toString();
     }
 
+
 }

dgtly-system/src/main/java/com/dgtly/system/mapper/SysCompanyMapper.java

@@ -1,5 +1,6 @@
 package com.dgtly.system.mapper;
 
+import com.dgtly.common.annotation.SwitchEn;
 import com.dgtly.system.domain.SysCompany;
 import java.util.List;
 
@@ -17,6 +18,8 @@ public interface SysCompanyMapper
      * @param id 公司表ID
      * @return 公司表
      */
+    @SwitchEn(oldfiles = {"sc.company_name","sc.legal_person","sc.company_introduce","sc.primary_business","sc.detail_address"},
+            newfiles = {"sc.company_name_en company_name","sc.legal_person_en legal_person","sc.company_introduce_en company_introduce","sc.primary_business_en primary_business","sc.detail_address_en detail_address"})
     public SysCompany selectSysCompanyById(Long id);
 
     /**
@@ -63,6 +66,8 @@ public interface SysCompanyMapper
      * @param
      * @return
      */
+    @SwitchEn(oldfiles = {"sc.company_name","sc.primary_business"},
+            newfiles = {"sc.company_name_en company_name","sc.primary_business_en primary_business"})
     public List<SysCompany> selectCompanyHotList();
 
     /**
@@ -72,6 +77,8 @@ public interface SysCompanyMapper
      * @auther: qxp
      * @date: 2020-2-25
      */
+    @SwitchEn(oldfiles = {"sc.company_name","sc.legal_person","sc.company_introduce","sc.primary_business","sc.detail_address"},
+            newfiles = {"sc.company_name_en company_name","sc.legal_person_en legal_person","sc.company_introduce_en company_introduce","sc.primary_business_en primary_business","sc.detail_address_en detail_address"})
     List<SysCompany> selectSysCompanyListExRoot(SysCompany sysCompany);
 
 

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysCompanyServiceImpl.java

@@ -320,6 +320,7 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         result.setStatus(0);
         result.setCompanyType(cr.getCompanyType());
         result.setDetailAddress(cr.getDetailAddress());
+        result.setDetailAddressEn(TranslateUtil.getEnTranslateInfo(cr.getDetailAddress()));
         result.setLongitude(cr.getLongitude());
         result.setLatitude(cr.getLatitude());
         result.setLegalPerson(cr.getLegalPerson());

dgtly-system/src/main/resources/mapper/companyext/CompanyExamineMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyReviewedId != null ">company_reviewed_id,</if>
             <if test="status != null ">status,</if>
             <if test="rejectReason != null  and rejectReason != ''">reject_reason,</if>
+            <if test="rejectReasonEn != null  and rejectReasonEn != ''">reject_reason_en,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
             <if test="updateTime != null ">update_time,</if>
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyReviewedId != null ">#{companyReviewedId},</if>
             <if test="status != null ">#{status},</if>
             <if test="rejectReason != null  and rejectReason != ''">#{rejectReason},</if>
+            <if test="rejectReasonEn != null  and rejectReasonEn != ''">#{rejectReasonEn},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null ">#{updateTime},</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="status != null ">status = #{status},</if>
             <if test="rejectReason != null  and rejectReason != ''">reject_reason = #{rejectReason},</if>
+            <if test="rejectReasonEn != null  and rejectReasonEn != ''">reject_reason_en = #{rejectReasonEn},</if>
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             update_time = NOW(),
         </trim>

dgtly-system/src/main/resources/mapper/companyext/CompanyHonourMapper.xml

@@ -38,7 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="companyId != null ">company_id,</if>
             <if test="title != null  and title != ''">title,</if>
+            <if test="titleEn != null  and titleEn != ''">titleEn,</if>
             <if test="des != null  and des != ''">des,</if>
+            <if test="desEn != null  and desEn != ''">desEn,</if>
             <if test="img != null  and img != ''">img,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
@@ -49,7 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null ">#{companyId},</if>
             <if test="title != null  and title != ''">#{title},</if>
+            <if test="titleEn != null  and titleEn != ''">#{titleEn},</if>
             <if test="des != null  and des != ''">#{des},</if>
+            <if test="desEn != null  and desEn != ''">#{desEn},</if>
             <if test="img != null  and img != ''">#{img},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
@@ -64,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="companyId != null ">company_id = #{companyId},</if>
             <if test="title != null  and title != ''">title = #{title},</if>
+            <if test="titleEn != null  and titleEn != ''">title_en = #{titleEn},</if>
             <if test="des != null  and des != ''">des = #{des},</if>
+            <if test="desEn != null  and desEn != ''">des_en = #{desEn},</if>
             <if test="img != null  and img != ''">img = #{img},</if>
             <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>

dgtly-system/src/main/resources/mapper/companyext/CompanyReviewedMapper.xml

@@ -92,11 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="companyId != null ">company_id,</if>
             <if test="companyName != null  and companyName != ''">company_name,</if>
+            <if test="companyNameEn != null  and companyNameEn != ''">company_name_en,</if>
             <if test="companyType != null and companyType != '' ">company_type,</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address,</if>
+            <if test="detailAddressEn != null  and detailAddressEn != ''">detail_address_en,</if>
             <if test="longitude != null  and longitude != ''">longitude,</if>
             <if test="latitude != null  and latitude != ''">latitude,</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person,</if>
+            <if test="legalPersonEn != null  and legalPersonEn != ''">legal_person_en,</if>
             <if test="contactNumber != null  and contactNumber != ''">contact_number,</if>
             <if test="establishDate != null ">establish_date,</if>
             <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">unified_social_credit_code,</if>
@@ -104,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="defaultImgUrl != null  and defaultImgUrl != ''">default_img_url,</if>
             <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">propaganda_img_url,</if>
             <if test="companyIntroduce != null  and companyIntroduce != ''">company_introduce,</if>
+            <if test="companyIntroduceEn != null  and companyIntroduceEn != ''">company_introduce_en,</if>
             <if test="versionNum != null ">version_num,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
@@ -115,15 +119,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reason != null  and reason != ''">  reason,</if>
             <if test="status != null ">status ,</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">primary_business,</if>
+            <if test="primaryBusinessEn != null  and primaryBusinessEn != ''">primary_business_en,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null ">#{companyId},</if>
             <if test="companyName != null  and companyName != ''">#{companyName},</if>
+            <if test="companyNameEn != null  and companyNameEn != ''">#{companyNameEn},</if>
             <if test="companyType != null  and companyType != ''">#{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">#{detailAddress},</if>
+            <if test="detailAddressEn != null  and detailAddressEn != ''">#{detailAddressEn},</if>
             <if test="longitude != null  and longitude != ''">#{longitude},</if>
             <if test="latitude != null  and latitude != ''">#{latitude},</if>
             <if test="legalPerson != null  and legalPerson != ''">#{legalPerson},</if>
+            <if test="legalPersonEn != null  and legalPersonEn != ''">#{legalPersonEn},</if>
             <if test="contactNumber != null  and contactNumber != ''">#{contactNumber},</if>
             <if test="establishDate != null ">#{establishDate},</if>
             <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">#{unifiedSocialCreditCode},</if>
@@ -131,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="defaultImgUrl != null  and defaultImgUrl != ''">#{defaultImgUrl},</if>
             <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">#{propagandaImgUrl},</if>
             <if test="companyIntroduce != null  and companyIntroduce != ''">#{companyIntroduce},</if>
+            <if test="companyIntroduceEn != null  and companyIntroduceEn != ''">#{companyIntroduceEn},</if>
             <if test="versionNum != null ">#{versionNum},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
@@ -142,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reason != null  and reason != ''"> #{reason},</if>
             <if test="status != null "> #{status},</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">#{primaryBusiness},</if>
+            <if test="primaryBusinessEn != null  and primaryBusinessEn != ''">#{primaryBusinessEn},</if>
          </trim>
     </insert>
 
@@ -150,11 +160,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="companyId != null ">company_id = #{companyId},</if>
             <if test="companyName != null  and companyName != ''">company_name = #{companyName},</if>
+            <if test="companyNameEn != null  and companyNameEn != ''">company_name_en = #{companyNameEn},</if>
             <if test="companyType != null  and companyType != ''">company_type = #{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address = #{detailAddress},</if>
+            <if test="detailAddressEn != null  and detailAddressEn != ''">detail_address_en = #{detailAddressEn},</if>
             <if test="longitude != null  and longitude != ''">longitude = #{longitude},</if>
             <if test="latitude != null  and latitude != ''">latitude = #{latitude},</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person = #{legalPerson},</if>
+            <if test="legalPersonEn != null  and legalPersonEn != ''">legal_person_en = #{legalPersonEn},</if>
             <if test="contactNumber != null  and contactNumber != ''">contact_number = #{contactNumber},</if>
             <if test="establishDate != null ">establish_date = #{establishDate},</if>
             <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">unified_social_credit_code = #{unifiedSocialCreditCode},</if>
@@ -162,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="defaultImgUrl != null  and defaultImgUrl != ''">default_img_url = #{defaultImgUrl},</if>
             <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">propaganda_img_url = #{propagandaImgUrl},</if>
             <if test="companyIntroduce != null  and companyIntroduce != ''">company_introduce = #{companyIntroduce},</if>
+            <if test="companyIntroduceEn != null  and companyIntroduceEn != ''">company_introduce_en = #{companyIntroduceEn},</if>
             <if test="versionNum != null ">version_num = #{versionNum},</if>
             <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
@@ -173,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reason != null  and reason != ''">  reason = #{reason},</if>
             <if test="status != null ">  status = #{status},</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">primary_business=#{primaryBusiness},</if>
+            <if test="primaryBusinessEn != null  and primaryBusinessEn != ''">primary_business_en=#{primaryBusinessEn},</if>
         </trim>
         where id = #{id}
     </update>

dgtly-system/src/main/resources/mapper/system/SysCompanyMapper.xml

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyNameEn != null  and companyNameEn != ''">company_name_en,</if>
             <if test="companyType != null  and companyType != ''">company_type,</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address,</if>
+            <if test="detailAddressEn != null  and detailAddressEn != ''">detail_address_en,</if>
             <if test="longitude != null  and longitude != ''">longitude,</if>
             <if test="latitude != null  and latitude != ''">latitude,</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person,</if>
@@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyNameEn != null  and companyNameEn != ''">#{companyNameEn},</if>
             <if test="companyType != null  and companyType != ''">#{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">#{detailAddress},</if>
+            <if test="detailAddressEn != null  and detailAddressEn != ''">#{detailAddressEn},</if>
             <if test="longitude != null  and longitude != ''">#{longitude},</if>
             <if test="latitude != null  and latitude != ''">#{latitude},</if>
             <if test="legalPerson != null  and legalPerson != ''">#{legalPerson},</if>
@@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyNameEn != null  and companyNameEn != ''">company_name_en = #{companyNameEn},</if>
             <if test="companyType != null  and companyType != ''">company_type= #{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address= #{detailAddress},</if>
+            <if test="detailAddressEn != null  and detailAddressEn != ''">detail_address_en= #{detailAddressEn},</if>
             <if test="longitude != null  and longitude != ''">longitude= #{longitude},</if>
             <if test="latitude != null  and latitude != ''">latitude= #{latitude},</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person= #{legalPerson},</if>