From b4672b5f60e6d299405442b56454a4750f15ff61 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 23:05:48 +0800
Subject: [PATCH] fix(信息录入): 工伤案件与意外险案件
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 100 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index 7f21cca..df38b2c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -61,73 +61,74 @@
private Snowflake snowflake = IdUtil.getSnowflake(ModuleCode.HR_FIlE, 1);
@Override
- public IPage<Map<String,Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
+ public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
- if (StrUtil.isNotBlank(vo.getEmpName())){
- queryWrapper.like("a.empName",vo.getEmpName());
+ if (StrUtil.isNotBlank(vo.getEmpName())) {
+ queryWrapper.like("a.empName", vo.getEmpName());
}
- if (StrUtil.isNotBlank(vo.getEmpNumb())){
- queryWrapper.like("a.empNumb",vo.getEmpNumb());
+ if (StrUtil.isNotBlank(vo.getEmpNumb())) {
+ queryWrapper.like("a.empNumb", vo.getEmpNumb());
}
- if (StrUtil.isNotBlank(vo.getCertificateNumb())){
- queryWrapper.like("a.certificateNumb",vo.getCertificateNumb());
+ if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
+ queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
}
- if (StrUtil.isNotBlank(vo.getDeptName())){
- queryWrapper.like("a.deptName",vo.getDeptName());
+ if (StrUtil.isNotBlank(vo.getDeptName())) {
+ queryWrapper.like("a.deptName", vo.getDeptName());
}
- if (StrUtil.isNotBlank(vo.getEntryDate())){
- queryWrapper.between("a.entryDate",vo.getEntryDate().split(",")[0],vo.getEntryDate().split(",")[1]);
+ if (StrUtil.isNotBlank(vo.getEntryDate())) {
+ queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
}
- if(StrUtil.isNotBlank(vo.getAge())){
- if(StrUtil.equals(vo.getAge(),"1")){
- queryWrapper.between("a.age",18,29);
- }else if(StrUtil.equals(vo.getAge(),"2")){
- queryWrapper.between("a.age",30,39);
- }else if(StrUtil.equals(vo.getAge(),"3")){
- queryWrapper.between("a.age",40,49);
- }else if(StrUtil.equals(vo.getAge(),"4")){
- queryWrapper.between("a.age",50,59);
- }else if(StrUtil.equals(vo.getAge(),"5")){
- queryWrapper.between("a.age",60,69);
- }else if(StrUtil.equals(vo.getAge(),"6")){
- queryWrapper.ge("a.age",69);
+ if (StrUtil.isNotBlank(vo.getAge())) {
+ if (StrUtil.equals(vo.getAge(), "1")) {
+ queryWrapper.between("a.age", 18, 29);
+ } else if (StrUtil.equals(vo.getAge(), "2")) {
+ queryWrapper.between("a.age", 30, 39);
+ } else if (StrUtil.equals(vo.getAge(), "3")) {
+ queryWrapper.between("a.age", 40, 49);
+ } else if (StrUtil.equals(vo.getAge(), "4")) {
+ queryWrapper.between("a.age", 50, 59);
+ } else if (StrUtil.equals(vo.getAge(), "5")) {
+ queryWrapper.between("a.age", 60, 69);
+ } else if (StrUtil.equals(vo.getAge(), "6")) {
+ queryWrapper.ge("a.age", 69);
}
}
- if(StrUtil.isNotBlank(vo.getArchivesStatus())){
- if(!StrUtil.equals(vo.getArchivesStatus(),"-1")) {
+ if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
+ if (!StrUtil.equals(vo.getArchivesStatus(), "-1")) {
queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
}
}
- if(StrUtil.isNotBlank(vo.getEducation())){
- if(!StrUtil.equals(vo.getEducation(),"-1")) {
+ if (StrUtil.isNotBlank(vo.getEducation())) {
+ if (!StrUtil.equals(vo.getEducation(), "-1")) {
queryWrapper.eq("a.education", vo.getEducation());
}
}
- if(StrUtil.isNotBlank(vo.getSex())){
- if(!StrUtil.equals(vo.getSex(),"-1")) {
+ if (StrUtil.isNotBlank(vo.getSex())) {
+ if (!StrUtil.equals(vo.getSex(), "-1")) {
queryWrapper.eq("a.sex", vo.getSex());
}
}
- if(StrUtil.isNotBlank(vo.getInsuranceType())){
- if(!StrUtil.equals(vo.getInsuranceType(),"-1")) {
+ if (StrUtil.isNotBlank(vo.getInsuranceType())) {
+ if (!StrUtil.equals(vo.getInsuranceType(), "-1")) {
queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
}
}
- if(StrUtil.isNotBlank(vo.getPolitics())){
- if(!StrUtil.equals(vo.getPolitics(),"-1")) {
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ if (!StrUtil.equals(vo.getPolitics(), "-1")) {
queryWrapper.eq("a.politics", vo.getPolitics());
}
}
- queryWrapper.eq("a.delFlag",0);
+ queryWrapper.eq("a.delFlag", 0);
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
String querySql = empAccessoryMapper.getQuerySql();
- return empAccessoryMapper.selectPageVo(page, queryWrapper,querySql);
+ IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
+ return mapIPage;
}
@Override
public List<EmpAccessory> findEmpAccessorys(EmpAccessory empAccessory) {
LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccessory::getDelFlag,0);
+ queryWrapper.eq(EmpAccessory::getDelFlag, 0);
if (null != empAccessory.getLabelid()) {
queryWrapper.eq(EmpAccessory::getLabelid, empAccessory.getLabelid());
}
@@ -142,10 +143,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpAccessory(Long labelid, MultipartFile file,Long empId) throws FebsException, IOException {
+ public void createEmpAccessory(Long labelid, MultipartFile file, Long empId) throws FebsException, IOException {
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empId);
- String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
- Dict dict = MyUtil.filesUpload(file,properties.getUploadSinglePath()+nameAndCertificateNumb,snowflake.nextIdStr());
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
+ Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
EmpAccessory accessory = new EmpAccessory();
accessory.setCreatetime(new Date());
accessory.setCreator(operatorId);
@@ -174,11 +175,10 @@
String[] arr = accessoryids.split(",");
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid,arr);
- EmpAccessory accessory = new EmpAccessory();
- accessory.setModifier(operatorId);
- accessory.setModifytime(new Date());
- accessory.setDelFlag(1);
- this.update(accessory,wapper);
+ wapper.set(EmpAccessory::getDelFlag,1);
+ wapper.set(EmpAccessory::getModifier,operatorId);
+ wapper.set(EmpAccessory::getModifytime,new Date());
+ this.update(wapper);
LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(EmpAccessory::getAccessoryid,arr);
@@ -213,12 +213,10 @@
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
- EmpAccessory empAccessory = new EmpAccessory();
- empAccessory.setModifier(operatorId);
- empAccessory.setModifytime(new Date());
- empAccessory.setLabelid(labelid);
- empAccessory.setEmpid(empId);
- this.update(empAccessory,wapper);
+ wapper.set(EmpAccessory::getModifier,operatorId);
+ wapper.set(EmpAccessory::getModifytime,new Date());
+ wapper.set(EmpAccessory::getLabelid,labelid);
+ this.update(wapper);
}
--
Gitblit v1.8.0