账户中心企业列表增加 所属行业

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRegDTO.java

@@ -20,10 +20,19 @@ public class CompanyRegDTO implements Serializable{
      */
     private String businessCode;
     private String address;
-    private String logoId;
+    private String logoUrl;
     private String tel;
     private String fax;
     private String signet;      //电子章
+    private String type;        //所属行业
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public Long getId() {
         return id;
@@ -82,11 +91,11 @@ public class CompanyRegDTO implements Serializable{
     }
 
     public String getLogoUrl() {
-        return logoId;
+        return logoUrl;
     }
 
-    public void setLogoUrl(String logoId) {
-        this.logoId = logoId;
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
     }
 
     @Override
@@ -95,7 +104,7 @@ public class CompanyRegDTO implements Serializable{
                 "name='" + name + '\'' +
                 ", businessCode='" + businessCode + '\'' +
                 ", address='" + address + '\'' +
-                ", logoUrl='" + logoId + '\'' +
+                ", logoUrl='" + logoUrl + '\'' +
                 '}';
     }
 }

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRspDTO.java

@@ -23,6 +23,10 @@ public class CompanyRspDTO implements Serializable {
      */
     private boolean saas_;
     private String uu;
+    /**
+     * 所属行业
+     */
+    private String type;
     /**
      * 是否有默认企业
      */
@@ -39,6 +43,14 @@ public class CompanyRspDTO implements Serializable {
 
     private Long adminId;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public Long getAdminId() {
         return adminId;
     }
@@ -127,7 +139,7 @@ public class CompanyRspDTO implements Serializable {
         this.default_ = default_;
     }
 
-    public CompanyRspDTO(String name, String businessCode, String address, boolean default_, boolean saas_, String uu, String admin, Long adminId) {
+    public CompanyRspDTO(String name, String businessCode, String address, boolean default_, boolean saas_, String uu, String admin, Long adminId, String type) {
         this.name = name;
         this.businessCode = businessCode;
         this.address = address;
@@ -136,6 +148,7 @@ public class CompanyRspDTO implements Serializable {
         this.uu = uu;
         this.admin = admin;
         this.adminId = adminId;
+        this.type = type;
     }
 
     public CompanyRspDTO() {

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/po/Company.java

@@ -27,6 +27,18 @@ public class Company implements Serializable {
     private String tel;
     private String fax;
     private String signet;
+    /**
+     * 所属行业
+     */
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public String getTel() {
         return tel;

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountCenterServiceImpl.java

@@ -83,13 +83,13 @@ public class AccountCenterServiceImpl implements AccountCenterService {
 
         //调用存储过程, 对新开账套数据初始化
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("fromCompany", 2);
+        map.put("fromCompany", 3);
         map.put("newCompany", company.getId());
         map.put("accountId", accountId);
         map.put("result", null);
         accountCompanyMapper.initData(map);
 
-        return null;
+        return Result.success();
     }
 
     @Override
@@ -154,7 +154,8 @@ public class AccountCenterServiceImpl implements AccountCenterService {
                         false,
                         ssoUserSpace.getSpaceUU().toString(),
                         ssoUserSpace.getAdmin().getVipName(),
-                        0l
+                        0L,
+                        ssoUserSpace.getProfession()
                 );
                 resultList.add(companyRspDTO);
             }

base-servers/account/account-server/src/main/resources/application.yml

@@ -82,4 +82,7 @@ mybatis:
 auth:
   public-key: auth/pub.key
 sso:
-  base-url: http://192.168.253.12:32323
+  base-url: http://192.168.253.12:32323
+ribbon:
+  ReadTimeout: 6000
+  ConnectTimeout: 2000

base-servers/account/account-server/src/main/resources/mapper/AccountCompanyMapper.xml

@@ -14,7 +14,7 @@
         delete from ac_account_company where company_id=#{companyId}
     </delete>
     <select id="getCompanyListByAccountMobile" resultType="com.usoftchina.saas.account.dto.CompanyRspDTO">
-        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId from ac_company cmp
+        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId,cmp.type from ac_company cmp
         left join ac_account_company accmp on accmp.company_id=cmp.id
         left join ac_account ac on ac.id = accmp.account_id
         left join ac_account aci on aci.id = cmp.creator_id

base-servers/account/account-server/src/main/resources/mapper/CompanyMapper.xml

@@ -32,11 +32,12 @@
             SELECT LAST_INSERT_ID() AS ID
         </selectKey>
         insert into ac_company(name, business_code, address, logo_url, creator_id, create_time, updater_id, update_time,
-        tel, fax, signet, uu)
+        tel, fax, signet, uu, type)
         values (#{name,jdbcType=VARCHAR}, #{businessCode,jdbcType=VARCHAR},
         #{address,jdbcType=VARCHAR}, #{logoUrl,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT},
         #{createTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP},
-        #{tel,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{signet,jdbcType=VARCHAR}, #{uu,jdbcType=VARCHAR})
+        #{tel,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{signet,jdbcType=VARCHAR}, #{uu,jdbcType=VARCHAR},
+        #{type,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.account.po.Company"
             useGeneratedKeys="true" keyProperty="id">
@@ -140,6 +141,9 @@
             <if test="signet != null">
                 signet = #{signet,jdbcType=VARCHAR},
             </if>
+            <if test="type != null">
+                type = #{type,jdbcType=VARCHAR}
+            </if>
         </set>
         where id = #{id}
     </update>