zkr/shz-dataDashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改返回期望薪资

Browse Source
This commit is contained in:
chenshaohua
2026-06-16 23:17:25 +08:00
parent 20e29544e6
commit 666c49aa11
6 changed files with 98 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@@ -6,8 +6,8 @@ import java.util.Set;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.cms.domain.IDCardInfo;
import com.ruoyi.cms.service.impl.AppUserServiceImpl;
import com.ruoyi.cms.util.StringUtil;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwTokenResult;
import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwUserLogin;
import com.ruoyi.common.core.domain.model.RegisterBody;
@@ -175,8 +175,10 @@ public class SysLoginController
if (user != null && user.getAppUserId() != null) {
AppUser appUser = appUserService.selectAppUserByUserId(user.getAppUserId());
if (appUser != null) {
user.setJobTitles(appUser.getJobTitle());
userType = appUser.getUserType();
//添加薪资和岗位名称
user.setJobTitles(appUser.getJobTitle());
user.setExperience(StringUtil.getExperienceInterval(appUser.getSalaryMin(),appUser.getSalaryMax()));
}
}
AjaxResult ajax = AjaxResult.success();

9
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java
View File

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +21,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
@@ -49,7 +51,12 @@ public class CompanyController extends BaseController
{
if (RoleUtils.isCompanyAdmin()) {
System.out.println("企业社会信用代码============================="+RoleUtils.getCurrentUseridCard());
company.setCode(RoleUtils.getCurrentUseridCard());
if(StringUtils.isNotEmpty(RoleUtils.getCurrentUseridCard())){
company.setCode(RoleUtils.getCurrentUseridCard());
}else{
List<Company> list = new ArrayList<>();
return getDataTable(list);
}
}
startPage();
List<Company> list = companyService.selectCompanyList(company);

47
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/StaticsqueryServiceImpl.java
View File

@@ -103,12 +103,19 @@ public class StaticsqueryServiceImpl extends ServiceImpl<StaticsMapper, Statics>
};
// 定义时间周期
String[] timePeriods = {
/*String[] timePeriods = {
"2025-01", "2025-02", "2025-03", "2025-04", "2025-05",
"2024-11", "2024-12",
"2024-第一季度", "2024-第二季度", "2024-第三季度", "2024-第四季度",
"2025-第一季度", "2025-第二季度",
"2025", "2024", "2023"
};*/
String[] timePeriods = {
"2025-08", "2025-09", "2025-10", "2025-11", "2025-12", "2026-01","2026-02","2026-03","2026-04","2026-05","2026-06",
"2025-06", "2025-07",
"2025-第三季度", "2025-第四季度","2026-第一季度","2026-第二季度",
"2026"
};
// 所有支持的类型
@@ -182,9 +189,14 @@ public class StaticsqueryServiceImpl extends ServiceImpl<StaticsMapper, Statics>
};
// 定义时间周期
String[] timePeriods = {
/*String[] timePeriods = {
"2025-01", "2025-02", "2025-03", "2025-04", "2025-05",
"2024-11", "2024-12"
};*/
String[] timePeriods = {
"2025-06", "2025-07", "2025-08", "2025-09", "2025-10",
"2025-11", "2025-12", "2026-01", "2026-02", "2026-03"
, "2026-04", "2026-05", "2026-06"
};
// 所有支持的类型
@@ -253,9 +265,14 @@ public class StaticsqueryServiceImpl extends ServiceImpl<StaticsMapper, Statics>
};
// 定义时间周期
String[] timePeriods = {
/*String[] timePeriods = {
"2025-01", "2025-02", "2025-03", "2025-04", "2025-05",
"2024-11", "2024-12"
};*/
String[] timePeriods = {
"2025-06", "2025-07", "2025-08", "2025-09", "2025-10",
"2025-11", "2025-12", "2026-01", "2026-02", "2026-03",
"2026-04", "2026-05", "2026-06"
};
// 所有支持的类型
@@ -325,9 +342,14 @@ public class StaticsqueryServiceImpl extends ServiceImpl<StaticsMapper, Statics>
};
// 定义时间周期
String[] timePeriods = {
/*String[] timePeriods = {
"2025-01", "2025-02", "2025-03", "2025-04", "2025-05",
"2024-11", "2024-12"
};*/
String[] timePeriods = {
"2025-06", "2025-07", "2025-08", "2025-09", "2025-10",
"2025-11", "2025-12", "2026-01", "2026-02", "2026-03"
, "2026-04", "2026-05", "2026-06"
};
// 所有支持的类型
@@ -400,15 +422,20 @@ public class StaticsqueryServiceImpl extends ServiceImpl<StaticsMapper, Statics>
};
// 定义时间周期
String[] timePeriods = {
/*String[] timePeriods = {
"2025-01", "2025-02", "2025-03", "2025-04", "2025-05",
"2024-11", "2024-12"
};*/
String[] timePeriods = {
"2025-06", "2025-07", "2025-08", "2025-09", "2025-10",
"2025-11", "2025-12", "2026-01", "2026-02", "2026-03"
, "2026-04", "2026-05", "2026-06"
};
// 所有支持的类型
Map<String, List<String>> typeMap = new HashMap<>();
typeMap.put("month", Arrays.asList(
"分学历年限/月/岗位发布数量"
"分学历/月/岗位发布数量"
));
@@ -483,11 +510,17 @@ public class StaticsqueryServiceImpl extends ServiceImpl<StaticsMapper, Statics>
};
// 定义时间周期
String[] timePeriods = {
/*String[] timePeriods = {
"2025-01", "2025-02", "2025-03", "2025-04", "2025-05",
"2024-11", "2024-12"
};*/
String[] timePeriods = {
"2025-06", "2025-07", "2025-08", "2025-09", "2025-10",
"2025-11", "2025-12", "2026-01", "2026-02", "2026-03"
, "2026-04", "2026-05", "2026-06"
};
// 所有支持的类型
Map<String, List<String>> typeMap = new HashMap<>();
typeMap.put("month", Arrays.asList(

21
ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java
View File

@@ -94,6 +94,9 @@ public class StringUtil {
*/
public static final String PATH_PROXY_146="http://10.98.80.146/file/";
private static final String SEPARATOR = "-";
private static final String DEFAULT_VALUE = "0";
/**
* 身份证规则
*/
@@ -328,4 +331,22 @@ public class StringUtil {
}
return modelExp;
}
/**
* 判断薪资区间的
* @param salaryMin
* @param salaryMax
* @return
*/
public static String getExperienceInterval(String salaryMin, String salaryMax) {
String min = StringUtils.defaultIfBlank(salaryMin, DEFAULT_VALUE);
String max = StringUtils.defaultIfBlank(salaryMax, DEFAULT_VALUE);
// 两端相同时，统一拼接为 同值-同值
if (min.equals(max)) {
return min + SEPARATOR + min;
}
// 两端不同，正常拼接
return min + SEPARATOR + max;
}
}

13
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@@ -76,8 +76,12 @@ public class SysUser extends BaseEntity
//appUserId
private Long appUserId;
//岗位名称组
private List<String> jobTitles;
//薪资区间
private String experience;
/** 部门对象 */
@Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -329,6 +333,14 @@ public class SysUser extends BaseEntity
this.jobTitles = jobTitles;
}
public String getExperience() {
return experience;
}
public void setExperience(String experience) {
this.experience = experience;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -354,6 +366,7 @@ public class SysUser extends BaseEntity
.append("idCard", getIdCard())
.append("appUserId", getAppUserId())
.append("jobTitles", getJobTitles())
.append("experience", getExperience())
.toString();
}
}

18
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
View File

@@ -239,6 +239,8 @@ public class SsoService {
throw new RuntimeException("获取用户证件信息失败");
}
personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
}else{
personCardNo=info.getString("entCreditCode");
}
}
@@ -255,7 +257,7 @@ public class SsoService {
//2.再查sysuser,不存在，则新增
SysUser sysUser = sysUserService.selectUserByIdCard(personCardNo);
if (sysUser == null) {
sysUser = saveSysUser(userJson, appUser.getUserId());
sysUser = saveSysUser(userJson, appUser.getUserId(),isCompanyUser);
}
//用户存在，生成本系统用户的token
@@ -341,7 +343,7 @@ public class SsoService {
}
if (sysUser == null) {
sysUser = saveSysUser(userJson, appUserId);
sysUser = saveSysUser(userJson, appUserId,isCompanyUser);
}
//用户存在，生成本系统用户的token
@@ -477,7 +479,7 @@ public class SsoService {
* @param userJson
* @return
*/
private SysUser saveSysUser(JSONObject userJson, Long appUserId) {
private SysUser saveSysUser(JSONObject userJson, Long appUserId,String isCompanyUser) {
JSONObject info = userJson.containsKey("info") ? userJson.getJSONObject("info") : null;
System.out.println("sysuserId==========" + userJson.getLong("userId"));
System.out.println("userJson==========" + JSONObject.toJSONString(userJson));
@@ -498,11 +500,15 @@ public class SsoService {
sysUser.setLoginIp(IpUtils.getIpAddr());
//获取身份证
String personCardNo = info != null && info.containsKey("personCardNo") ? info.getString("personCardNo") : userJson.getString("idCardNo");
String personCardNo="";
if("0".equals(isCompanyUser)){
personCardNo = info != null && info.containsKey("personCardNo") ? info.getString("personCardNo") : userJson.getString("idCardNo");
personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
}else{
personCardNo = info.getString("entCreditCode");
}
//解密处理
if (StringUtils.isNotEmpty(personCardNo)) {
personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
sysUser.setIdCard(personCardNo);
}
String phone = info != null && info.containsKey("personPhone") ? info.getString("personPhone") : userJson.getString("phonenumber");