zkr/shz-backend
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

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;
}
}