fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/impl/CompanyServiceImpl.java

@@ -25,6 +25,7 @@ import com.zhongzheng.modules.company.mapper.CompanyMapper;
 import com.zhongzheng.modules.company.vo.CompanyVo;
 import com.zhongzheng.modules.company.service.ICompanyService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -46,7 +47,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     private IStaffService iStaffService;
 
     @Override
-    public CompanyVo queryById(Long companyId){
+    public CompanyVo queryById(Long companyId) {
         Company db = this.baseMapper.selectById(companyId);
         return BeanUtil.toBean(db, CompanyVo.class);
     }
@@ -77,19 +78,19 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     }
 
     /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
     private List<CompanyVo> entity2Vo(Collection<Company> collection) {
         List<CompanyVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, CompanyVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<Company> page = (Page<Company>)collection;
+            Page<Company> page = (Page<Company>) collection;
             Page<CompanyVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
+            BeanUtil.copyProperties(page, pageVo);
             pageVo.addAll(voList);
             voList = pageVo;
         }
@@ -100,20 +101,20 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public Boolean insertByAddBo(CompanyAddBo bo) {
         Company add = BeanUtil.toBean(bo, Company.class);
         validEntityBeforeSave(add);
-        Date issuancedate = new Date(bo.getEstablishDate()* 1000L);
+        Date issuancedate = new Date(bo.getEstablishDate() * 1000L);
         Date effectivedate = new Date(bo.getOperateDate() * 1000L);
-        if (effectivedate.compareTo(issuancedate)<0){
+        if (effectivedate.compareTo(issuancedate) < 0) {
             throw new CustomException("营业时间错误");
         }
-        if (ObjectUtil.isNotEmpty(add.getCompanyId())){
+        if (ObjectUtil.isNotEmpty(add.getCompanyId())) {
             Company company = this.baseMapper.selectById(add.getCompanyId());
-            if (ObjectUtil.isEmpty(company)&&company.getStatus().equals(1)){
+            if (ObjectUtil.isEmpty(company) && company.getStatus().equals(1)) {
                 throw new CustomException("总公司不存在");
             }
             add.setFatherId(add.getCompanyId());
             Long companyLevel = company.getCompanyLevel();
-            add.setCompanyLevel(companyLevel+1L);
-        }else {
+            add.setCompanyLevel(companyLevel + 1L);
+        } else {
             add.setCompanyLevel(1L);
         }
         add.setCreateTime(DateUtils.getNowTime());
@@ -124,10 +125,10 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     @Override
     public Boolean updateByEditBo(CompanyEditBo bo) {
         Company update = BeanUtil.toBean(bo, Company.class);
-        if (ObjectUtil.isAllNotEmpty(bo.getEstablishDate(),bo.getOperateDate())){
-            Date issuancedate = new Date(bo.getEstablishDate()* 1000L);
+        if (ObjectUtil.isAllNotEmpty(bo.getEstablishDate(), bo.getOperateDate())) {
+            Date issuancedate = new Date(bo.getEstablishDate() * 1000L);
             Date effectivedate = new Date(bo.getOperateDate() * 1000L);
-            if (effectivedate.compareTo(issuancedate)<0){
+            if (effectivedate.compareTo(issuancedate) < 0) {
                 throw new CustomException("营业时间错误");
             }
         }
@@ -141,20 +142,21 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(Company entity){
+    private void validEntityBeforeSave(Company entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     public Boolean deleteWithValidByIds(CompanyEditBo bo) {
         Company company = this.baseMapper.selectById(bo.getCompanyId());
-        if (ObjectUtil.isEmpty(company)){
+        if (ObjectUtil.isEmpty(company)) {
             throw new CustomException("当前企业不存在");
         }
         company.setStatus(0);
         this.baseMapper.updateById(company);
         return true;
     }
+
     /**
      * 查询企业部门列表
      *
@@ -163,24 +165,43 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     @Override
     public List<CompanyVo> selectCompanyDepartment(CompanyQueryBo bo) {
         List<CompanyVo> companyVos = this.queryList(bo);
-        if (ObjectUtil.isNotEmpty(companyVos)){
-            companyVos.forEach(item->{
+        if (ObjectUtil.isNotEmpty(companyVos)) {
+            companyVos.forEach(item -> {
                 //判断当前企业是否关联企业证书和员工信息
                 List<CompanyCertificate> companyCertificates = iCompanyCertificateService.list(new LambdaQueryWrapper<CompanyCertificate>().eq(CompanyCertificate::getCompanyId, item.getCompanyId()).eq(CompanyCertificate::getStatus, 1));
                 List<Staff> staffList = iStaffService.list(new LambdaQueryWrapper<Staff>().eq(Staff::getCompanyId, item.getCompanyId()).eq(Staff::getStatus, 1));
-                if (ObjectUtil.isNotEmpty(companyCertificates)||ObjectUtil.isNotEmpty(staffList)){
+                if (ObjectUtil.isNotEmpty(companyCertificates) || ObjectUtil.isNotEmpty(staffList)) {
                     item.setDeleteStatus(2);
-                }else {
+                } else {
                     item.setDeleteStatus(1);
                 }
                 List<CompanyDepartment> list = iCompanyDepartmentService.list(new LambdaQueryWrapper<CompanyDepartment>().eq(CompanyDepartment::getCompanyId, item.getCompanyId())
                         .eq(CompanyDepartment::getStatus, 1));
-                list=iCompanyDepartmentService.buildDeptTree(list);
-                if (ObjectUtil.isNotEmpty(list)){
+                list = iCompanyDepartmentService.buildDeptTree(list);
+                if (ObjectUtil.isNotEmpty(list)) {
                     item.setCompanyDepartmentList(list);
                 }
             });
         }
+        //根据公司以及部门联系人筛选
+        ArrayList<Long> companyIdList = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(bo.getAllTypeName())) {
+            List<CompanyDepartment> departmentContacts = iCompanyDepartmentService.list(new LambdaQueryWrapper<CompanyDepartment>().eq(CompanyDepartment::getRegisteredContacts, bo.getAllTypeName()).eq(CompanyDepartment::getStatus, 1));
+            CompanyQueryBo companyQueryBo = new CompanyQueryBo();
+            companyQueryBo.setCompanyName(bo.getAllTypeName());
+            List<CompanyVo> companyVos1 = this.queryList(companyQueryBo);
+            List<Long> companyIds = companyVos1.stream().map(CompanyVo::getCompanyId).collect(Collectors.toList());
+            companyIds.addAll(companyIds);
+            for (CompanyDepartment companyDepartment : departmentContacts) {
+                Long companyId = companyDepartment.getCompanyId();
+                companyIdList.add(companyId);
+            }
+            //筛选公司以及部门中包含参数姓名
+            List<CompanyVo> filteredCompanyVos = companyVos.stream()
+                    .filter(companyVo -> companyIdList.contains(companyVo.getCompanyId()))
+                    .collect(Collectors.toList());
+            return filteredCompanyVos;
+        }
         return companyVos;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/bo/StaffCertificateAddBo.java

@@ -21,7 +21,7 @@ public class StaffCertificateAddBo {
     private String tenantId;
     /** 员工id */
     @ApiModelProperty("员工id")
-    private String staffId;
+    private Long staffId;
     /** 证书编号 */
     @ApiModelProperty("证书编号")
     private String certificateNumber;
@@ -31,6 +31,24 @@ public class StaffCertificateAddBo {
     /** 证书专业 */
     @ApiModelProperty("证书专业")
     private String certificateMajor;
+    /** 企业id */
+    @ApiModelProperty("企业id")
+    private Long companyId;
+    /** 员工部门id */
+    @ApiModelProperty("员工部门id")
+    private Long departmentId;
+    /** 企业名称id */
+    @ApiModelProperty("企业名称")
+    private String companyName;
+    /** 员工姓名 */
+    @ApiModelProperty("员工姓名")
+    private String staffName;
+    /** 身份证号 */
+    @ApiModelProperty("身份证号")
+    private String idCard;
+    /** 部门名称 */
+    @ApiModelProperty("部门名称")
+    private String departmentName;
     /** 发证时间 */
     @ApiModelProperty("发证时间")
     private Long startTime;
@@ -49,12 +67,6 @@ public class StaffCertificateAddBo {
     /** 证书名称 */
     @ApiModelProperty("证书名称")
     private String certificateName;
-    /** 有效日期开始 */
-    @ApiModelProperty("有效日期开始")
-    private Long effectiveGo;
-    /** 有效日期结束 */
-    @ApiModelProperty("有效日期结束")
-    private Long effectiveEnd;
     /** 1有效 0无效 */
     @ApiModelProperty("1有效 0无效")
     private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/bo/StaffCertificateEditBo.java

@@ -26,7 +26,7 @@ public class StaffCertificateEditBo {
 
     /** 员工id */
     @ApiModelProperty("员工id")
-    private String staffId;
+    private Long staffId;
 
     /** 证书编号 */
     @ApiModelProperty("证书编号")
@@ -40,15 +40,27 @@ public class StaffCertificateEditBo {
     @ApiModelProperty("证书名称")
     private String certificateName;
 
+    /** 企业id */
+    @ApiModelProperty("企业id")
+    private Long companyId;
+    /** 员工部门id */
+    @ApiModelProperty("员工部门")
+    private Long departmentId;
+    /** 企业名称id */
+    @ApiModelProperty("企业名称id")
+    private String companyName;
+    /** 部门名称 */
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+    /** 员工姓名 */
+    @ApiModelProperty("员工姓名")
+    private String staffName;
+    /** 身份证号 */
+    @ApiModelProperty("身份证号")
+    private String idCard;
     /** 证书专业 */
     @ApiModelProperty("证书专业")
     private String certificateMajor;
-    /** 有效日期开始 */
-    @ApiModelProperty("有效日期开始")
-    private Long effectiveGo;
-    /** 有效日期结束 */
-    @ApiModelProperty("有效日期结束")
-    private Long effectiveEnd;
     /** 发证时间 */
     @ApiModelProperty("发证时间")
     private Long startTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/bo/StaffCertificateQueryBo.java

@@ -35,7 +35,7 @@ public class StaffCertificateQueryBo extends BaseEntity {
 	private String tenantId;
 	/** 员工id */
 	@ApiModelProperty("员工id")
-	private Integer staffId;
+	private Long staffId;
 	/** 证书编号 */
 	@ApiModelProperty("证书编号")
 	private String certificateNumber;
@@ -60,12 +60,15 @@ public class StaffCertificateQueryBo extends BaseEntity {
 	/** 证书预览 */
 	@ApiModelProperty("证书预览")
 	private String previewImg;
-	/** 有效日期开始 */
-	@ApiModelProperty("有效日期开始")
-	private Long effectiveGo;
-	/** 有效日期结束 */
-	@ApiModelProperty("有效日期结束")
-	private Long effectiveEnd;
+	/** 企业id */
+	@ApiModelProperty("企业id")
+	private Long companyId;
+	/** 员工部门id */
+	@ApiModelProperty("员工部门id")
+	private String departmentId;
+	/** 部门名称 */
+	@ApiModelProperty("部门名称")
+	private String departmentName;
 	/** 1有效 0无效 */
 	@ApiModelProperty("1有效 0无效")
 	private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/domain/StaffCertificate.java

@@ -28,7 +28,19 @@ private static final long serialVersionUID=1L;
     /** 机构名称 */
     private String tenantId;
     /** 员工id */
-    private String staffId;
+    private Long staffId;
+    /** 企业id */
+    private Long companyId;
+    /** 员工部门id */
+    private Long departmentId;
+    /** 企业名称 */
+    private String companyName;
+    /** 部门名称 */
+    private String departmentName;
+    /** 员工姓名 */
+    private String staffName;
+    /** 身份证号 */
+    private String idCard;
     /** 证书编号 */
     private String certificateNumber;
     /** 证书名称 */
@@ -43,10 +55,6 @@ private static final long serialVersionUID=1L;
     private Long endTime;
     /** 发证机关 */
     private String certificateAddress;
-    /** 有效日期开始 */
-    private Long effectiveGo;
-    /** 有效日期结束 */
-    private Long effectiveEnd;
     /** 预警状态 1：正常 2：已过期 */
     private Integer warningStatus;
     /** 证书预览 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/service/impl/StaffCertificateServiceImpl.java

@@ -13,9 +13,14 @@ import com.zhongzheng.common.utils.poi.EasyPoiUtil;
 import com.zhongzheng.modules.company.domain.Company;
 import com.zhongzheng.modules.company.domain.CompanyCertificate;
 import com.zhongzheng.modules.company.domain.CompanyDepartment;
+import com.zhongzheng.modules.company.service.ICompanyDepartmentService;
+import com.zhongzheng.modules.company.service.ICompanyService;
 import com.zhongzheng.modules.staff.bo.*;
 import com.zhongzheng.modules.staff.domain.*;
+import com.zhongzheng.modules.staff.service.IStaffService;
+import com.zhongzheng.modules.staff.vo.ExcelStaffCertificateVo;
 import com.zhongzheng.modules.staff.vo.ExcelStaffVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,6 +29,7 @@ import com.github.pagehelper.Page;
 import com.zhongzheng.modules.staff.mapper.StaffCertificateMapper;
 import com.zhongzheng.modules.staff.vo.StaffCertificateVo;
 import com.zhongzheng.modules.staff.service.IStaffCertificateService;
+import org.springframework.test.context.junit4.statements.SpringRepeat;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
@@ -37,6 +43,10 @@ import java.util.stream.Collectors;
  */
 @Service
 public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMapper, StaffCertificate> implements IStaffCertificateService {
+    @Autowired
+    private ICompanyService iCompanyService;
+    @Autowired
+    private IStaffService iStaffService;
 
     @Override
     public StaffCertificateVo queryById(Long certificateId) {
@@ -50,19 +60,19 @@ public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMap
         if (CollectionUtils.isEmpty(staffCertificateVos)) {
             return new ArrayList<>();
         }
-        staffCertificateVos.forEach(item->{
-            if (ObjectUtil.isAllNotEmpty(item.getStartTime(),item.getEndTime())){
+        staffCertificateVos.forEach(item -> {
+            if (ObjectUtil.isAllNotEmpty(item.getStartTime(), item.getEndTime())) {
                 Date effectivedate = new Date(item.getEndTime() * 1000L);
-                if (effectivedate.compareTo(new Date())>0){
+                if (effectivedate.compareTo(new Date()) > 0) {
                     item.setExpirationTime(0L);
-                }else {
+                } else {
                     //查询实时证书过期时间更新证书预警状态
                     StaffCertificate staffCertificate = new StaffCertificate();
                     staffCertificate.setUpdateTime(DateUtils.getNowTime());
                     staffCertificate.setWarningStatus(2);
                     staffCertificate.setStaffCertificateId(item.getStaffCertificateId());
                     this.baseMapper.updateById(staffCertificate);
-                    long l = DateUtil.between(effectivedate,new Date(), DateUnit.DAY);
+                    long l = DateUtil.between(effectivedate, new Date(), DateUnit.DAY);
                     item.setWarningStatus(2);
                     item.setExpirationTime(l);
                 }
@@ -196,137 +206,89 @@ public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMap
         return true;
     }
 
+    public Integer getStaffCertificateType(String StaffCertificateType) {
+        //公司类型判断
+        switch (StaffCertificateType) {
+            case "注册证书":
+                return 1;
+            case "技术职称":
+                return 2;
+            case "现场管理":
+                return 3;
+            case "安管三类":
+                return 4;
+            case "职业技能":
+                return 5;
+            case "待种作业":
+                return 6;
+            case "其他":
+                return 7;
+        }
+        return null;
+    }
+
     @Override
     public Boolean importStaffCertificateList(MultipartFile file) {
-        List<ExcelStaffVo> excelStaffVos = EasyPoiUtil.importExcel(file, 1, 1, ExcelStaffVo.class);
-        if (ObjectUtil.isEmpty(excelStaffVos)) {
+        List<ExcelStaffCertificateVo> excelStaffCertificateVos = EasyPoiUtil.importExcel(file, 0, 1, ExcelStaffCertificateVo.class);
+        if (ObjectUtil.isEmpty(excelStaffCertificateVos)) {
             throw new CustomException("文档数据为空");
         }
-        Map<String, List<ExcelStaffVo>> excelList = excelStaffVos.stream().collect(Collectors.groupingBy(ExcelStaffVo::getIdCard));
+        Map<String, List<ExcelStaffCertificateVo>> excelList = excelStaffCertificateVos.stream().collect(Collectors.groupingBy(ExcelStaffCertificateVo::getIdCard));
+        ArrayList<StaffCertificateMajorInfo> staffCertificateMajorInfos = new ArrayList<>();
         excelList.forEach((k, v) -> {
-            List<ExcelStaffVo> excelStaffVosList = excelList.get(k);
-            ExcelStaffVo excelStaffVo = excelStaffVosList.get(0);
-            if (ObjectUtil.isAllNotEmpty(excelStaffVo.getStaffName(), excelStaffVo.getIdCard(), excelStaffVo.getTelephone(), excelStaffVo.getCompanyName())) {
-                List<Company> companies = iCompanyService.list(new LambdaQueryWrapper<Company>().eq(Company::getCompanyName, excelStaffVo.getCompanyName()).eq(Company::getStatus, 1));
+            List<ExcelStaffCertificateVo> excelStaffVosList = excelList.get(k);
+            ExcelStaffCertificateVo excelStaffCertificateVo = excelStaffVosList.get(0);
+            if (ObjectUtil.isAllNotEmpty(excelStaffCertificateVo.getStaffName(), excelStaffCertificateVo.getIdCard(), excelStaffCertificateVo.getCompanyName())) {
+                List<Company> companies = iCompanyService.list(new LambdaQueryWrapper<Company>().eq(Company::getCompanyName, excelStaffCertificateVo.getCompanyName()).eq(Company::getStatus, 1));
                 if (ObjectUtil.isNotEmpty(companies)) {
                     Company company = companies.get(0);
-                    Staff staff = new Staff();
-                    staff.setStaffName(excelStaffVo.getStaffName());
-                    staff.setIdCard(excelStaffVo.getIdCard());
-                    staff.setTelephone(excelStaffVo.getTelephone());
-                    staff.setEmail(excelStaffVo.getEmail());
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getSex())) {
-                        Integer sexType = getSexType(excelStaffVo.getSex());
-                        staff.setSex(Long.valueOf(sexType));
-                    }
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getBirthday())) {
-                        String birthday = excelStaffVo.getBirthday();
-                        Long timeSec = DateUtils.dateTimeSec("yyyy/MM/dd", birthday);
-                        staff.setBirthday(timeSec);
-                    }
-                    staff.setNation(excelStaffVo.getNation());
-                    staff.setPoliticsFace(excelStaffVo.getPoliticsFace());
-                    staff.setHkLocation(excelStaffVo.getHkLocation());
-                    staff.setHomeAddress(excelStaffVo.getHomeAddress());
-                    staff.setCompanyId(company.getCompanyId());
-                    staff.setStaffNumber(excelStaffVo.getStaffNumber());
-                    staff.setCompanyName(company.getCompanyName());
-                    staff.setDepartmentName(excelStaffVo.getDepartmentName());
-                    List<CompanyDepartment> departments = iCompanyDepartmentService.list(new LambdaQueryWrapper<CompanyDepartment>().eq(CompanyDepartment::getDepartmentName, excelStaffVo.getDepartmentName()).eq(CompanyDepartment::getStatus, 1));
-                    if (ObjectUtil.isNotEmpty(departments)){
-                        CompanyDepartment companyDepartment = departments.get(0);
-                        staff.setDepartmentId(companyDepartment.getDepartmentId());
-                    }
-                    staff.setPosition(excelStaffVo.getPosition());
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getPositionStatus())) {
-                        staff.setPositionStatus(Long.valueOf(getPositionStatus(excelStaffVo.getPositionStatus())));
-                    }
-                    staff.setRecruitmentChannel(excelStaffVo.getRecruitmentChannel());
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getWorkDate())) {
-                        staff.setWorkDate(DateUtils.dateTimeSec("yyyy/MM/dd", excelStaffVo.getWorkDate()));
-                    }
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getEntryDate())) {
-                        staff.setEntryDate(DateUtils.dateTimeSec("yyyy/MM/dd", excelStaffVo.getEntryDate()));
+                    StaffCertificate staffCertificate = new StaffCertificate();
+                    staffCertificate.setCompanyId(company.getCompanyId());
+                    staffCertificate.setStaffName(excelStaffCertificateVo.getStaffName());
+                    staffCertificate.setIdCard(excelStaffCertificateVo.getIdCard());
+                    staffCertificate.setCompanyName(excelStaffCertificateVo.getCompanyName());
+                    if (ObjectUtil.isNotEmpty(excelStaffCertificateVo.getCertificateType())) {
+                        Integer certificateType = getStaffCertificateType(excelStaffCertificateVo.getCertificateType());
+                        staffCertificate.setCertificateType(certificateType);
                     }
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getLeaveDate())) {
-                        staff.setLeaveDate(DateUtils.dateTimeSec("yyyy/MM/dd", excelStaffVo.getLeaveDate()));
+                    staffCertificate.setCertificateName(excelStaffCertificateVo.getCertificateName());
+                    staffCertificate.setCertificateAddress(excelStaffCertificateVo.getCertificateAddress());
+
+                    if (ObjectUtil.isNotEmpty(excelStaffCertificateVo.getStartTime())) {
+                        String startTime = excelStaffCertificateVo.getStartTime();
+                        Long timeSec = DateUtils.dateTimeSec("yyyy/MM/dd", startTime);
+                        staffCertificate.setStartTime(timeSec);
                     }
-                    staff.setIssuingOrganization(excelStaffVo.getIssuingOrganization());
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getStartDate())) {
-                        staff.setStartDate(DateUtils.dateTimeSec("yyyy/MM/dd", excelStaffVo.getStartDate()));
+                    if (ObjectUtil.isNotEmpty(excelStaffCertificateVo.getEndTime())) {
+                        String endTime = excelStaffCertificateVo.getEndTime();
+                        Long timeSec = DateUtils.dateTimeSec("yyyy/MM/dd", endTime);
+                        staffCertificate.setEndTime(timeSec);
                     }
-                    if (ObjectUtil.isNotEmpty(excelStaffVo.getEndDate())) {
-                        staff.setEndDate(DateUtils.dateTimeSec("yyyy/MM/dd", excelStaffVo.getEndDate()));
+                    List<Staff> staffs = iStaffService.list(new LambdaQueryWrapper<Staff>().eq(Staff::getIdCard, excelStaffCertificateVo.getIdCard()).eq(Staff::getStatus, 1));
+                    if (ObjectUtil.isNotEmpty(staffs)) {
+                        Staff staff = staffs.get(0);
+                        staffCertificate.setStaffId(staff.getStaffId());
+                        staffCertificate.setDepartmentId(staff.getDepartmentId());
+                        staffCertificate.setDepartmentName(staff.getDepartmentName());
                     }
-                    staff.setCreateTime(DateUtils.getNowTime());
-                    staff.setUpdateTime(DateUtils.getNowTime());
-                    this.baseMapper.insert(staff);
+                    staffCertificate.setCreateTime(DateUtils.getNowTime());
+                    staffCertificate.setUpdateTime(DateUtils.getNowTime());
                     excelStaffVosList.forEach(item -> {
-                        List<Staff> staffList = this.baseMapper.selectList(new LambdaQueryWrapper<Staff>().eq(Staff::getIdCard, item.getIdCard()).eq(Staff::getStatus, 1));
-                        if (ObjectUtil.isNotEmpty(staffList)) {
-                            Staff staff1 = staffList.get(0);
-                            StaffEduBg staffEduBg = new StaffEduBg();
-                            if (ObjectUtil.isNotEmpty(item.getStartTime())) {
-                                staffEduBg.setStartDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getStartTime()));
+                        StaffCertificateMajorInfo staffCertificateMajorInfo = new StaffCertificateMajorInfo();
+                        staffCertificateMajorInfo.setCertificateMajor(item.getCertificateMajor());
+                            if (ObjectUtil.isNotEmpty(item.getEffectiveGo())) {
+                                staffCertificateMajorInfo.setStartEffectiveDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getEffectiveGo()));
                             }
-                            if (ObjectUtil.isNotEmpty(item.getEndTime())) {
-                                staffEduBg.setEndDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getEndTime()));
+                            if (ObjectUtil.isNotEmpty(item.getEffectiveEnd())) {
+                                staffCertificateMajorInfo.setEndEffectiveDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getEffectiveEnd()));
                             }
-                            staffEduBg.setStaffId(staff1.getStaffId());
-                            staffEduBg.setGraduationSchool(item.getGraduationSchool());
-                            staffEduBg.setMajor(item.getMajor());
-                            staffEduBg.setLearningType(Long.valueOf(getLearnIngType(item.getLearnType())));
-                            staffEduBg.setDegree(Long.valueOf(getLearnIngType(item.getLearnType())));
-                            staffEduBg.setCreateTime(DateUtils.getNowTime());
-                            staffEduBg.setUpdateTime(DateUtils.getNowTime());
-                            staffEduBg.setCompanyId(company.getCompanyId());
-                            StaffEduBgAddBo staffEduBgAddBo = BeanUtil.toBean(staffEduBg, StaffEduBgAddBo.class);
-                            staffEduBgAddBo.setCreateTime(DateUtils.getNowTime());
-                            staffEduBgAddBo.setUpdateTime(DateUtils.getNowTime());
-                            iStaffEduBgService.insertByAddBo(staffEduBgAddBo);
-                            StaffEmergencyContact staffEmergencyContact = new StaffEmergencyContact();
-                            staffEmergencyContact.setRelation(item.getRelation());
-                            staffEmergencyContact.setCompanyId(company.getCompanyId());
-                            staffEmergencyContact.setStaffId(staff1.getStaffId());
-                            staffEmergencyContact.setContactName(item.getContactName());
-                            staffEmergencyContact.setContactTelephone(item.getContactTelephone());
-                            StaffEmergencyContactAddBo staffEmergencyContactAddBo = BeanUtil.toBean(staffEmergencyContact, StaffEmergencyContactAddBo.class);
-                            staffEmergencyContactAddBo.setCreateTime(DateUtils.getNowTime());
-                            staffEmergencyContactAddBo.setUpdateTime(DateUtils.getNowTime());
-                            iStaffEmergencyContactService.insertByAddBo(staffEmergencyContactAddBo);
-                            StaffBankInfo staffBankInfo = new StaffBankInfo();
-                            staffBankInfo.setStaffId(staff1.getStaffId());
-                            staffBankInfo.setCompanyId(company.getCompanyId());
-                            staffBankInfo.setOpenName(item.getOpenName());
-                            staffBankInfo.setOpenBank(item.getOpenBank());
-                            staffBankInfo.setBankNumber(item.getBankNumber());
-                            StaffBankInfoAddBo staffBankInfoAddBo = BeanUtil.toBean(staffBankInfo, StaffBankInfoAddBo.class);
-                            staffBankInfoAddBo.setCreateTime(DateUtils.getNowTime());
-                            staffBankInfoAddBo.setUpdateTime(DateUtils.getNowTime());
-                            iStaffBankInfoService.insertByAddBo(staffBankInfoAddBo);
-                            StaffContractArchives staffContractArchives = new StaffContractArchives();
-                            staffContractArchives.setStaffId(staff1.getStaffId());
-                            staffContractArchives.setCompanyId(company.getCompanyId());
-                            staffContractArchives.setArchivesNumber(item.getArchivesNumber());
-                            staffContractArchives.setArchivesName(item.getArchivesName());
-                            staffContractArchives.setArchivesType(getArchivesType(item.getArchivesType()));
-                            if (ObjectUtil.isNotEmpty(item.getSigningDate())) {
-                                staffContractArchives.setSigningDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getSigningDate()));
-                            }
-                            if (ObjectUtil.isNotEmpty(item.getEffectiveDate())) {
-                                staffContractArchives.setEffectiveDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getEffectiveDate()));
-                            }
-                            if (ObjectUtil.isNotEmpty(item.getOutDate())) {
-                                staffContractArchives.setEndDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getOutDate()));
-                            }
-                            StaffContractArchivesAddBo staffContractArchivesAddBo = BeanUtil.toBean(staffContractArchives, StaffContractArchivesAddBo.class);
-                            iStaffContractArchivesService.insertByAddBo(staffContractArchivesAddBo);
-                        }
+                        staffCertificateMajorInfos.add(staffCertificateMajorInfo);
                     });
+                    staffCertificate.setCertificateMajor(JSONArray.toJSONString(staffCertificateMajorInfos));
+                    this.baseMapper.insert(staffCertificate);
                 }
             }
         });
         return true;
     }
-    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/vo/ExcelStaffCertificateVo.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.staff.vo;
 
-import com.zhongzheng.common.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zhongzheng-system/src/main/java/com/zhongzheng/modules/staff/vo/StaffCertificateVo.java

@@ -51,12 +51,6 @@ public class StaffCertificateVo {
 	@Excel(name = "有效时间")
 	@ApiModelProperty("有效时间")
 	private Long endTime;
-	/** 有效日期开始 */
-	@Excel(name = "有效日期开始")
-	private Long effectiveGo;
-	/** 有效日期结束 */
-	@Excel(name = "有效日期结束")
-	private Long effectiveEnd;
 	/** 发证机关 */
 	@Excel(name = "发证机关")
 	@ApiModelProperty("发证机关")
@@ -99,5 +93,13 @@ public class StaffCertificateVo {
 	private String addTime;
 	/** 过期时间 */
 	private Long expirationTime;
-
+	/** 企业id */
+	@ApiModelProperty("企业id")
+	private Long companyId;
+	/** 员工部门id */
+	@ApiModelProperty("员工部门id")
+	private String departmentId;
+	/** 部门名称 */
+	@ApiModelProperty("部门名称")
+	private String departmentName;
 }

zhongzheng-system/src/main/resources/mapper/modules/staff/StaffCertificateMapper.xml

@@ -19,8 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="previewImg" column="preview_img"/>
         <result property="status" column="status"/>
         <result property="staffRemarks" column="staff_remarks"/>
-        <result property="effectiveGo" column="effective_go"/>
-        <result property="effectiveEnd" column="effective_end"/>
+        <result property="companyId" column="company_id"/>
+        <result property="departmentId" column="department_id"/>
+        <result property="companyName" column="company_name"/>
+        <result property="departmentName" column="department_name"/>
+        <result property="staffName" column="staff_name"/>
+        <result property="idCard" column="id_card"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
@@ -42,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="addTime" column="create_time"/>
         <result property="companyName" column="company_name"/>
         <result property="positionStatus" column="position_status"/>
+        <result property="companyId" column="company_id"/>
+        <result property="departmentId" column="department_id"/>
+        <result property="companyName" column="company_name"/>
+        <result property="departmentName" column="department_name"/>
         <result property="staffName" column="staff_name"/>
         <result property="idCard" column="id_card"/>
     </resultMap>