From da7fc9b3e00ceed3186662a3662e296f1e581f9c Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 02:22:32 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 38 +++++++++---------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java | 18 ++++++---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 14 ++++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml | 3 +
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java | 8 +++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java | 11 +++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 3 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpJobChangeService.java | 5 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 4 +
9 files changed, 72 insertions(+), 32 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java
index 0371b25..bf0fe80 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.common.core.converter;
import cc.mrbird.febs.common.core.utils.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.convert.WriteConverter;
import com.wuwenze.poi.exception.ExcelKitWriteConverterException;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +22,12 @@
return StringUtils.EMPTY;
} else {
try {
- return DateUtil.formatCstTime(value.toString(), DateUtil.FULL_TIME_SPLIT_PATTERN);
+ if (StrUtil.isNotBlank(value.toString())&&value.toString().length()==19){
+ return value.toString();
+ }else{
+ return DateUtil.formatCstTime(value.toString(), DateUtil.FULL_TIME_SPLIT_PATTERN);
+ }
+
} catch (ParseException e) {
String message = "时间转换异常";
log.error(message, e);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
index 621581a..0668bec 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
@@ -1,13 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
-import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,8 +20,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* name:EmpJobchange
@@ -51,17 +54,20 @@
@ApiOperation(value = "员工调岗记录翻页列表")
@GetMapping("list")
public FebsResponse empJobchangeList(QueryRequest request, EmpJobChange empJobchange) {
- Map
- <String, Object> dataTable = FebsUtil.getDataTable(this.empJobchangeService.findEmpJobChanges(request, empJobchange));
+ Map <String, Object> dataTable = FebsUtil.getDataTable(this.empJobchangeService.findEmpJobChanges(request, empJobchange));
return new FebsResponse().data(dataTable);
}
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
- public void export(QueryRequest request, EmpJobChange empBaseinfo, HttpServletResponse response) {
+ public void export(QueryRequest request, EmpJobChange empJobchange, HttpServletResponse response) {
request.setPageSize(this.empJobchangeService.count());
- List<EmpJobChange> records = this.empJobchangeService.findEmpJobChanges(request, empBaseinfo).getRecords();
- ExcelKit.$Export(EmpJobChange.class, response).downXlsx(records, false);
+ List<Map<String,Object>> records = this.empJobchangeService.findEmpJobChanges(request, empJobchange).getRecords();
+ List<EmpJobChange> list = records.parallelStream().map(i->{
+ i.put("changeDate", DateUtil.parse(i.get("changeDate").toString()));
+ return BeanUtil.toBean(i,EmpJobChange.class);
+ }).collect(Collectors.toList());
+ ExcelKit.$Export(EmpJobChange.class, response).downXlsx(list, false);
}
@ApiOperation(value = "员工调岗记录增加")
@PostMapping
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index 1c0285c..8033deb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -140,7 +140,17 @@
@FieldInfo(name = "oldJobNames", explain = "调岗人员原岗位")
@TableField(exist = false)
private String oldJobNames;
-
+
@TableField(exist = false)
private String changeDateStr= "";
-}
\ No newline at end of file
+
+ @TableField(exist = false)
+ private String deptName= "";
+
+ @ExcelField(value = "员工编号")
+ @TableField(exist = false)
+ private String empNumb="";
+ @ExcelField(value = "身份证号码")
+ @TableField(exist = false)
+ private String certificateNumb="";
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java
index 86ad595..df31025 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java
@@ -1,11 +1,17 @@
package cc.mrbird.febs.server.hr.mapper;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
+import java.util.Map;
/**
* name:EmpJobchange
@@ -38,4 +44,7 @@
" </foreach>\n" +
"</script>")
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
-}
\ No newline at end of file
+
+ IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
index b43c997..eda4747 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
@@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper">
+ <select id="selectPageVo" resultType="java.util.Map">
+ select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
+ </select>
</mapper>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpJobChangeService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpJobChangeService.java
index 734183c..583996d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpJobChangeService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpJobChangeService.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
/**
* name:EmpJobchange
@@ -22,10 +23,10 @@
* 查询（分页）
*
* @param request QueryRequest
- * @param empJobchange empJobchange
+ * @param empJobchange EmpJobChangeVO
* @return IPage<EmpJobchange>
*/
- IPage<EmpJobChange> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange);
+ IPage<Map<String,Object>> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange);
/**
* 查询（所有）
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 2a4d082..b6f4d6d 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
@@ -118,6 +118,9 @@
if (StrUtil.isNotBlank(vo.getEmpStatus())) {
queryWrapper.in("a.empStatus", vo.getEmpStatus());
}
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ queryWrapper.in("a.politics", vo.getPolitics());
+ }
queryWrapper.eq("a.delFlag", 0);
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
String querySql = empAccessoryMapper.getQuerySql();
@@ -210,7 +213,6 @@
@Override
public void mvFiles(String accessoryids,Long labelid,Long empId) {
String[] arr = accessoryids.split(",");
-
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
wapper.set(EmpAccessory::getModifier,operatorId);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 09fc93c..b12da11 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -101,6 +101,9 @@
if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
queryWrapper.like(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics());
}
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
+ queryWrapper.in(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus());
+ }
if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
queryWrapper.between(EmpBaseInfo::getAge, empBaseInfo.getAgeStr().split(",")[0], empBaseInfo.getAgeStr().split(",")[1]);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index e20c627..eab9801 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -2,10 +2,10 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
-import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,29 +41,29 @@
.orElse("1");
@Override
- public IPage<EmpJobChange> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
- LambdaQueryWrapper<EmpJobChange> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpJobChange::getDelFlag, 0);
-// if (StringUtils.isNotBlank(empJobchange.getEmpNumb())) {
-// queryWrapper.like(EmpJobChange::getEmpNumb, empJobchange.getEmpNumb());
-// }
- if (StringUtils.isNotBlank(empJobchange.getEmpName())) {
- queryWrapper.like(EmpJobChange::getEmpName, empJobchange.getEmpName());
+ public IPage<Map<String,Object>> findEmpJobChanges(QueryRequest request, EmpJobChange empJobchange) {
+ QueryWrapper<EmpJobChange> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", 0);
+ if (StringUtils.isNotBlank(empJobchange.getEmpNumb())) {
+ queryWrapper.like("b.empNumb", empJobchange.getEmpNumb());
}
-// if (StringUtils.isNotBlank(empJobchange.getCertificateNumb())) {
-// queryWrapper.like(EmpJobChange::getCertificateNumb, empJobchange.getCertificateNumb());
-// }
-// if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
-// queryWrapper.like(EmpJobChange::getDeptName, empJobchange.getDeptName());
-// }
+ if (StringUtils.isNotBlank(empJobchange.getEmpName())) {
+ queryWrapper.like("a.empName", empJobchange.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getCertificateNumb())) {
+ queryWrapper.like("b.certificateNumb", empJobchange.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
+ queryWrapper.like("a.newDeptName", empJobchange.getDeptName());
+ }
if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
- queryWrapper.between(EmpJobChange::getChangeDate, empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
+ queryWrapper.between("a.changeDate", empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
- queryWrapper.eq(EmpJobChange::getChangeType, empJobchange.getChangeType());
+ queryWrapper.eq("a.changeType", empJobchange.getChangeType());
}
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ return this.baseMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -118,4 +118,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empJobchangeMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0