From 12ef02a92d7eafd63084c9fa303357040e0f29a1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:09:36 +0800
Subject: [PATCH] fix(bug修复): 汇总bug修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 133 ++++++++++++++++----------------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 32 ++++----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 27 ++++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 2
12 files changed, 109 insertions(+), 103 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 94c1c9c..b3696c9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -24,15 +24,14 @@
import java.util.Map;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:28:23
-* @since JDK1.8
-*/
+ * name:EmpContractinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工合同信息控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:28:23
+ * @since JDK1.8
+ */
@Api(tags = "人员合同信息录入接口")
@Slf4j
@Validated
@@ -41,79 +40,81 @@
@RequiredArgsConstructor
public class EmpContractInfoController {
-private final IEmpContractInfoService empContractinfoService;
+ private final IEmpContractInfoService empContractinfoService;
-@GetMapping
-@PreAuthorize("hasAuthority('empContractinfo:list')")
-public FebsResponse getAllEmpContractinfos(EmpContractInfo empContractinfo) {
-return new FebsResponse().data(empContractinfoService.findEmpContractinfos(empContractinfo));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empContractinfo:list')")
+ public FebsResponse getAllEmpContractinfos(EmpContractInfo empContractinfo) {
+ return new FebsResponse().data(empContractinfoService.findEmpContractinfos(empContractinfo));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empContractinfo:list')")
-public FebsResponse empContractinfoList(QueryRequest request, EmpContractInfo empContractinfo) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empContractinfo:list')")
+ public FebsResponse empContractinfoList(QueryRequest request, EmpContractInfo empContractinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpContractInfo empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empContractinfoService.count());
List<EmpContractInfo> records = this.empContractinfoService.findEmpContractinfos(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpContractInfo.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empContractinfo:add')")
-public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
-try {
-this.empContractinfoService.createEmpContractinfo(empContractinfo);
-} catch (Exception e) {
-String message = "新增员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empContractinfo:delete')")
-public void deleteEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
-try {
-this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
-} catch (Exception e) {
-String message = "删除员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empContractinfo:add')")
+ public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.createEmpContractinfo(empContractinfo);
+ } catch (Exception e) {
+ String message = "新增员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-public void logicDeleteEmpContractinfo(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empContractinfoService.logicDelEmpContractinfo(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empContractinfo:delete')")
+ public void deleteEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
+ } catch (Exception e) {
+ String message = "删除员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empContractinfo:update')")
-public void updateEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
-try {
-this.empContractinfoService.updateEmpContractinfo(empContractinfo);
-} catch (Exception e) {
-String message = "修改员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ public void logicDeleteEmpContractinfo(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empContractinfoService.logicDelEmpContractinfo(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empContractinfo:update')")
+ public void updateEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.updateEmpContractinfo(empContractinfo);
+ } catch (Exception e) {
+ String message = "修改员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "合同信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empContractinfo:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empContractinfoService.momentToNormal(ids);
} catch (Exception e) {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
index 2474f48..314ca4c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
@@ -19,31 +19,31 @@
<select id="countZcygBaseInfoList" resultType="java.util.Map">
SELECT
count(
- IF (t.dimissionType = '1', 1, NULL)
+ IF (t.dimissionType = '6', 1, NULL)
) zclz,
count(
- IF (t.dimissionType = '2', 1, NULL)
+ IF (t.dimissionType = '4', 1, NULL)
) zdlz,
count(
- IF (t.dimissionType = '4', 1, NULL)
+ IF (t.dimissionType = '3', 1, NULL)
) gsct
FROM
t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t.empStatus='1'
<choose>
<when test="btime!=null and btime!='' and etime!=null and etime!=''">
- and date_format(t.createTime,'%Y-%m-%d') >= #{btime} and date_format(t.createTime,'%Y-%m-%d') <= #{etime}
+ and date_format(t.dimissionDate,'%Y-%m-%d') >= #{btime} and date_format(t.dimissionDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t.createTime) = TO_DAYS(NOW())
+ and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t.createTime)=YEAR(NOW())
+ and YEAR(t.dimissionDate)=YEAR(NOW())
</otherwise>
</choose>
@@ -662,13 +662,13 @@
</foreach>
<choose>
<when test="number==8">
- and t1.dimissionType = '1'
+ and t1.dimissionType = '6'
</when>
<when test="number==9">
- and t1.dimissionType = '2'
+ and t1.dimissionType = '4'
</when>
<when test="number==10">
- and t1.dimissionType = '4'
+ and t1.dimissionType = '3'
</when>
<otherwise>
@@ -680,19 +680,19 @@
</if>
<choose>
<when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
- and date_format(t1.createTime,'%Y-%m-%d') >= #{btime} and date_format(t1.createTime,'%Y-%m-%d') <= #{etime}
+ and date_format(t1.dimissionDate,'%Y-%m-%d') >= #{btime} and date_format(t1.dimissionDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
+ and TO_DAYS(t1.dimissionDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t1.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.createTime)=YEAR(NOW())
+ and YEAR(t1.dimissionDate)=YEAR(NOW())
</otherwise>
</choose>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index cad40b9..437282e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -86,7 +86,7 @@
queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
}
if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empAccidentcases.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
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 007e2f2..47b531d 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
@@ -696,17 +696,22 @@
p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
}
if (StringUtils.isNotBlank(p.getDimissionType())) {
- if ("1".equals(p.getDimissionType())) {
- p.setDimissionTypeName("正常离职");
- } else if ("2".equals(p.getDimissionType())) {
- p.setDimissionTypeName("自动离职");
- } else if ("3".equals(p.getDimissionType())) {
- p.setDimissionTypeName("公司劝退");
- } else if ("4".equals(p.getDimissionType())) {
- p.setDimissionTypeName("公司辞退");
- } else if ("5".equals(p.getDimissionType())) {
- p.setDimissionTypeName("试用期内");
- }
+ // if ("1".equals(p.getDimissionType())) {
+ // p.setDimissionTypeName("正常离职");
+ // } else if ("2".equals(p.getDimissionType())) {
+ // p.setDimissionTypeName("自动离职");
+ // } else if ("3".equals(p.getDimissionType())) {
+ // p.setDimissionTypeName("公司劝退");
+ // } else if ("4".equals(p.getDimissionType())) {
+ // p.setDimissionTypeName("公司辞退");
+ // } else if ("5".equals(p.getDimissionType())) {
+ // p.setDimissionTypeName("试用期内");
+ // }
+ p.setDimissionTypeName(dicItems.stream()
+ .filter(k -> DicCode.IN_OUT_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getDimissionType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse(""));
}
p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档");
p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index f2f1fde..bca8106 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -83,7 +83,7 @@
queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
}
if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empContractinfo.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index bcad5da..f7798b1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -80,7 +80,7 @@
queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empDimissionattend.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empDimissionattend.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index ba8619c..7eaf2e0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -85,7 +85,7 @@
queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
}
if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empInsurance.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index fc9ef0a..6ff6e37 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -90,7 +90,7 @@
queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
}
if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empLabortrouble.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 6f39981..32ec443 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -73,7 +73,7 @@
queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index 7e65284..5aaf8a9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -89,7 +89,7 @@
queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
}
if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empOccupational.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index fdb7751..4abd830 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -83,9 +83,9 @@
queryWrapper.like("a.Conclusion", empPhysicalexam.getConclusion());
}
if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
} else {
- queryWrapper.in("a.EmpStatus", 0);
+ queryWrapper.in("b.EmpStatus", 0);
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index bfc400d..6e8f575 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -70,7 +70,7 @@
queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empWorkexperience.getEmpStatus().split(","));
} else {
queryWrapper.in("a.EmpStatus", 0);
}
--
Gitblit v1.8.0