Skip to content

Y
yifu-mvp
Commit dec684ed authored by wangzb's avatar wangzb
Browse files
Options

feature-wzb:bug修复

parent dc32d486
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 215 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @ dec684ed
...@@ -483,11 +483,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -483,11 +483,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} }
} else { } else {
baseMapper.updateById(tEmployeeContractInfo); baseMapper.updateById(tEmployeeContractInfo);
if (CommonConstants.TWO_STRING.equals(tEmployeeContractInfo.getContractType())
|| CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getContractType())) {
tEmployeeContractInfo.setContractEnd(null);
baseMapper.updateContractEnd(tEmployeeContractInfo);
}
} }
// 不是待提交，记录审核记录 // 不是待提交，记录审核记录
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java
View file @ dec684ed
...@@ -163,7 +163,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -163,7 +163,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
data.setErrorFlag(true); data.setErrorFlag(true);
errorMessage.append("ID为空;"); errorMessage.append("ID为空;");
} else { } else {
TMinSalary ll = baseMapper.selectById(data.getId());
if (Common.isEmpty(baseMapper.selectById(data.getId()))) { if (Common.isEmpty(baseMapper.selectById(data.getId()))) {
data.setErrorFlag(true); data.setErrorFlag(true);
errorMessage.append("ID不存在无法更新，请核实后再操作!;"); errorMessage.append("ID不存在无法更新，请核实后再操作!;");
...@@ -171,135 +170,36 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -171,135 +170,36 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
if (Common.isEmpty(data.getLocation()) && Common.isEmpty(data.getSalaryBase()) && Common.isEmpty(data.getStatus())) { if (Common.isEmpty(data.getLocation()) && Common.isEmpty(data.getSalaryBase()) && Common.isEmpty(data.getStatus())) {
data.setErrorFlag(true); data.setErrorFlag(true);
errorMessage.append("所在地、最低工资(元)、状态为空;"); errorMessage.append("所在地、最低工资(元)、状态为空;");
}
if (data.getLocation().contains("-")) {
data.setErrorFlag(true);
errorMessage.append("所在地格式与列表保持一致;");
} else {
if (null != data.getLocation()) { if (null != data.getLocation()) {
if (data.getLocation().contains("/")) { String location[] = data.getLocation().split("/");
String location[] = data.getLocation().split("/"); if (!data.getLocation().isEmpty()) {
if (!data.getLocation().isEmpty()) { if (location.length == 1) {
if (location.length == 1) { data.setErrorFlag(true);
data.setErrorFlag(true); errorMessage.append("所在地”请精确到市或县/区;");
errorMessage.append("所在地”请精确到市或县/区;");
}
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
if (Common.isEmpty(redisProvinceName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
}
} }
if (location.length == 2) { String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]); if (Common.isEmpty(redisProvinceName)) {
if (Common.isEmpty(redisProvinceName)) { data.setErrorFlag(true);
data.setErrorFlag(true); errorMessage.append("对应区域不存在;");
errorMessage.append("对应区域不存在;");
}
String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]);
if (Common.isEmpty(redisCityName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
}
TMinSalary entity = baseMapper.selectById(data.getId());
if (Common.isNotNull(entity)) {
LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>();
if (Common.isNotNull(redisProvinceName)) {
query.eq(TMinSalary::getProvince, redisProvinceName);
}
if (Common.isNotNull(redisCityName)) {
query.eq(TMinSalary::getCity, redisCityName);
}
query.ne(TMinSalary::getId, data.getId());
long res = baseMapper.selectCount(query);
if (res > CommonConstants.ZERO_INT) {
data.setErrorFlag(true);
errorMessage.append("已存在对应区域在用的配置信息;");
}
}
}
if (location.length > 2) {
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
if (Common.isEmpty(redisProvinceName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
}
String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]);
if (Common.isEmpty(redisCityName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
}
String redisTownName = getRedisAreaValue(location[CommonConstants.TWO_INT] + "_" + location[CommonConstants.ONE_INT]);
if (Common.isEmpty(redisTownName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
}
TMinSalary entity = baseMapper.selectById(data.getId());
if (Common.isNotNull(entity)) {
LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>();
if (Common.isNotNull(redisCityName)) {
query.eq(TMinSalary::getProvince, redisCityName);
}
if (Common.isNotNull(redisCityName)) {
query.eq(TMinSalary::getCity, redisCityName);
}
if (Common.isNotNull(redisTownName)) {
query.eq(TMinSalary::getTown, redisTownName);
}
if (Common.isEmpty(location[2])) {
query.isNull(TMinSalary::getTown);
}
query.ne(TMinSalary::getId, data.getId());
long res = baseMapper.selectCount(query);
if (res > CommonConstants.ZERO_INT) {
data.setErrorFlag(true);
errorMessage.append("已存在对应区域在用的配置信息;");
}
}
}
if (null != data.getSalaryBase()) {
if (!ValidityUtil.validateStandard(data.getSalaryBase())) {
data.setErrorFlag(true);
errorMessage.append("最低工资，请填写>0的两位小数;");
}
}
if (!data.getStatus().isEmpty()) {
if (!(CommonConstants.START.equals(data.getStatus()) || CommonConstants.STOP.equals(data.getStatus()))) {
data.setErrorFlag(true);
errorMessage.append("填写的状态不是启用或停用");
}
} }
} }
if (location.length == 2) {
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
if (data.getLocation().contains("-")) { if (Common.isEmpty(redisProvinceName)) {
String location[] = data.getLocation().split("-"); data.setErrorFlag(true);
if (!data.getLocation().isEmpty()) { errorMessage.append("对应区域不存在;");
if (location.length == 1) {
data.setErrorFlag(true);
errorMessage.append("所在地”请精确到市或县/区;");
}
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
if (Common.isEmpty(redisProvinceName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
}
} }
if (location.length == 2) { String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]);
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]); if (Common.isEmpty(redisCityName)) {
if (Common.isEmpty(redisProvinceName)) { data.setErrorFlag(true);
data.setErrorFlag(true); errorMessage.append("对应区域不存在;");
errorMessage.append("对应区域不存在;");
}
String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]);
if (Common.isEmpty(redisCityName)) {
data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
} } else {
TMinSalary entity = baseMapper.selectById(data.getId()); TMinSalary entity = baseMapper.selectById(data.getId());
if (Common.isNotNull(entity)) { if (Common.isNotNull(entity)) {
LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>();
...@@ -320,28 +220,30 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -320,28 +220,30 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
} }
} }
} }
if (location.length > 2) { }
String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]); if (location.length > 2) {
if (Common.isEmpty(redisProvinceName)) { String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
data.setErrorFlag(true); if (Common.isEmpty(redisProvinceName)) {
errorMessage.append("对应区域不存在;"); data.setErrorFlag(true);
} errorMessage.append("对应区域不存在;");
String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]); }
if (Common.isEmpty(redisCityName)) { String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]);
data.setErrorFlag(true); if (Common.isEmpty(redisCityName)) {
errorMessage.append("对应区域不存在;"); data.setErrorFlag(true);
errorMessage.append("对应区域不存在;");
} }
String redisTownName = getRedisAreaValue(location[CommonConstants.TWO_INT] + "_" + location[CommonConstants.ONE_INT]); String redisTownName = getRedisAreaValue(location[CommonConstants.TWO_INT] + "_" + location[CommonConstants.ONE_INT]);
if (Common.isEmpty(redisTownName)) { if (Common.isEmpty(redisTownName)) {
data.setErrorFlag(true); data.setErrorFlag(true);
errorMessage.append("对应区域不存在;"); errorMessage.append("对应区域不存在;");
} }
else {
TMinSalary entity = baseMapper.selectById(data.getId()); TMinSalary entity = baseMapper.selectById(data.getId());
if (Common.isNotNull(entity)) { if (Common.isNotNull(entity)) {
LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TMinSalary> query = new LambdaQueryWrapper<>();
if (Common.isNotNull(redisCityName)) { if (Common.isNotNull(redisProvinceName)) {
query.eq(TMinSalary::getProvince, redisCityName); query.eq(TMinSalary::getProvince, redisProvinceName);
} }
if (Common.isNotNull(redisCityName)) { if (Common.isNotNull(redisCityName)) {
query.eq(TMinSalary::getCity, redisCityName); query.eq(TMinSalary::getCity, redisCityName);
...@@ -361,84 +263,87 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -361,84 +263,87 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
} }
} }
} }
if (null != data.getSalaryBase()) {
if (!ValidityUtil.validateStandard(data.getSalaryBase())) {
data.setErrorFlag(true);
errorMessage.append("最低工资，请填写>0的两位小数;");
}
}
if (null != data.getStatus()) {
if (!(CommonConstants.START.equals(data.getStatus()) || CommonConstants.STOP.equals(data.getStatus()))) {
data.setErrorFlag(true);
errorMessage.append("填写的状态不是启用或停用");
}
}
} }
} }
} }
} if (null != data.getSalaryBase()) {
if (data.isErrorFlag()) { if (!ValidityUtil.validateStandard(data.getSalaryBase())) {
data.setErrorMessage(errorMessage.toString()); data.setErrorFlag(true);
} errorMessage.append("最低工资，请填写>0的两位小数;");
tMinSalaryImportVoList.add(data); }
} }
if (null != data.getStatus()) {
if (!(CommonConstants.START.equals(data.getStatus()) || CommonConstants.STOP.equals(data.getStatus()))) {
data.setErrorFlag(true);
errorMessage.append("填写的状态不是启用或停用");
}
}
}
if(data.isErrorFlag())
@Override {
public void doAfterAllAnalysed(AnalysisContext context) { data.setErrorMessage(errorMessage.toString());
saveData();
} }
tMinSalaryImportVoList.add(data);
}
private void saveData() {
List<TMinSalaryImportVo> salaryImportsSuccessList = tMinSalaryImportVoList.stream().filter(e -> e.isErrorFlag() != true).collect(Collectors.toList()); @Override
if (CollectionUtils.isNotEmpty(salaryImportsSuccessList)) { public void doAfterAllAnalysed (AnalysisContext context){
saveData();
//将成功的数据转换成需要入库的格式 }
salaryImportsSuccessList.stream().forEach(e -> {
TMinSalary selectOne = new TMinSalary(); private void saveData () {
selectOne.setId(e.getId()); List<TMinSalaryImportVo> salaryImportsSuccessList = tMinSalaryImportVoList.stream().filter(e -> e.isErrorFlag() != true).collect(Collectors.toList());
if(null!=e.getLocation()) { if (CollectionUtils.isNotEmpty(salaryImportsSuccessList)) {
if (e.getLocation().contains("/")) {
String location[] = e.getLocation().split("/"); //将成功的数据转换成需要入库的格式
if (location.length > 1) { salaryImportsSuccessList.stream().forEach(e -> {
for (int i = 0; i < location.length; i++) { TMinSalary selectOne = new TMinSalary();
if (i == CommonConstants.ZERO_INT) { selectOne.setId(e.getId());
int province = baseMapper.selectByAreaName(location[i]); if (null != e.getLocation()) {
selectOne.setProvince(province); if (e.getLocation().contains("/")) {
} String location[] = e.getLocation().split("/");
if (i == CommonConstants.ONE_INT) { if (location.length >1) {
int city = baseMapper.selectByAreaName(location[i]); for (int i = 0; i < location.length; i++) {
selectOne.setCity(city); if (i == CommonConstants.ZERO_INT) {
} int province = baseMapper.selectByAreaName(location[i]);
if (i == CommonConstants.TWO_INT) { selectOne.setProvince(province);
int town = baseMapper.selectByAreaName(location[i]); }
selectOne.setTown(town); if (i == CommonConstants.ONE_INT) {
int city = baseMapper.selectByAreaName(location[i]);
selectOne.setCity(city);
}
if (i == CommonConstants.TWO_INT) {
int town = baseMapper.selectByAreaName(location[i]);
selectOne.setTown(town);
}
} }
} }
} }
} if (e.getLocation().contains("-")) {
if (e.getLocation().contains("-")) { String location[] = e.getLocation().split("-");
String location[] = e.getLocation().split("-"); if (location.length > 1) {
if (location.length > 1) { for (int i = 0; i < location.length; i++) {
for (int i = 0; i < location.length; i++) { if (i == CommonConstants.ZERO_INT) {
if (i == CommonConstants.ZERO_INT) { int province = baseMapper.selectByAreaName(location[i]);
int province = baseMapper.selectByAreaName(location[i]); selectOne.setProvince(province);
selectOne.setProvince(province); }
} if (i == CommonConstants.ONE_INT) {
if (i == CommonConstants.ONE_INT) { int city = baseMapper.selectByAreaName(location[i]);
int city = baseMapper.selectByAreaName(location[i]); selectOne.setCity(city);
selectOne.setCity(city); }
} if (i == CommonConstants.TWO_INT) {
if (i == CommonConstants.TWO_INT) { int town = baseMapper.selectByAreaName(location[i]);
int town = baseMapper.selectByAreaName(location[i]); selectOne.setTown(town);
selectOne.setTown(town);
}
} }
} }
} }
} }
}
if (CommonConstants.START.equals(e.getStatus())) { if (CommonConstants.START.equals(e.getStatus())) {
selectOne.setStatus(CommonConstants.ONE_INT); selectOne.setStatus(CommonConstants.ONE_INT);
} }
...@@ -449,21 +354,24 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal ...@@ -449,21 +354,24 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
selectOne.setUpdateTime(LocalDateTime.now()); selectOne.setUpdateTime(LocalDateTime.now());
baseMapper.updateById(selectOne); baseMapper.updateById(selectOne);
} }
); );
}
} }
}
}).sheet().doRead(); }).sheet().doRead();
} catch (Exception e) { } catch(
log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e); Exception e)
return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
}
//返回给前端的错误数据 {
List<TMinSalaryImportVo> errorImportErrorList = tMinSalaryImportVoList.stream().filter(e -> e.isErrorFlag() == true).collect(Collectors.toList()); log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
}
//返回给前端的错误数据
List<TMinSalaryImportVo> errorImportErrorList = tMinSalaryImportVoList.stream().filter(e -> e.isErrorFlag() == true).collect(Collectors.toList());
return R.ok(errorImportErrorList); return R.ok(errorImportErrorList);
} }
private String getRedisAreaValue(String areaString) { private String getRedisAreaValue(String areaString) {
......
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