Commit 6df3d22d authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents 32fa45d8 418be75f
......@@ -24,6 +24,10 @@ public class EmployeeConstants {
public static final String MAJOR = "专业必填";
public static final String ADMISSION_DATE = "入学时间必填";
public static final String GRADUTION_DATE = "毕业时间必填";
public static final String ID_ROVINCE_MUST = "更新户籍市,户籍省必填";
public static final String ID_CITY_MUST = "更新户籍县,户籍市必填";
public static final String FILE_ROVINCE_MUST = "更新档案市,档案省必填";
public static final String FILE_CITY_MUST = "更新档案县,档案市必填";
/**
* 无数据可更新
......
......@@ -429,6 +429,7 @@
,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
,a.LEAVE_TIME
,a.LEAVE_USER_NAME
,a.LEAVE_USER
,a.LEAVE_REASON
from t_employee_info a
......
......@@ -460,6 +460,12 @@ public class ExcelUtil <T> implements Serializable {
}
return tempStr;
}
// 简单的获取区域字典value
public static String getRedisAreaValue(String c) {
return String.valueOf(RedisUtil.redis.opsForValue().get(c));
}
private String getDicValue(String c, String tempStr, ExcelAttribute attr,Integer rowNum, ErrorMessage errorTemp) {
Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
.get(CacheConstants.DICT_DETAILS
......
......@@ -16,7 +16,10 @@
package com.yifu.cloud.plus.v1.yifu.admin.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysAreaService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import io.swagger.v3.oas.annotations.tags.Tag;
......@@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
......@@ -68,4 +72,17 @@ public class AreaController {
return sysAreaService.getAreaToName();
}
/**
* @param
* @Description: 获取所有区域list
* @Author: hgw
* @Date: 2022-7-6 16:42:39
**/
@Inner
@PostMapping("/inner/getSysAreaList")
public List<SysArea> getSysAreaList() {
return sysAreaService.list(Wrappers.<SysArea>query().lambda()
.eq(SysArea::getStatus, CommonConstants.ZERO_INT).orderByAsc(SysArea::getParentId));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment