From 19b2927073b5a2b14ca07939a6bfc0a0a34fe98c Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:38 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 20 ++++++---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 41 ++++++++++----------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 9 +++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java | 3 +
5 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index a5a6390..f5b688f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -223,7 +223,7 @@
empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
- empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
+ empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList,dicItems);
empResignService.importEmpResign(listObject.get(6),returnList);
empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index 4a658e3..8057019 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -47,12 +47,12 @@
@TableField("empNumb")
@ExcelField(value = "编号")
private String empNumb = "";
-
+
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
@ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
-
+
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
@ExcelField(value = "岗位")
@@ -62,12 +62,12 @@
@TableField("empName")
@ExcelField(value = "姓名")
private String empName = "";
-
+
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
@ExcelField(value = "身份证号码")
private String certificateNumb = "";
-
+
@FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
@TableField("applayDate")
@JsonSerialize(using = DateSerializer.class)
@@ -75,40 +75,41 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "社保申请日期", writeConverter = TimeConverter.class)
private Date applayDate;
-
+
@FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
@TableField("proposer")
@ExcelField(value = "申请人")
private String proposer = "";
-
+
@FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
@TableField("insuranceGaers")
private String insuranceGaers = "";
-
+
@ExcelField(value = "社保档位")
+ @TableField(exist = false)
private String insuranceGaersName = "";
-
+
@FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告1-未报告 2-已报告")
@TableField("reportStatus")
@ExcelField(value = "是否已报告", writeConverterExp = "1=未报告,2=已报告")
private Integer reportStatus = 0;
-
+
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 1-未申请 2-已申请")
@TableField("applayStatus")
@ExcelField(value = "状态", writeConverterExp = "1=未申请,2=已申请")
private Integer applayStatus = 0;
-
+
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
@ExcelField(value = "审核人")
private String auditor = "";
-
+
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
@ExcelField(value = "备注")
private String remark = "";
-
-
+
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@@ -132,16 +133,16 @@
@TableField("JobId")
private Long jobId = 0L;
-
-
+
+
@TableField(exist = false)
private String reportStatusName ;
-
+
@TableField(exist = false)
private String applayStatusName ;
-
-
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -174,10 +175,10 @@
@Version
private Integer version = 0;
-
+
@TableField(exist = false)
private String applayDateStr;
-
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
index 7f2ebdb..12cb4bd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -78,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList);
+ void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems );
}
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 ed3ce26..f9646e9 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
@@ -214,21 +214,27 @@
empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
}
empInsurance.setProposer(list.get(6).toString());
- //婚姻状况
+ //社保档位
DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"insuranceGaers")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
if (null!=dicItem){
empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);
+
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"reportStatus")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setReportStatus(Integer.valueOf(dicItem.getDicItemCode()));
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- empInsurance.setApplayStatus("未申请".equals(list.get(8).toString()) ? 0 : 1);
+
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"applayStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setApplayStatus(Integer.valueOf(dicItem.getDicItemCode()));
}
- empInsurance.setAuditor(list.get(9).toString());
- empInsurance.setRemark(list.get(10).toString());
+
+ empInsurance.setAuditor(list.get(10).toString());
+ empInsurance.setRemark(list.get(11).toString());
empInsurance.setEmpStatus(empBaseInfo.getEmpStatus());
+ empInsurance.setCreator(FebsUtil.getUserId());
this.save(empInsurance);
}
}
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 e06a31d..5142ddd 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
@@ -155,7 +155,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
for (List<Object> list : listObject) {
if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
@@ -193,7 +193,12 @@
if (StringUtils.isNotBlank(list.get(7).toString())) {
leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
}
- leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
+ //请假类型
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"leavetype")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ leaveInfo.setLeaveType(dicItem.getDicItemCode());
+ }
+
if (StringUtils.isNotBlank(list.get(9).toString())) {
leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
}
--
Gitblit v1.8.0