Merge remote-tracking branch 'company/master' into company-master

ruoyi-system/src/main/java/com/ruoyi/system/domain/UnitMember.java

@@ -98,6 +98,10 @@ public class UnitMember extends BaseEntity
     private String contactNumber;
     @Excel(name = "信息来源",dictType="data_sources")
     private String dataSources;
+    @Excel(name = "法定代表人联系电话")
+    private String representativePhone;
+    @Excel(name = "非法人组织负责人联系电话")
+    private String organizationPhone;
     /** 单位基本信息 */
 //    @Excel(name = "单位基本信息")
     private String basicInformationOfTheUnit;
@@ -122,6 +126,22 @@ public class UnitMember extends BaseEntity
     private String  registrationAuthorityCityName;
     private String registrationAuthorityAreaName;
 
+    public String getRepresentativePhone() {
+        return representativePhone;
+    }
+
+    public void setRepresentativePhone(String representativePhone) {
+        this.representativePhone = representativePhone;
+    }
+
+    public String getOrganizationPhone() {
+        return organizationPhone;
+    }
+
+    public void setOrganizationPhone(String organizationPhone) {
+        this.organizationPhone = organizationPhone;
+    }
+
     public String getRegistrationAuthorityProvinceName() {
         return registrationAuthorityProvinceName;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -586,7 +586,7 @@ public class SysUserServiceImpl implements ISysUserService
         }
         String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000);
         System.out.println("验证码："+verifyCode);
-        String message="【创巨圆】验证码："+verifyCode+"，此验证码只用于注册验证，5分钟内有效。如非本人操作，请忽略。";
+        String message="【河北创巨圆科技发展有限公司】验证码："+verifyCode+"，此验证码只用于注册验证，5分钟内有效。如非本人操作，请忽略。";
         String cacheValue = redisCache.getCacheObject(phoneNumber+"_number");
         if(cacheValue != null && Integer.parseInt(cacheValue) > 29){
             return -2;
@@ -623,7 +623,7 @@ public class SysUserServiceImpl implements ISysUserService
             return -3;
         }
         String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000);
-        String message="【创巨圆】验证码："+verifyCode+"，此验证码只用于找回密码，5分钟内有效。如非本人操作，请忽略。";
+        String message="【河北创巨圆科技发展有限公司】验证码："+verifyCode+"，此验证码只用于找回密码，5分钟内有效。如非本人操作，请忽略。";
         String cacheValue = redisCache.getCacheObject(phoneNumber+"_forgetThePassword");
         System.out.println("验证码："+verifyCode);
         if(cacheValue != null && Integer.parseInt(cacheValue) > 29){

ruoyi-system/src/main/resources/mapper/system/UnitMemberMapper.xml

@@ -36,10 +36,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="administrativeApprovalBureau"    column="administrative_approval_bureau"    />
         <result property="registrationAuthorityProvince"    column="registration_authority_province"    />
         <result property="dataSources"    column="data_sources"    />
+        <result property="dataSources"    column="data_sources"    />
+        <result property="representativePhone"    column="representative_phone"    />
+        <result property="organizationPhone"    column="organization_phone"    />
     </resultMap>
 
     <sql id="selectUnitMemberVo">
-        select id, company_name,data_sources, unit_residence, unified_social_credit_code, date_of_establishment, registration_authority_city, registration_authority_area, registered_capital, legal_representative, head_of_an_unincorporated_organization, unit_type, application_level, legal_authority_name, legal_authority_sex, legal_authority_nationality, legal_authority_political_status, legal_authority_working_department, legal_authority_position, legal_authority_id_number, contact_number, basic_information_of_the_unit, create_by, create_time, update_by, update_time, corporate, unincorporated_organizations,word_url,approval_status,administrative_approval_bureau,registration_authority_province from unit_member
+        select id, company_name,data_sources, unit_residence, unified_social_credit_code, date_of_establishment, registration_authority_city, registration_authority_area, registered_capital, legal_representative, head_of_an_unincorporated_organization,
+               unit_type, application_level, legal_authority_name, legal_authority_sex,
+               legal_authority_nationality, legal_authority_political_status,
+               legal_authority_working_department, legal_authority_position,
+               legal_authority_id_number, contact_number,
+               basic_information_of_the_unit, create_by,
+               create_time, update_by, update_time, corporate,
+               unincorporated_organizations,word_url,approval_status,
+               administrative_approval_bureau,registration_authority_province,
+               representative_phone,organization_phone
+        from unit_member
     </sql>
 
     <select id="selectUnitMemberList" parameterType="UnitMember" resultMap="UnitMemberResult">
@@ -81,7 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t2.region_name as registrationAuthorityProvinceName,
         t3.region_name as registrationAuthorityCityName,
         t4.region_name as registrationAuthorityAreaName,
-        t1.data_sources
+        t1.data_sources,
+        t1.representative_phone,
+        t1.organization_phone
         from unit_member t1
         left join   region t2 on t2.region_id = t1.registration_authority_province
         left join   region t3 on t3.region_id = t1.registration_authority_city
@@ -113,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null  and createBy != ''"> and t1.create_by = #{createBy}</if>
             <if test="dataSources != null  and dataSources != ''"> and t1.data_sources = #{dataSources}</if>
         </where>
+       order by create_time desc
     </select>
 
     <select id="newSelectUnitMemberList" parameterType="UnitMember" resultMap="UnitMemberResult">
@@ -219,6 +235,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="administrativeApprovalBureau != null">administrative_approval_bureau,</if>
             <if test="registrationAuthorityProvince != null">registration_authority_province,</if>
             <if test="dataSources != null">data_sources,</if>
+            <if test="representativePhone != null">representative_phone,</if>
+            <if test="organizationPhone != null">organization_phone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyName != null">#{companyName},</if>
@@ -252,6 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="administrativeApprovalBureau != null">#{administrativeApprovalBureau},</if>
             <if test="registrationAuthorityProvince != null">#{registrationAuthorityProvince},</if>
             <if test="dataSources != null">#{dataSources},</if>
+            <if test="representativePhone != null">#{representativePhone},</if>
+            <if test="organizationPhone != null">#{organizationPhone},</if>
          </trim>
     </insert>
 
@@ -288,6 +308,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
             <if test="administrativeApprovalBureau != null">administrative_approval_bureau = #{administrativeApprovalBureau},</if>
             <if test="registrationAuthorityProvince != null">registration_authority_province = #{registrationAuthorityProvince},</if>
+            <if test="representativePhone != null">representative_phone = #{representativePhone},</if>
+            <if test="organizationPhone != null">organization_phone = #{organizationPhone},</if>
         </trim>
         where id = #{id}
     </update>