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

master
Tuzki 5 months ago
commit 7de303a4b1
  1. 92
      ruoyi-system/src/main/java/com/ruoyi/system/domain/UnitMember.java
  2. 56
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
  3. 26
      ruoyi-system/src/main/resources/mapper/system/UnitMemberMapper.xml

@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 单位会员对象 unit_member * 单位会员对象 unit_member
* *
* @author ruoyi * @author ruoyi
* @date 2024-07-19 * @date 2024-07-19
*/ */
@ -98,6 +98,10 @@ public class UnitMember extends BaseEntity
private String contactNumber; private String contactNumber;
@Excel(name = "信息来源",dictType="data_sources") @Excel(name = "信息来源",dictType="data_sources")
private String dataSources; private String dataSources;
@Excel(name = "法定代表人联系电话")
private String representativePhone;
@Excel(name = "非法人组织负责人联系电话")
private String organizationPhone;
/** 单位基本信息 */ /** 单位基本信息 */
// @Excel(name = "单位基本信息") // @Excel(name = "单位基本信息")
private String basicInformationOfTheUnit; private String basicInformationOfTheUnit;
@ -122,6 +126,22 @@ public class UnitMember extends BaseEntity
private String registrationAuthorityCityName; private String registrationAuthorityCityName;
private String registrationAuthorityAreaName; 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() { public String getRegistrationAuthorityProvinceName() {
return registrationAuthorityProvinceName; return registrationAuthorityProvinceName;
} }
@ -204,160 +224,160 @@ public class UnitMember extends BaseEntity
this.registrationAuthorityCity = registrationAuthorityCity; this.registrationAuthorityCity = registrationAuthorityCity;
} }
public String getRegistrationAuthorityCity() public String getRegistrationAuthorityCity()
{ {
return registrationAuthorityCity; return registrationAuthorityCity;
} }
public void setRegistrationAuthorityArea(String registrationAuthorityArea) public void setRegistrationAuthorityArea(String registrationAuthorityArea)
{ {
this.registrationAuthorityArea = registrationAuthorityArea; this.registrationAuthorityArea = registrationAuthorityArea;
} }
public String getRegistrationAuthorityArea() public String getRegistrationAuthorityArea()
{ {
return registrationAuthorityArea; return registrationAuthorityArea;
} }
public void setRegisteredCapital(String registeredCapital) public void setRegisteredCapital(String registeredCapital)
{ {
this.registeredCapital = registeredCapital; this.registeredCapital = registeredCapital;
} }
public String getRegisteredCapital() public String getRegisteredCapital()
{ {
return registeredCapital; return registeredCapital;
} }
public void setLegalRepresentative(String legalRepresentative) public void setLegalRepresentative(String legalRepresentative)
{ {
this.legalRepresentative = legalRepresentative; this.legalRepresentative = legalRepresentative;
} }
public String getLegalRepresentative() public String getLegalRepresentative()
{ {
return legalRepresentative; return legalRepresentative;
} }
public void setHeadOfAnUnincorporatedOrganization(String headOfAnUnincorporatedOrganization) public void setHeadOfAnUnincorporatedOrganization(String headOfAnUnincorporatedOrganization)
{ {
this.headOfAnUnincorporatedOrganization = headOfAnUnincorporatedOrganization; this.headOfAnUnincorporatedOrganization = headOfAnUnincorporatedOrganization;
} }
public String getHeadOfAnUnincorporatedOrganization() public String getHeadOfAnUnincorporatedOrganization()
{ {
return headOfAnUnincorporatedOrganization; return headOfAnUnincorporatedOrganization;
} }
public void setUnitType(String unitType) public void setUnitType(String unitType)
{ {
this.unitType = unitType; this.unitType = unitType;
} }
public String getUnitType() public String getUnitType()
{ {
return unitType; return unitType;
} }
public void setApplicationLevel(String applicationLevel) public void setApplicationLevel(String applicationLevel)
{ {
this.applicationLevel = applicationLevel; this.applicationLevel = applicationLevel;
} }
public String getApplicationLevel() public String getApplicationLevel()
{ {
return applicationLevel; return applicationLevel;
} }
public void setLegalAuthorityName(String legalAuthorityName) public void setLegalAuthorityName(String legalAuthorityName)
{ {
this.legalAuthorityName = legalAuthorityName; this.legalAuthorityName = legalAuthorityName;
} }
public String getLegalAuthorityName() public String getLegalAuthorityName()
{ {
return legalAuthorityName; return legalAuthorityName;
} }
public void setLegalAuthoritySex(String legalAuthoritySex) public void setLegalAuthoritySex(String legalAuthoritySex)
{ {
this.legalAuthoritySex = legalAuthoritySex; this.legalAuthoritySex = legalAuthoritySex;
} }
public String getLegalAuthoritySex() public String getLegalAuthoritySex()
{ {
return legalAuthoritySex; return legalAuthoritySex;
} }
public void setLegalAuthorityNationality(String legalAuthorityNationality) public void setLegalAuthorityNationality(String legalAuthorityNationality)
{ {
this.legalAuthorityNationality = legalAuthorityNationality; this.legalAuthorityNationality = legalAuthorityNationality;
} }
public String getLegalAuthorityNationality() public String getLegalAuthorityNationality()
{ {
return legalAuthorityNationality; return legalAuthorityNationality;
} }
public void setLegalAuthorityPoliticalStatus(String legalAuthorityPoliticalStatus) public void setLegalAuthorityPoliticalStatus(String legalAuthorityPoliticalStatus)
{ {
this.legalAuthorityPoliticalStatus = legalAuthorityPoliticalStatus; this.legalAuthorityPoliticalStatus = legalAuthorityPoliticalStatus;
} }
public String getLegalAuthorityPoliticalStatus() public String getLegalAuthorityPoliticalStatus()
{ {
return legalAuthorityPoliticalStatus; return legalAuthorityPoliticalStatus;
} }
public void setLegalAuthorityWorkingDepartment(String legalAuthorityWorkingDepartment) public void setLegalAuthorityWorkingDepartment(String legalAuthorityWorkingDepartment)
{ {
this.legalAuthorityWorkingDepartment = legalAuthorityWorkingDepartment; this.legalAuthorityWorkingDepartment = legalAuthorityWorkingDepartment;
} }
public String getLegalAuthorityWorkingDepartment() public String getLegalAuthorityWorkingDepartment()
{ {
return legalAuthorityWorkingDepartment; return legalAuthorityWorkingDepartment;
} }
public void setLegalAuthorityPosition(String legalAuthorityPosition) public void setLegalAuthorityPosition(String legalAuthorityPosition)
{ {
this.legalAuthorityPosition = legalAuthorityPosition; this.legalAuthorityPosition = legalAuthorityPosition;
} }
public String getLegalAuthorityPosition() public String getLegalAuthorityPosition()
{ {
return legalAuthorityPosition; return legalAuthorityPosition;
} }
public void setLegalAuthorityIdNumber(String legalAuthorityIdNumber) public void setLegalAuthorityIdNumber(String legalAuthorityIdNumber)
{ {
this.legalAuthorityIdNumber = legalAuthorityIdNumber; this.legalAuthorityIdNumber = legalAuthorityIdNumber;
} }
public String getLegalAuthorityIdNumber() public String getLegalAuthorityIdNumber()
{ {
return legalAuthorityIdNumber; return legalAuthorityIdNumber;
} }
public void setContactNumber(String contactNumber) public void setContactNumber(String contactNumber)
{ {
this.contactNumber = contactNumber; this.contactNumber = contactNumber;
} }
public String getContactNumber() public String getContactNumber()
{ {
return contactNumber; return contactNumber;
} }
public void setBasicInformationOfTheUnit(String basicInformationOfTheUnit) public void setBasicInformationOfTheUnit(String basicInformationOfTheUnit)
{ {
this.basicInformationOfTheUnit = basicInformationOfTheUnit; this.basicInformationOfTheUnit = basicInformationOfTheUnit;
} }
public String getBasicInformationOfTheUnit() public String getBasicInformationOfTheUnit()
{ {
return basicInformationOfTheUnit; return basicInformationOfTheUnit;
} }
public void setCorporate(String corporate) public void setCorporate(String corporate)
{ {
this.corporate = corporate; this.corporate = corporate;
} }
public String getCorporate() public String getCorporate()
{ {
return corporate; return corporate;
} }
public void setUnincorporatedOrganizations(String unincorporatedOrganizations) public void setUnincorporatedOrganizations(String unincorporatedOrganizations)
{ {
this.unincorporatedOrganizations = unincorporatedOrganizations; this.unincorporatedOrganizations = unincorporatedOrganizations;
} }
public String getUnincorporatedOrganizations() public String getUnincorporatedOrganizations()
{ {
return unincorporatedOrganizations; return unincorporatedOrganizations;
} }

@ -43,7 +43,7 @@ import com.ruoyi.system.service.ISysUserService;
/** /**
* 用户 业务层处理 * 用户 业务层处理
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
@ -80,7 +80,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
* @param user 用户信息 * @param user 用户信息
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@ -93,7 +93,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 根据条件分页查询已分配用户角色列表 * 根据条件分页查询已分配用户角色列表
* *
* @param user 用户信息 * @param user 用户信息
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@ -106,7 +106,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 根据条件分页查询未分配用户角色列表 * 根据条件分页查询未分配用户角色列表
* *
* @param user 用户信息 * @param user 用户信息
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@ -119,7 +119,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 通过用户名查询用户 * 通过用户名查询用户
* *
* @param userName 用户名 * @param userName 用户名
* @return 用户对象信息 * @return 用户对象信息
*/ */
@ -131,7 +131,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 用户对象信息 * @return 用户对象信息
*/ */
@ -143,7 +143,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 查询用户所属角色组 * 查询用户所属角色组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@ -160,7 +160,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 查询用户所属岗位组 * 查询用户所属岗位组
* *
* @param userName 用户名 * @param userName 用户名
* @return 结果 * @return 结果
*/ */
@ -177,7 +177,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 校验用户名称是否唯一 * 校验用户名称是否唯一
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -231,7 +231,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 校验用户是否允许操作 * 校验用户是否允许操作
* *
* @param user 用户信息 * @param user 用户信息
*/ */
@Override @Override
@ -245,7 +245,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 校验用户是否有数据权限 * 校验用户是否有数据权限
* *
* @param userId 用户id * @param userId 用户id
*/ */
@Override @Override
@ -265,7 +265,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 新增保存用户信息 * 新增保存用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -284,7 +284,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 注册用户信息 * 注册用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -305,7 +305,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 修改保存用户信息 * 修改保存用户信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -327,7 +327,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 用户授权角色 * 用户授权角色
* *
* @param userId 用户ID * @param userId 用户ID
* @param roleIds 角色组 * @param roleIds 角色组
*/ */
@ -341,7 +341,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 修改用户状态 * 修改用户状态
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -353,7 +353,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 修改用户基本信息 * 修改用户基本信息
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -365,7 +365,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 修改用户头像 * 修改用户头像
* *
* @param userName 用户名 * @param userName 用户名
* @param avatar 头像地址 * @param avatar 头像地址
* @return 结果 * @return 结果
@ -378,7 +378,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
@ -390,7 +390,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 重置用户密码 * 重置用户密码
* *
* @param userName 用户名 * @param userName 用户名
* @param password 密码 * @param password 密码
* @return 结果 * @return 结果
@ -403,7 +403,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 新增用户角色信息 * 新增用户角色信息
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserRole(SysUser user) public void insertUserRole(SysUser user)
@ -413,7 +413,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 新增用户岗位信息 * 新增用户岗位信息
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserPost(SysUser user) public void insertUserPost(SysUser user)
@ -436,7 +436,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 新增用户角色信息 * 新增用户角色信息
* *
* @param userId 用户ID * @param userId 用户ID
* @param roleIds 角色组 * @param roleIds 角色组
*/ */
@ -459,7 +459,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 通过用户ID删除用户 * 通过用户ID删除用户
* *
* @param userId 用户ID * @param userId 用户ID
* @return 结果 * @return 结果
*/ */
@ -476,7 +476,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 批量删除用户信息 * 批量删除用户信息
* *
* @param userIds 需要删除的用户ID * @param userIds 需要删除的用户ID
* @return 结果 * @return 结果
*/ */
@ -498,7 +498,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* 导入用户数据 * 导入用户数据
* *
* @param userList 用户数据列表 * @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持如果已存在则进行更新数据 * @param isUpdateSupport 是否更新支持如果已存在则进行更新数据
* @param operName 操作用户 * @param operName 操作用户
@ -586,7 +586,7 @@ public class SysUserServiceImpl implements ISysUserService
} }
String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000); String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000);
System.out.println("验证码:"+verifyCode); System.out.println("验证码:"+verifyCode);
String message="【创巨圆】验证码:"+verifyCode+",此验证码只用于注册验证,5分钟内有效。如非本人操作,请忽略。"; String message="【河北创巨圆科技发展有限公司】验证码:"+verifyCode+",此验证码只用于注册验证,5分钟内有效。如非本人操作,请忽略。";
String cacheValue = redisCache.getCacheObject(phoneNumber+"_number"); String cacheValue = redisCache.getCacheObject(phoneNumber+"_number");
if(cacheValue != null && Integer.parseInt(cacheValue) > 29){ if(cacheValue != null && Integer.parseInt(cacheValue) > 29){
return -2; return -2;
@ -623,7 +623,7 @@ public class SysUserServiceImpl implements ISysUserService
return -3; return -3;
} }
String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000); String verifyCode = String.valueOf((new Random()).nextInt(899999) + 100000);
String message="【创巨圆】验证码:"+verifyCode+",此验证码只用于找回密码,5分钟内有效。如非本人操作,请忽略。"; String message="【河北创巨圆科技发展有限公司】验证码:"+verifyCode+",此验证码只用于找回密码,5分钟内有效。如非本人操作,请忽略。";
String cacheValue = redisCache.getCacheObject(phoneNumber+"_forgetThePassword"); String cacheValue = redisCache.getCacheObject(phoneNumber+"_forgetThePassword");
System.out.println("验证码:"+verifyCode); System.out.println("验证码:"+verifyCode);
if(cacheValue != null && Integer.parseInt(cacheValue) > 29){ if(cacheValue != null && Integer.parseInt(cacheValue) > 29){

@ -36,10 +36,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="administrativeApprovalBureau" column="administrative_approval_bureau" /> <result property="administrativeApprovalBureau" column="administrative_approval_bureau" />
<result property="registrationAuthorityProvince" column="registration_authority_province" /> <result property="registrationAuthorityProvince" column="registration_authority_province" />
<result property="dataSources" column="data_sources" /> <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> </resultMap>
<sql id="selectUnitMemberVo"> <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> </sql>
<select id="selectUnitMemberList" parameterType="UnitMember" resultMap="UnitMemberResult"> <select id="selectUnitMemberList" parameterType="UnitMember" resultMap="UnitMemberResult">
@ -81,7 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t2.region_name as registrationAuthorityProvinceName, t2.region_name as registrationAuthorityProvinceName,
t3.region_name as registrationAuthorityCityName, t3.region_name as registrationAuthorityCityName,
t4.region_name as registrationAuthorityAreaName, t4.region_name as registrationAuthorityAreaName,
t1.data_sources t1.data_sources,
t1.representative_phone,
t1.organization_phone
from unit_member t1 from unit_member t1
left join region t2 on t2.region_id = t1.registration_authority_province left join region t2 on t2.region_id = t1.registration_authority_province
left join region t3 on t3.region_id = t1.registration_authority_city 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="createBy != null and createBy != ''"> and t1.create_by = #{createBy}</if>
<if test="dataSources != null and dataSources != ''"> and t1.data_sources = #{dataSources}</if> <if test="dataSources != null and dataSources != ''"> and t1.data_sources = #{dataSources}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="newSelectUnitMemberList" parameterType="UnitMember" resultMap="UnitMemberResult"> <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="administrativeApprovalBureau != null">administrative_approval_bureau,</if>
<if test="registrationAuthorityProvince != null">registration_authority_province,</if> <if test="registrationAuthorityProvince != null">registration_authority_province,</if>
<if test="dataSources != null">data_sources,</if> <if test="dataSources != null">data_sources,</if>
<if test="representativePhone != null">representative_phone,</if>
<if test="organizationPhone != null">organization_phone,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="companyName != null">#{companyName},</if> <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="administrativeApprovalBureau != null">#{administrativeApprovalBureau},</if>
<if test="registrationAuthorityProvince != null">#{registrationAuthorityProvince},</if> <if test="registrationAuthorityProvince != null">#{registrationAuthorityProvince},</if>
<if test="dataSources != null">#{dataSources},</if> <if test="dataSources != null">#{dataSources},</if>
<if test="representativePhone != null">#{representativePhone},</if>
<if test="organizationPhone != null">#{organizationPhone},</if>
</trim> </trim>
</insert> </insert>
@ -288,6 +308,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="approvalStatus != null">approval_status = #{approvalStatus},</if> <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
<if test="administrativeApprovalBureau != null">administrative_approval_bureau = #{administrativeApprovalBureau},</if> <if test="administrativeApprovalBureau != null">administrative_approval_bureau = #{administrativeApprovalBureau},</if>
<if test="registrationAuthorityProvince != null">registration_authority_province = #{registrationAuthorityProvince},</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> </trim>
where id = #{id} where id = #{id}
</update> </update>

Loading…
Cancel
Save