修复主要工作内容无法模糊查询

yijiusmile

2021-02-23 e15b6fa57d933172fd3091296042f114986dc6ab

修复主要工作内容无法模糊查询

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java

@@ -210,7 +210,7 @@
                empOccupationalService.importEmpOccupational(listObject.get(10));
                empLaborTroubleService.importEmpLaborTrouble(listObject.get(11));
                empBadRecordService.importEmpBadRecord(listObject.get(12));
                empRemarkinfoService.importEmpBadRecord(listObject.get(13));
                empRemarkinfoService.importEmpRemarkInfo(listObject.get(13));
            }
        } catch (Exception e) {
            log.error("导入员工", e);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java

@@ -78,5 +78,5 @@
     */
    boolean momentToNormal(String ids);

    void importEmpBadRecord(List<List<Object>> listObject);
    void importEmpRemarkInfo(List<List<Object>> listObject);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java

@@ -135,7 +135,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpBadRecord(List<List<Object>> listObject) {
    public void importEmpRemarkInfo(List<List<Object>> listObject) {
        for (List<Object> list : listObject) {
            EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
            empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java

@@ -58,7 +58,7 @@
            queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
            queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
            queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
        }
        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);