新闻中心

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/CompanyInfoDetailDTO.java

@@ -14,7 +14,7 @@ public class CompanyInfoDetailDTO {
 
     private String id;
 
-    private String name;
+    private String companyName;
 
     private String logoUrl;
 

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/CompanyInfoListDTO.java

@@ -13,7 +13,7 @@ public class CompanyInfoListDTO {
 
     private String logoUrl;
 
-    private String name;
+    private String companyName;
 
     private String regionName;
 

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/CompanyInfo.java

@@ -20,7 +20,7 @@ public class CompanyInfo {
     @ApiModelProperty(value = "")
     private String id;
     @ApiModelProperty(value = "公司名称")
-    private String name;
+    private String companyName;
     @ApiModelProperty(value = "公司类型（1：企联会员，2：分会企业）")
     private String type;
     @ApiModelProperty(value = "logo地址")

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/PersonInfo.java

@@ -20,7 +20,7 @@ public class PersonInfo {
     @ApiModelProperty(value = "")
     private String id;
     @ApiModelProperty(value = "姓名")
-    private String name;
+    private String personName;
     @ApiModelProperty(value = "用户名称")
     private String userName;
     @ApiModelProperty(value = "密码")

common/src/main/resources/mapper/base/CompanyInfo.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.enterprise.modules.base.dao.CompanyInfoDAO">
 	<resultMap id="CompanyInfoMap" type="com.jpsoft.enterprise.modules.base.entity.CompanyInfo">
 		<id property="id" column="id_" />
-			<result property="name" column="name_" />
+			<result property="companyName" column="company_name" />
 			<result property="type" column="type_" />
 			<result property="logoUrl" column="logo_url"/>
 			<result property="creditCode" column="credit_code" />
@@ -30,11 +30,11 @@
 	-->
 	<![CDATA[
 		insert into base_company_info
-	    (id_,name_,type_,logo_url,credit_code,address_,business_license_url,scale_,industry_,region_,company_introduction,enterpriser_introduction,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,company_name,type_,logo_url,credit_code,address_,business_license_url,scale_,industry_,region_,company_introduction,enterpriser_introduction,create_by,create_time,update_by,update_time,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{companyName,jdbcType=VARCHAR}
 ,#{type,jdbcType=VARCHAR}
 ,#{logoUrl,jdbcType=VARCHAR}
 ,#{creditCode,jdbcType=VARCHAR}
@@ -59,8 +59,8 @@
 	<update id="update" parameterType="com.jpsoft.enterprise.modules.base.entity.CompanyInfo">
 		update base_company_info
 		<set>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="companyName!=null">
+		company_name=#{companyName,jdbcType=VARCHAR},
 		</if>
 				<if test="type!=null">
 		type_=#{type,jdbcType=VARCHAR},

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.enterprise.modules.base.dao.PersonInfoDAO">
 	<resultMap id="PersonInfoMap" type="com.jpsoft.enterprise.modules.base.entity.PersonInfo">
 		<id property="id" column="id_" />
-			<result property="name" column="name_" />
+			<result property="personName" column="person_name" />
 			<result property="userName" column="user_name" />
 			<result property="password" column="password_" />
 			<result property="openId" column="open_id" />
@@ -31,11 +31,11 @@
 	-->
 	<![CDATA[
 		insert into base_person_info
-	    (id_,name_,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_)
+	    (id_,person_name,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{personName,jdbcType=VARCHAR}
 ,#{userName,jdbcType=VARCHAR}
 ,#{password,jdbcType=VARCHAR}
 ,#{openId,jdbcType=VARCHAR}
@@ -60,8 +60,8 @@
 	<update id="update" parameterType="com.jpsoft.enterprise.modules.base.entity.PersonInfo">
 		update base_person_info
 		<set>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="personName!=null">
+		person_name=#{personName,jdbcType=VARCHAR},
 		</if>
 				<if test="userName!=null">
 		user_name=#{userName,jdbcType=VARCHAR},
@@ -112,8 +112,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="PersonInfoMap">
-		select
-id_,name_,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_		from base_person_info where id_=#{0}
+		select * from base_person_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_person_info where id_=#{0}

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/PersonInfoApiController.java

@@ -277,7 +277,7 @@ public class PersonInfoApiController {
                dataMap.put("token", token);
                CompanyInfoDetailDTO companyInfoDetailDTO = new CompanyInfoDetailDTO();
                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
-               companyInfoDetailDTO.setName(companyInfo.getName());
+               companyInfoDetailDTO.setCompanyName(companyInfo.getCompanyName());
                companyInfoDetailDTO.setId(companyInfo.getId());
                companyInfoDetailDTO.setLogoUrl(companyInfo.getLogoUrl());
 
@@ -465,7 +465,7 @@ public class PersonInfoApiController {
             }
 
             companyInfo.setCreditCode(creditCode);
-            companyInfo.setName(companyName);
+            companyInfo.setCompanyName(companyName);
             companyInfo.setRegion(region);
             if (StringUtils.isNotBlank(businessLicenseUrl)){
                 companyInfo.setBusinessLicenseUrl(businessLicenseUrl);
@@ -480,7 +480,7 @@ public class PersonInfoApiController {
             //更新用户
             personInfo.setRegisterType(registerType);
             personInfo.setIdCard(idCard);
-            personInfo.setName(personName);
+            personInfo.setPersonName(personName);
             personInfo.setPhone(phone);
             if (StringUtils.isNotBlank(idCardUrl)){
                 personInfo.setIdCardUrl(idCardUrl);