Commit 569ed22e authored by fangxinjiang's avatar fangxinjiang

代码优化

parent 0b9efb53
...@@ -74,7 +74,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable { ...@@ -74,7 +74,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
/** /**
* 申报年度 * 申报年度
*/ */
@ExcelAttribute(name = "申报年度") @ExcelAttribute(name = "申报年度",isInteger = true)
@ExcelProperty(value ="申报年度") @ExcelProperty(value ="申报年度")
private String declareYear; private String declareYear;
......
...@@ -46,6 +46,7 @@ import org.springframework.stereotype.Service; ...@@ -46,6 +46,7 @@ import org.springframework.stereotype.Service;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -100,6 +101,11 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr ...@@ -100,6 +101,11 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
// 已有验证报错直接下一个 // 已有验证报错直接下一个
EmpCertificateExcelVO excel = excelVOList.get(i); EmpCertificateExcelVO excel = excelVOList.get(i);
if (Common.isNotNull(excel.getDeclareYear()) &&
Integer.parseInt(excel.getDeclareYear()) > DateUtil.getYearOfInt(new Date())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_CERTIFICATE_DECLARE_YEAR_ERROR)));
continue;
}
emp = employeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda() emp = employeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getEmpIdcard,excel.getEmpIdcard()) .eq(TEmployeeInfo::getEmpIdcard,excel.getEmpIdcard())
.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING) .eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
......
...@@ -275,4 +275,8 @@ public interface ErrorCodes { ...@@ -275,4 +275,8 @@ public interface ErrorCodes {
* 导入的文件格式不正确 * 导入的文件格式不正确
*/ */
String IMPORT_FILE_TYPE_ERROR = "import.file.type.error"; String IMPORT_FILE_TYPE_ERROR = "import.file.type.error";
/**
* 申请年份不可为未来年份
*/
String ARCHIVES_EMP_CERTIFICATE_DECLARE_YEAR_ERROR = "archives.emp.certificate.declare.year.error";
} }
...@@ -515,6 +515,15 @@ public class DateUtil { ...@@ -515,6 +515,15 @@ public class DateUtil {
return formater.format(date); return formater.format(date);
} }
/**
* @param date
* @return string
*/
public static int getYearOfInt(Date date) {
SimpleDateFormat formater = new SimpleDateFormat("yyyy");
return Integer.parseInt(formater.format(date));
}
/** /**
* @param date * @param date
* @return string * @return string
......
...@@ -61,7 +61,8 @@ checks.reduce.project.error=\u5B58\u5728\u5DF2\u51CF\u9879\u7684\u9879\u76EE\uFF ...@@ -61,7 +61,8 @@ checks.reduce.project.error=\u5B58\u5728\u5DF2\u51CF\u9879\u7684\u9879\u76EE\uFF
checks.emp.exit.error=\u4EBA\u5458\u4E0D\u5728\u8BE5\u9879\u76EE\uFF0C\u65E0\u6CD5\u66F4\u65B0 checks.emp.exit.error=\u4EBA\u5458\u4E0D\u5728\u8BE5\u9879\u76EE\uFF0C\u65E0\u6CD5\u66F4\u65B0
checks.project.delete.error=\u9879\u76EE\u6863\u6848\u72B6\u6001\u4E3A\u5DF2\u5BA1\u6838\uFF0C\u7981\u6B62\u5220\u9664 checks.project.delete.error=\u9879\u76EE\u6863\u6848\u72B6\u6001\u4E3A\u5DF2\u5BA1\u6838\uFF0C\u7981\u6B62\u5220\u9664
archives.emp.certificate.name.existing=\u5DF2\u5B58\u5728\u5BF9\u5E94\u8EAB\u4EFD\u8BC1\u7684\u8BC1\u4E66\u4FE1\u606F archives.emp.certificate.name.existing=\u8BE5\u5458\u5DE5\u5DF2\u5B58\u5728\u5BF9\u5E94\u8EAB\u4EFD\u8BC1\u7684\u8BC1\u4E66\u4FE1\u606F
archives.emp.certificate.declare.year.error=\u7533\u8BF7\u5E74\u4EFD\u4E0D\u53EF\u4E3A\u672A\u6765\u5E74\u4EFD
checks.change.emp.project=\u5F85\u5212\u8F6C\u5458\u5DE5\u5DF2\u5728\u76EE\u6807\u9879\u76EE\u4E0B\u4E0D\u53EF\u5212\u8F6C checks.change.emp.project=\u5F85\u5212\u8F6C\u5458\u5DE5\u5DF2\u5728\u76EE\u6807\u9879\u76EE\u4E0B\u4E0D\u53EF\u5212\u8F6C
......
...@@ -238,7 +238,6 @@ public class DictController { ...@@ -238,7 +238,6 @@ public class DictController {
*/ */
@SysLog("新增字典项") @SysLog("新增字典项")
@PostMapping("/item") @PostMapping("/item")
@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
public R<Boolean> save(@RequestBody SysDictItem sysDictItem) { public R<Boolean> save(@RequestBody SysDictItem sysDictItem) {
SysDictItem item = sysDictItemService.getOne(Wrappers.<SysDictItem>query().lambda() SysDictItem item = sysDictItemService.getOne(Wrappers.<SysDictItem>query().lambda()
.eq(SysDictItem::getType,sysDictItem.getType()) .eq(SysDictItem::getType,sysDictItem.getType())
...@@ -248,7 +247,7 @@ public class DictController { ...@@ -248,7 +247,7 @@ public class DictController {
if (Common.isNotNull(item)){ if (Common.isNotNull(item)){
return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_DICT_ITEM_ADD_VALUE_EXIST)); return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_DICT_ITEM_ADD_VALUE_EXIST));
} }
return R.ok(sysDictItemService.save(sysDictItem)); return sysDictItemService.saveDiy(sysDictItem);
} }
/** /**
......
...@@ -82,4 +82,6 @@ public interface SysDictItemService extends IService<SysDictItem> { ...@@ -82,4 +82,6 @@ public interface SysDictItemService extends IService<SysDictItem> {
Map<String, Object> getAllDictItemSub(); Map<String, Object> getAllDictItemSub();
void clearDictItemCache(); void clearDictItemCache();
R<Boolean> saveDiy(SysDictItem sysDictItem);
} }
...@@ -37,7 +37,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes; ...@@ -37,7 +37,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils; import com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -61,6 +63,9 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi ...@@ -61,6 +63,9 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
private final SysDictService dictService; private final SysDictService dictService;
@Autowired
private RedisUtil redisUtil;
/** /**
* 删除字典项 * 删除字典项
* @param id 字典项ID * @param id 字典项ID
...@@ -94,9 +99,38 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi ...@@ -94,9 +99,38 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
// 系统内置 // 系统内置
Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystemFlag()), Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystemFlag()),
MsgUtils.getMessage(ErrorCodes.SYS_DICT_UPDATE_SYSTEM)); MsgUtils.getMessage(ErrorCodes.SYS_DICT_UPDATE_SYSTEM));
// 更新字典
extractedRedis(item);
return this.updateById(item); return this.updateById(item);
} }
private void extractedRedis(SysDictItem item) {
Map<String, Object> resultMap = new HashMap<>();
updateDictItem(item.getType(),resultMap);
redisUtil.set(item.getType(),resultMap);
}
@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
@Override
public R<Boolean> saveDiy(SysDictItem sysDictItem) {
// 更新字典
extractedRedis(sysDictItem);
int res = baseMapper.insert(sysDictItem);
if (res < 0){
return R.failed();
}
return R.ok();
}
private void updateDictItem(String type, Map<String,Object> resultMap){
List<SysDictItem> allList = baseMapper.selectList(Wrappers.<SysDictItem>query().lambda()
.in(SysDictItem::getType,type)
.eq(SysDictItem::getDelFlag,CommonConstants.ZERO_STRING));
extracted(allList, resultMap);
}
/** /**
* 构建树查询 1. 不是懒加载情况,查询全部 2. 是懒加载,根据parentId 查询 2.1 父节点为空,则查询ID -1 * 构建树查询 1. 不是懒加载情况,查询全部 2. 是懒加载,根据parentId 查询 2.1 父节点为空,则查询ID -1
* @param lazy 是否是懒加载 * @param lazy 是否是懒加载
...@@ -170,6 +204,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi ...@@ -170,6 +204,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
public R<Map<String, Object>> getAllDictItem() { public R<Map<String, Object>> getAllDictItem() {
return R.ok(getAllDictItemSub()); return R.ok(getAllDictItemSub());
} }
@Override @Override
public Map<String, Object> getAllDictItemSub(){ public Map<String, Object> getAllDictItemSub(){
List<SysDictItem> allList = baseMapper.selectList(Wrappers.<SysDictItem>query().lambda() List<SysDictItem> allList = baseMapper.selectList(Wrappers.<SysDictItem>query().lambda()
...@@ -188,7 +223,6 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi ...@@ -188,7 +223,6 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
public void clearDictItemCache() { public void clearDictItemCache() {
} }
private void extracted(List<SysDictItem> allList, Map<String, Object> resultMap) { private void extracted(List<SysDictItem> allList, Map<String, Object> resultMap) {
if (Common.isNotNull(allList)){ if (Common.isNotNull(allList)){
for (SysDictItem item : allList) { for (SysDictItem item : allList) {
......
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