Merge remote-tracking branch 'origin/lybDevelop' into lybDevelop

yz

2021-01-31 b55c9f4ddf68de8bade1f4bf627609fb36828ba5

Merge remote-tracking branch 'origin/lybDevelop' into lybDevelop

 febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl

@@ -92,7 +92,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void logicDel${className}(String ids) {
List<String> list = new ArrayList<>();
    String[] str = ids.split(",");
    List<String> list = new ArrayList<>(Arrays.asList(str));
    ${className?uncap_first}Mapper.logicDeleteByIds(list, operatorId);

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

@@ -22,38 +22,38 @@
* description:员工意外险案件控制器
*
* @author luoyibo
* @date 2021-01-24 20:36:10
* @date 2021-01-31 11:26:27
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
@RequestMapping("empAccidentcases")
@RequestMapping("empAccidentCases")
@RequiredArgsConstructor
public class EmpAccidentCasesController {

private final IEmpAccidentCasesService empAccidentcasesService;
private final IEmpAccidentCasesService empAccidentCasesService;

@GetMapping
@PreAuthorize("hasAuthority('empAccidentcases:list')")
public FebsResponse getAllEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
return new FebsResponse().data(empAccidentcasesService.findEmpAccidentcasess(empAccidentcases));
public FebsResponse getAllEmpAccidentCases(EmpAccidentCases empAccidentcases) {
return new FebsResponse().data(empAccidentCasesService.findEmpAccidentcasess(empAccidentcases));
}

@GetMapping("list")
@PreAuthorize("hasAuthority('empAccidentcases:list')")
public FebsResponse empAccidentcasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentcasesService.findEmpAccidentcasess(request, empAccidentcases));
public FebsResponse empAccidentCasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentCasesService.findEmpAccidentcasess(request, empAccidentcases));
return new FebsResponse().data(dataTable);
}

@PostMapping
@PreAuthorize("hasAuthority('empAccidentcases:add')")
public void addEmpAccidentcases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
try {
this.empAccidentcasesService.createEmpAccidentcases(empAccidentcases);
this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
} catch (Exception e) {
String message = "新增EmpAccidentcases失败";
String message = "新增员工意外险案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -61,11 +61,23 @@

@DeleteMapping
@PreAuthorize("hasAuthority('empAccidentcases:delete')")
public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
public void deleteEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
try {
this.empAccidentcasesService.deleteEmpAccidentcases(empAccidentcases);
this.empAccidentCasesService.deleteEmpAccidentcases(empAccidentcases);
} catch (Exception e) {
String message = "删除EmpAccidentcases失败";
String message = "删除员工意外险案件失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empAccidentcases:delete')")
public void logicDeleteEmpAccidentCases(@PathVariable("ids") String ids) throws FebsException {
try {
this.empAccidentCasesService.logicDelEmpAccidentcases(ids);
} catch (Exception e) {
String message = "逻辑删除员工意外险案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -73,11 +85,11 @@

@PutMapping
@PreAuthorize("hasAuthority('empAccidentcases:update')")
public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
public void updateEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
try {
this.empAccidentcasesService.updateEmpAccidentcases(empAccidentcases);
this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
} catch (Exception e) {
String message = "修改EmpAccidentcases失败";
String message = "修改员工意外险案件失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -1,7 +1,5 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
@@ -18,14 +16,15 @@
import java.util.Map;

/**
 * name:EmpBadrecord
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工不良记录信息控制器
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @since JDK1.8
 */
*
* name:EmpBadrecord
* package:cc.mrbird.febs.server.hr.controller
* description:员工不良记录信息控制器
*
* @author luoyibo
* @date 2021-01-31 11:26:42
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
@@ -33,57 +32,66 @@
@RequiredArgsConstructor
public class EmpBadRecordController {

    private final IEmpBadRecordService empBadRecordService;
private final IEmpBadRecordService empBadrecordService;

    @GetMapping("sequence")
    public long getSequence(){
        return SequenceUtil.generateId(0L,ModuleCode.HR_EMPLOYEE);
    }
    @GetMapping
    @PreAuthorize("hasAuthority('empBadrecord:list')")
    public FebsResponse getAllEmpBadRecords(EmpBadRecord empBadrecord) {
        return new FebsResponse().data(empBadRecordService.findEmpBadRecords(empBadrecord));
    }
@GetMapping
@PreAuthorize("hasAuthority('empBadrecord:list')")
public FebsResponse getAllEmpBadrecords(EmpBadRecord empBadrecord) {
return new FebsResponse().data(empBadrecordService.findEmpBadrecords(empBadrecord));
}

    @GetMapping("list")
    @PreAuthorize("hasAuthority('empBadrecord:list')")
    public FebsResponse empBadRecordList(QueryRequest request, EmpBadRecord empBadrecord) {
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadRecordService.findEmpBadRecords(request, empBadrecord));
        return new FebsResponse().data(dataTable);
    }
@GetMapping("list")
@PreAuthorize("hasAuthority('empBadrecord:list')")
public FebsResponse empBadrecordList(QueryRequest request, EmpBadRecord empBadrecord) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadrecordService.findEmpBadrecords(request, empBadrecord));
return new FebsResponse().data(dataTable);
}

    @PostMapping
    @PreAuthorize("hasAuthority('empBadrecord:add')")
    public void addEmpBadRecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
        try {
            this.empBadRecordService.createEmpBadRecord(empBadrecord);
        } catch (Exception e) {
            String message = "新增EmpBadrecord失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
@PostMapping
@PreAuthorize("hasAuthority('empBadrecord:add')")
public void addEmpBadrecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
try {
this.empBadrecordService.createEmpBadrecord(empBadrecord);
} catch (Exception e) {
String message = "新增员工不良记录信息失败";
log.error(message, e);
throw new FebsException(message);
}
}

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empBadrecord:delete')")
    public void logicDeleteEmpBadRecord(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empBadRecordService.logicDelEmpBadRecord(ids);
        } catch (Exception e) {
            String message = "逻辑删除员工不良记录失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
    @PutMapping
    @PreAuthorize("hasAuthority('empBadrecord:update')")
    public void updateEmpBadRecord(EmpBadRecord empBadrecord) throws FebsException {
        try {
            this.empBadRecordService.updateEmpBadRecord(empBadrecord);
        } catch (Exception e) {
            String message = "修改员工不良记录失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
@DeleteMapping
@PreAuthorize("hasAuthority('empBadrecord:delete')")
public void deleteEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
try {
this.empBadrecordService.deleteEmpBadrecord(empBadrecord);
} catch (Exception e) {
String message = "删除员工不良记录信息失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empBadrecord:delete')")
public void logicDeleteEmpBadrecord(@PathVariable("ids") String ids) throws FebsException {
try {
this.empBadrecordService.logicDelEmpBadrecord(ids);
} catch (Exception e) {
String message = "逻辑删除员工不良记录信息失败";
log.error(message, e);
throw new FebsException(message);
}
}

@PutMapping
@PreAuthorize("hasAuthority('empBadrecord:update')")
public void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
try {
this.empBadrecordService.updateEmpBadrecord(empBadrecord);
} catch (Exception e) {
String message = "修改员工不良记录信息失败";
log.error(message, e);
throw new FebsException(message);
}
}
}

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

New file
@@ -0,0 +1,110 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
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 lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Map;

/**
 * name:EmpBaseInfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:控制器
 *
 * @author luoyibo
 * @date 2021-01-30 08:04:50
 * @since JDK1.8
 */
@Slf4j
@Validated
@RestController
@RequestMapping("empBaseInfo")
@RequiredArgsConstructor
public class EmpBaseInfoController {

    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteUserService remoteUserService;
    private final IRemoteDeptService remoteDeptService;
    @GetMapping
    @PreAuthorize("hasAuthority('empBaseinfo:list')")
    public FebsResponse getAllEmpBaseInfos(EmpBaseInfo empBaseinfo) {
        return new FebsResponse().data(empBaseInfoService.findEmpBaseInfos(empBaseinfo));
    }

    @GetMapping("list")
    @PreAuthorize("hasAuthority('empBaseinfo:list')")
    public FebsResponse empBaseInfoList(QueryRequest request, EmpBaseInfo empBaseinfo) {
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findEmpBaseInfos(request, empBaseinfo));
        return new FebsResponse().data(dataTable);
    }

    @PostMapping
    @PreAuthorize("hasAuthority('empBaseinfo:add')")
    public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
        try {
            this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
        } catch (Exception e) {
            String message = "新增员工基本信息失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @DeleteMapping
    @PreAuthorize("hasAuthority('empBaseinfo:delete')")
    public void deleteEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
        try {
            this.empBaseInfoService.deleteEmpBaseInfo(empBaseinfo);
        } catch (Exception e) {
            String message = "删除员工基本信息失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empBaseinfo:delete')")
    public void logicDeleteEmpBaseInfo(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empBaseInfoService.logicDelEmpBaseInfo(ids);
        } catch (Exception e) {
            String message = "逻辑员工基本信息删除失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @PutMapping
    @PreAuthorize("hasAuthority('empBaseinfo:update')")
    public void updateEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
        try {
            this.empBaseInfoService.updateEmpBaseInfo(empBaseinfo);
        } catch (Exception e) {
            String message = "修改失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @GetMapping("user/list")
    public FebsResponse getRemoteUserList(QueryRequest request, SystemUser user) {
        return remoteUserService.userList(request, user);
    }
    @GetMapping("dept/list")
    public FebsResponse getRemoteDeptList(QueryRequest request, Dept dept) {
        return remoteDeptService.deptList(request, dept);
    }
}

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

@@ -22,13 +22,13 @@
* description:员工合同信息控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:42
* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
@RequestMapping("empContractinfo")
@RequestMapping("empContractInfo")
@RequiredArgsConstructor
public class EmpContractInfoController {

@@ -53,7 +53,7 @@
try {
this.empContractinfoService.createEmpContractinfo(empContractinfo);
} catch (Exception e) {
String message = "新增EmpContractinfo失败";
String message = "新增员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
} catch (Exception e) {
String message = "删除EmpContractinfo失败";
String message = "删除员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empContractinfo:delete')")
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);
}
@@ -77,7 +89,7 @@
try {
this.empContractinfoService.updateEmpContractinfo(empContractinfo);
} catch (Exception e) {
String message = "修改EmpContractinfo失败";
String message = "修改员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -22,13 +22,13 @@
* description:离职当月考勤控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:38
* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
@RequestMapping("empDimissionattend")
@RequestMapping("empDimissionAttend")
@RequiredArgsConstructor
public class EmpDimissionAttendController {

@@ -53,7 +53,7 @@
try {
this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
String message = "新增EmpDimissionattend失败";
String message = "新增离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
String message = "删除EmpDimissionattend失败";
String message = "删除离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empDimissionattend:delete')")
public void logicDeleteEmpDimissionattend(@PathVariable("ids") String ids) throws FebsException {
try {
this.empDimissionattendService.logicDelEmpDimissionattend(ids);
} catch (Exception e) {
String message = "逻辑删除离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
String message = "修改EmpDimissionattend失败";
String message = "修改离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -22,7 +22,7 @@
* description:员工社保申请控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:33
* @date 2021-01-31 11:26:23
* @since JDK1.8
*/
@Slf4j
@@ -53,7 +53,7 @@
try {
this.empInsuranceService.createEmpInsurance(empInsurance);
} catch (Exception e) {
String message = "新增EmpInsurance失败";
String message = "新增员工社保申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empInsuranceService.deleteEmpInsurance(empInsurance);
} catch (Exception e) {
String message = "删除EmpInsurance失败";
String message = "删除员工社保申请失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empInsurance:delete')")
public void logicDeleteEmpInsurance(@PathVariable("ids") String ids) throws FebsException {
try {
this.empInsuranceService.logicDelEmpInsurance(ids);
} catch (Exception e) {
String message = "逻辑删除员工社保申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empInsuranceService.updateEmpInsurance(empInsurance);
} catch (Exception e) {
String message = "修改EmpInsurance失败";
String message = "修改员工社保申请失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -22,13 +22,13 @@
* description:员工劳资案件控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:59
* @date 2021-01-31 11:26:36
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
@RequestMapping("empLabortrouble")
@RequestMapping("empLaborTrouble")
@RequiredArgsConstructor
public class EmpLaborTroubleController {

@@ -53,7 +53,7 @@
try {
this.empLabortroubleService.createEmpLabortrouble(empLabortrouble);
} catch (Exception e) {
String message = "新增EmpLabortrouble失败";
String message = "新增员工劳资案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empLabortroubleService.deleteEmpLabortrouble(empLabortrouble);
} catch (Exception e) {
String message = "删除EmpLabortrouble失败";
String message = "删除员工劳资案件失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empLabortrouble:delete')")
public void logicDeleteEmpLabortrouble(@PathVariable("ids") String ids) throws FebsException {
try {
this.empLabortroubleService.logicDelEmpLabortrouble(ids);
} catch (Exception e) {
String message = "逻辑删除员工劳资案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empLabortroubleService.updateEmpLabortrouble(empLabortrouble);
} catch (Exception e) {
String message = "修改EmpLabortrouble失败";
String message = "修改员工劳资案件失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -22,13 +22,13 @@
* description:员工请假记录控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:29
* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
@RequestMapping("empLeaveinfo")
@RequestMapping("empLeaveInfo")
@RequiredArgsConstructor
public class EmpLeaveInfoController {

@@ -53,7 +53,7 @@
try {
this.empLeaveinfoService.createEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
String message = "新增EmpLeaveinfo失败";
String message = "新增员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
String message = "删除EmpLeaveinfo失败";
String message = "删除员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
public void logicDeleteEmpLeaveinfo(@PathVariable("ids") String ids) throws FebsException {
try {
this.empLeaveinfoService.logicDelEmpLeaveinfo(ids);
} catch (Exception e) {
String message = "逻辑删除员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
String message = "修改EmpLeaveinfo失败";
String message = "修改员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -22,7 +22,7 @@
* description:员工工伤案件控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:24
* @date 2021-01-31 11:26:32
* @since JDK1.8
*/
@Slf4j
@@ -53,7 +53,7 @@
try {
this.empOccupationalService.createEmpOccupational(empOccupational);
} catch (Exception e) {
String message = "新增EmpOccupational失败";
String message = "新增员工工伤案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empOccupationalService.deleteEmpOccupational(empOccupational);
} catch (Exception e) {
String message = "删除EmpOccupational失败";
String message = "删除员工工伤案件失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empOccupational:delete')")
public void logicDeleteEmpOccupational(@PathVariable("ids") String ids) throws FebsException {
try {
this.empOccupationalService.logicDelEmpOccupational(ids);
} catch (Exception e) {
String message = "逻辑删除员工工伤案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empOccupationalService.updateEmpOccupational(empOccupational);
} catch (Exception e) {
String message = "修改EmpOccupational失败";
String message = "修改员工工伤案件失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -16,70 +16,81 @@
import java.util.Map;

/**
*
* name:EmpPhysicalexam
* package:cc.mrbird.febs.server.hr.controller
* description:员工体检信息控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:19
* @since JDK1.8
*/
 * name:EmpPhysicalexam
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工体检信息控制器
 *
 * @author luoyibo
 * @date 2021-01-31 09:11:00
 * @since JDK1.8
 */
@Slf4j
@Validated
@RestController
@RequestMapping("empPhysicalexam")
@RequestMapping("empPhysicalExam")
@RequiredArgsConstructor
public class EmpPhysicalExamController {

private final IEmpPhysicalExamService empPhysicalexamService;
    private final IEmpPhysicalExamService empPhysicalExamService;

@GetMapping
@PreAuthorize("hasAuthority('empPhysicalexam:list')")
public FebsResponse getAllEmpPhysicalexams(EmpPhysicalExam empPhysicalexam) {
return new FebsResponse().data(empPhysicalexamService.findEmpPhysicalexams(empPhysicalexam));
}
    @GetMapping
    @PreAuthorize("hasAuthority('empPhysicalexam:list')")
    public FebsResponse getAllEmpPhysicalExams(EmpPhysicalExam empPhysicalexam) {
        return new FebsResponse().data(empPhysicalExamService.findEmpPhysicalExams(empPhysicalexam));
    }

@GetMapping("list")
@PreAuthorize("hasAuthority('empPhysicalexam:list')")
public FebsResponse empPhysicalexamList(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empPhysicalexamService.findEmpPhysicalexams(request, empPhysicalexam));
return new FebsResponse().data(dataTable);
}
    @GetMapping("list")
    @PreAuthorize("hasAuthority('empPhysicalexam:list')")
    public FebsResponse empPhysicalExamList(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empPhysicalExamService.findEmpPhysicalExams(request, empPhysicalexam));
        return new FebsResponse().data(dataTable);
    }

@PostMapping
@PreAuthorize("hasAuthority('empPhysicalexam:add')")
public void addEmpPhysicalexam(@Valid EmpPhysicalExam empPhysicalexam) throws FebsException {
try {
this.empPhysicalexamService.createEmpPhysicalexam(empPhysicalexam);
} catch (Exception e) {
String message = "新增EmpPhysicalexam失败";
log.error(message, e);
throw new FebsException(message);
}
}
    @PostMapping
    @PreAuthorize("hasAuthority('empPhysicalexam:add')")
    public void addEmpPhysicalExam(@Valid EmpPhysicalExam empPhysicalexam) throws FebsException {
        try {
            this.empPhysicalExamService.createEmpPhysicalExam(empPhysicalexam);
        } catch (Exception e) {
            String message = "新增员工体检信息失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

@DeleteMapping
@PreAuthorize("hasAuthority('empPhysicalexam:delete')")
public void deleteEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) throws FebsException {
try {
this.empPhysicalexamService.deleteEmpPhysicalexam(empPhysicalexam);
} catch (Exception e) {
String message = "删除EmpPhysicalexam失败";
log.error(message, e);
throw new FebsException(message);
}
}
    @DeleteMapping
    @PreAuthorize("hasAuthority('empPhysicalexam:delete')")
    public void deleteEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) throws FebsException {
        try {
            this.empPhysicalExamService.deleteEmpPhysicalExam(empPhysicalexam);
        } catch (Exception e) {
            String message = "删除员工体检信息失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

@PutMapping
@PreAuthorize("hasAuthority('empPhysicalexam:update')")
public void updateEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) throws FebsException {
try {
this.empPhysicalexamService.updateEmpPhysicalexam(empPhysicalexam);
} catch (Exception e) {
String message = "修改EmpPhysicalexam失败";
log.error(message, e);
throw new FebsException(message);
}
}
    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empPhysicalexam:delete')")
    public void logicDeleteEmpPhysicalExam(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empPhysicalExamService.logicDelEmpPhysicalExam(ids);
        } catch (Exception e) {
            String message = "逻辑删除员工体检信息失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @PutMapping
    @PreAuthorize("hasAuthority('empPhysicalexam:update')")
    public void updateEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) throws FebsException {
        try {
            this.empPhysicalExamService.updateEmpPhysicalExam(empPhysicalexam);
        } catch (Exception e) {
            String message = "修改员工体检信息失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}

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

@@ -1,7 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.service.IEmpRemarkInfoService;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
@@ -22,7 +22,7 @@
* description:员工备注信息控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:15
* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
@Slf4j
@@ -32,7 +32,7 @@
@RequiredArgsConstructor
public class EmpRemarkInfoController {

private final IEmpRemarkInfoService empRemarkinfoService;
private final IEmpRemarkinfoService empRemarkinfoService;

@GetMapping
@PreAuthorize("hasAuthority('empRemarkinfo:list')")
@@ -53,7 +53,7 @@
try {
this.empRemarkinfoService.createEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
String message = "新增EmpRemarkinfo失败";
String message = "新增员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empRemarkinfoService.deleteEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
String message = "删除EmpRemarkinfo失败";
String message = "删除员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empRemarkinfo:delete')")
public void logicDeleteEmpRemarkinfo(@PathVariable("ids") String ids) throws FebsException {
try {
this.empRemarkinfoService.logicDelEmpRemarkinfo(ids);
} catch (Exception e) {
String message = "逻辑删除员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empRemarkinfoService.updateEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
String message = "修改EmpRemarkinfo失败";
String message = "修改员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}

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

@@ -22,7 +22,7 @@
* description:员工辞职申请控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:08
* @date 2021-01-31 11:26:18
* @since JDK1.8
*/
@Slf4j
@@ -53,7 +53,7 @@
try {
this.empResignService.createEmpResign(empResign);
} catch (Exception e) {
String message = "新增EmpResign失败";
String message = "新增员工辞职申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empResignService.deleteEmpResign(empResign);
} catch (Exception e) {
String message = "删除EmpResign失败";
String message = "删除员工辞职申请失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empResign:delete')")
public void logicDeleteEmpResign(@PathVariable("ids") String ids) throws FebsException {
try {
this.empResignService.logicDelEmpResign(ids);
} catch (Exception e) {
String message = "逻辑删除员工辞职申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empResignService.updateEmpResign(empResign);
} catch (Exception e) {
String message = "修改EmpResign失败";
String message = "修改员工辞职申请失败";
log.error(message, e);
throw new FebsException(message);
}

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

New file
@@ -0,0 +1,96 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
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 lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Map;

/**
 * name:EmpWorkexperience
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工作经历控制器
 *
 * @author luoyibo
 * @date 2021-01-28 12:33:31
 * @since JDK1.8
 */
@Slf4j
@Validated
@RestController
@RequestMapping("empWorkExperience")
@RequiredArgsConstructor
public class EmpWorkExperienceController {

    private final IEmpWorkExperienceService empWorkExperienceService;

    @GetMapping
    @PreAuthorize("hasAuthority('empWorkexperience:list')")
    public FebsResponse getAllEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
        return new FebsResponse().data(empWorkExperienceService.findEmpWorkExperiences(empWorkexperience));
    }

    @GetMapping("list")
    @PreAuthorize("hasAuthority('empWorkexperience:list')")
    public FebsResponse empWorkExperienceList(QueryRequest request, EmpWorkExperience empWorkexperience) {
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empWorkExperienceService.findEmpWorkExperiences(request, empWorkexperience));
        return new FebsResponse().data(dataTable);
    }

    @PostMapping
    @PreAuthorize("hasAuthority('empWorkexperience:add')")
    public void addEmpWorkExperience(@Valid EmpWorkExperience empWorkexperience) throws FebsException {
        try {
            this.empWorkExperienceService.createEmpWorkExperience(empWorkexperience);
        } catch (Exception e) {
            String message = "新增员工工作经历失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @DeleteMapping
    @PreAuthorize("hasAuthority('empWorkexperience:delete')")
    public void deleteEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
        try {
            this.empWorkExperienceService.deleteEmpWorkExperience(empWorkexperience);
        } catch (Exception e) {
            String message = "删除员工工作经历失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empWorkexperience:delete')")
    public void logicDeleteEmpWorkExperience(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empWorkExperienceService.logicDelEmpWorkExperience(ids);
        } catch (Exception e) {
            String message = "逻辑删除员工工作经历失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @PutMapping
    @PreAuthorize("hasAuthority('empWorkexperience:update')")
    public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
        try {
            this.empWorkExperienceService.updateEmpWorkExperience(empWorkexperience);
        } catch (Exception e) {
            String message = "修改员工工作经历失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java

@@ -1,179 +1,199 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
    import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.math.BigDecimal;

import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpAccidentcases
* package:cc.mrbird.febs.server.hr.controller
* description:员工意外险案件数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:36:10
* @since JDK1.8
*/
 * name:EmpAccidentcases
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工意外险案件数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:27
 * @since JDK1.8
 */
@Data
@TableName("t_emp_accidentcases")
public class EmpAccidentCases {
public class EmpAccidentCases implements Serializable {

        /**
        * 案件Id
        */
            @TableId(value = "accidentId", type = IdType.AUTO)
            private Long accidentId;
    private static final long serialVersionUID = 3423747469056866015L;
    @FieldInfo(name = "accidentId", type = "bigint", explain = "案件Id")
    @TableId(value = "accidentId")
    private Long accidentId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 
        */
            @TableField("injuredTime")
            private Date injuredTime;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 受伤地点
        */
            @TableField("injuredAddress")
            private String injuredAddress;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 受伤部位
        */
            @TableField("injuredPart")
            private String injuredPart;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 
        */
            @TableField("injuredDiacrisis")
            private String injuredDiacrisis;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 受伤经过描述
        */
            @TableField("injuredDescribe")
            private String injuredDescribe;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 就诊医院
        */
            @TableField("hospitalName")
            private String hospitalName;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 就诊科室
        */
            @TableField("treatmentName")
            private String treatmentName;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 是否住院
        */
            @TableField("hospitalizatioFlag")
            private Integer hospitalizatioFlag;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 床号
        */
            @TableField("bedNumb")
            private Byte bedNumb;
    @FieldInfo(name = "injuredTime", type = "datetime", explain = "")
    @TableField("injuredTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date injuredTime;

        /**
        * 报案时间
        */
            @TableField("reprotTime")
            private Date reprotTime;
    @FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
    @TableField("injuredAddress")
    private String injuredAddress = "";

        /**
        * 
        */
            @TableField("submitTime")
            private Date submitTime;
    @FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
    @TableField("injuredPart")
    private String injuredPart = "";

        /**
        * 递交人
        */
            @TableField("sbumitBy")
            private String sbumitBy;
    @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
    @TableField("injuredDiacrisis")
    private String injuredDiacrisis = "";

        /**
        * 医疗总费用
        */
            @TableField("expensesFee")
            private BigDecimal expensesFee;
        /**
        * 报单号
        */
            @TableField("expenseReport")
            private String expenseReport;
    @FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
    @TableField("injuredDescribe")
    private String injuredDescribe = "";

        /**
        * 
        */
            @TableField("innsureFee")
            private BigDecimal innsureFee;
        /**
        * 人事处理时间
        */
            @TableField("hrDoDate")
            private Date hrDoDate;
    @FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
    @TableField("hospitalName")
    private String hospitalName = "";

        /**
        * 案结日期
        */
            @TableField("settleDate")
            private Date settleDate;
    @FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
    @TableField("treatmentName")
    private String treatmentName = "";

        /**
        * 结案状态 0-未结案 1-已结案
        */
            @TableField("settleStatus")
            private Integer settleStatus;
    @FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
    @TableField("hospitalizatioFlag")
    private Integer hospitalizatioFlag = 0;

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
    @TableField("bedNumb")
    private Integer bedNumb = 0;

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
    @TableField("reprotTime")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date reprotTime;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "submitTime", type = "datetime", explain = "")
    @TableField("submitTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date submitTime;

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
    @TableField("sbumitBy")
    private String sbumitBy = "";

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
    @TableField("expensesFee")
    private BigDecimal expensesFee = BigDecimal.ZERO;

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
    @TableField("expenseReport")
    private String expenseReport = "";

    @FieldInfo(name = "innsureFee", type = "decimal", explain = "")
    @TableField("innsureFee")
    private BigDecimal innsureFee = BigDecimal.ZERO;

    @FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
    @TableField("hrDoDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date hrDoDate;

    @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
    @TableField("settleDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date settleDate;

    @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
    @TableField("settleStatus")
    private Integer settleStatus = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java

@@ -1,22 +1,21 @@
package cc.mrbird.febs.server.hr.entity;

import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * name:EmpBadrecord
@@ -24,38 +23,53 @@
 * description:员工不良记录信息数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @date 2021-01-31 11:26:42
 * @since JDK1.8
 */
@Data
@TableName("t_emp_badRecord")
@TableName("t_emp_badrecord")
public class EmpBadRecord implements Serializable {

    private static final long serialVersionUID = 4876027855128737152L;

    private static final long serialVersionUID = 3681849796837950530L;
    @FieldInfo(name = "badId", type = "bigint", explain = "不良记录Id")
    @TableId(value = "badId")
    private Long badId;
    private Long badId = 0L;

    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId;
    private Long empId = 0L;

    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName;
    private String empName = "";

    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb;
    private String empNumb = "";

    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb;
    private String certificateNumb = "";

    @FieldInfo(name = "department", type = "varchar", explain = "所属部门")
    @TableField("department")
    private String department;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

    @FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
    @TableField("badDate")
@@ -66,11 +80,11 @@

    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
    @TableField("reporter")
    private String reporter;
    private String reporter = "";

    @FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
    @TableField("badContent")
    private String badContent;
    private String badContent = "";

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
@@ -81,7 +95,7 @@

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator;
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
@@ -92,18 +106,19 @@

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier;
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag;
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version;
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark;
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java

New file
@@ -0,0 +1,233 @@
package cc.mrbird.febs.server.hr.entity;

import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * name:EmpBaseinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-30 08:04:50
 * @since JDK1.8
 */
@Data
@TableName("t_emp_baseInfo")
public class EmpBaseInfo implements Serializable {

    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableId(value = "empId")
    private Long empId = 0L;

    @FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
    @TableField("customerId")
    private Long customerId = 0L;

    @FieldInfo(name = "archivesNumb", type = "varchar", explain = "档案号")
    @TableField("archivesNumb")
    private String archivesNumb = "";

    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

    @FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
    @TableField("sex")
    private String sex = "";

    @FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
    @TableField("jobId")
    private Long jobId = 0L;

    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

    @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类另字典表")
    @TableField("empType")
    private String empType = "";

    @FieldInfo(name = "certificateType", type = "varchar", explain = "证件类型,人员证件类型，国标代码")
    @TableField("certificateType")
    private String certificateType = "";

    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

    @FieldInfo(name = "nation", type = "varchar", explain = "民族")
    @TableField("nation")
    private String nation = "";

    @FieldInfo(name = "certificateValidity", type = "date", explain = "证件有效期")
    @TableField("certificateValidity")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date certificateValidity;

    @FieldInfo(name = "marriage", type = "varchar", explain = "婚姻状况")
    @TableField("marriage")
    private String marriage = "";

    @FieldInfo(name = "age", type = "tinyint", explain = "年龄")
    @TableField("age")
    private Integer age = 0;

    @FieldInfo(name = "stature", type = "smallint", explain = "身高")
    @TableField("stature")
    private Integer stature = 0;

    @FieldInfo(name = "birthdate", type = "date", explain = "出生日期")
    @TableField("birthdate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date birthdate;

    @FieldInfo(name = "politics", type = "varchar", explain = "政治面貌")
    @TableField("politics")
    private String politics = "";

    @FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
    @TableField("entryDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date entryDate;

    @FieldInfo(name = "education", type = "varchar", explain = "最高学历")
    @TableField("education")
    private String education = "";

    @FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
    @TableField("seniority")
    private Integer seniority = 0;

    @FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
    @TableField("nativePlace")
    private String nativePlace = "";

    @FieldInfo(name = "censusAddress", type = "varchar", explain = "户籍地址")
    @TableField("censusAddress")
    private String censusAddress = "";

    @FieldInfo(name = "currentAddress", type = "varchar", explain = "现住址")
    @TableField("currentAddress")
    private String currentAddress = "";

    @FieldInfo(name = "guardNumb", type = "varchar", explain = "保安员证号")
    @TableField("guardNumb")
    private String guardNumb = "";

    @FieldInfo(name = "telePhone", type = "varchar", explain = "电话号码")
    @TableField("telePhone")
    private String telePhone = "";

    @FieldInfo(name = "returnReceipt", type = "varchar", explain = "保安员回执")
    @TableField("returnReceipt")
    private String returnReceipt = "";

    @FieldInfo(name = "introducer", type = "varchar", explain = "招聘介绍人")
    @TableField("introducer")
    private String introducer = "";

    @FieldInfo(name = "archivesStatus", type = "varchar", explain = "档案情况")
    @TableField("archivesStatus")
    private String archivesStatus = "";

    @FieldInfo(name = "bankName", type = "varchar", explain = "银行名称")
    @TableField("bankName")
    private String bankName = "";

    @FieldInfo(name = "bankNumb", type = "varchar", explain = "银行账号")
    @TableField("bankNumb")
    private String bankNumb = "";

    @FieldInfo(name = "InsuranceType", type = "varchar", explain = "保险类型")
    @TableField("InsuranceType")
    private String insuranceType = "";

    @FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
    @TableField("socialNumb")
    private String socialNumb = "";

    @FieldInfo(name = "family", type = "varchar", explain = "家庭成员及关系")
    @TableField("family")
    private String family = "";

    @FieldInfo(name = "handbookStatus", type = "varchar", explain = "员工手册")
    @TableField("handbookStatus")
    private String handbookStatus = "";

    @FieldInfo(name = "urgencyPhone", type = "varchar", explain = "紧急联系电话")
    @TableField("urgencyPhone")
    private String urgencyPhone = "";

    @FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证")
    @TableField("empCardStatus")
    private String empCardStatus = "";

    @FieldInfo(name = "certificateList", type = "varchar", explain = "相关证件")
    @TableField("certificateList")
    private String certificateList = "";

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java

@@ -1,114 +1,142 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpContractinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工合同信息数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:42
* @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
 */
@Data
@TableName("t_emp_contractinfo")
public class EmpContractInfo {
public class EmpContractInfo implements Serializable {

        /**
        * 合同Id
        */
            @TableId(value = "contractId", type = IdType.AUTO)
            private Long contractId;
    private static final long serialVersionUID = 4152214737054224645L;
    @FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
    @TableId(value = "contractId")
    private Long contractId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 开始日期
        */
            @TableField("beginDate")
            private Date beginDate;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 结束日期
        */
            @TableField("endDate")
            private Date endDate;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 合同状态
        */
            @TableField("contractStatus")
            private String contractStatus;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 合同期限(年)
        */
            @TableField("contractPeiod")
            private Byte contractPeiod;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 合同办理人
        */
            @TableField("transactor")
            private String transactor;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 合同签订日期
        */
            @TableField("signingDate")
            private Date signingDate;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
    @TableField("beginDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date beginDate;

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
    @TableField("endDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date endDate;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
    @TableField("contractStatus")
    private String contractStatus = "";

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
    @TableField("contractPeriod")
    private Integer contractPeriod = 0;

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
    @TableField("transactor")
    private String transactor = "";

    @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
    @TableField("signingDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date signingDate;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java

@@ -1,110 +1,136 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
    import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.math.BigDecimal;

import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpDimissionattend
* package:cc.mrbird.febs.server.hr.controller
* description:离职当月考勤数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:38
* @since JDK1.8
*/
 * name:EmpDimissionattend
 * package:cc.mrbird.febs.server.hr.controller
 * description:离职当月考勤数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:04
 * @since JDK1.8
 */
@Data
@TableName("t_emp_dimissionattend")
public class EmpDimissionAttend {
public class EmpDimissionAttend implements Serializable {

        /**
        * 离职当月考勤Id
        */
            @TableId(value = "dimissionAttendId", type = IdType.AUTO)
            private Long dimissionAttendId;
    private static final long serialVersionUID = 6080263775807562989L;
    @FieldInfo(name = "dimissionAttendId", type = "bigint", explain = "离职当月考勤Id")
    @TableId(value = "dimissionAttendId")
    private Long dimissionAttendId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 离职考勤月份
        */
            @TableField("attendMonth")
            private Byte attendMonth;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 加班小时
        */
            @TableField("overtimeHour")
            private BigDecimal overtimeHour;
        /**
        * 加班（天）
        */
            @TableField("overtimeDay")
            private BigDecimal overtimeDay;
        /**
        * 请假（天）
        */
            @TableField("leaveDay")
            private BigDecimal leaveDay;
        /**
        * 有无代扣款项
        */
            @TableField("deduct")
            private BigDecimal deduct;
        /**
        * 旷工（天）
        */
            @TableField("absenteeism")
            private BigDecimal absenteeism;
        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

    @FieldInfo(name = "attendMonth", type = "tinyint", explain = "离职考勤月份")
    @TableField("attendMonth")
    private Integer attendMonth = 0;

    @FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
    @TableField("overtimeHour")
    private BigDecimal overtimeHour = BigDecimal.ZERO;

    @FieldInfo(name = "overtimeDay", type = "decimal", explain = "加班（天）")
    @TableField("overtimeDay")
    private BigDecimal overtimeDay = BigDecimal.ZERO;

    @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
    @TableField("leaveDay")
    private BigDecimal leaveDay = BigDecimal.ZERO;

    @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
    @TableField("deduct")
    private BigDecimal deduct = BigDecimal.ZERO;

    @FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
    @TableField("absenteeism")
    private BigDecimal absenteeism = BigDecimal.ZERO;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java

@@ -1,114 +1,136 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpInsurance
* package:cc.mrbird.febs.server.hr.controller
* description:员工社保申请数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:33
* @since JDK1.8
*/
 * name:EmpInsurance
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工社保申请数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:23
 * @since JDK1.8
 */
@Data
@TableName("t_emp_insurance")
public class EmpInsurance {
public class EmpInsurance implements Serializable {

        /**
        * 社保Id
        */
            @TableId(value = "insuranceId", type = IdType.AUTO)
            private Long insuranceId;
    private static final long serialVersionUID = 208703298339870887L;
    @FieldInfo(name = "insuranceId", type = "bigint", explain = "社保Id")
    @TableId(value = "insuranceId")
    private Long insuranceId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 申请日期
        */
            @TableField("applayDate")
            private Date applayDate;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 申请人
        */
            @TableField("proposer")
            private String proposer;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 社保档位
        */
            @TableField("insuranceGaers")
            private String insuranceGaers;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 是否已报告 0-未报告 1-已报告
        */
            @TableField("reportStatus")
            private Integer reportStatus;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 申请状态 0-未申请 1-已申请
        */
            @TableField("applayStatus")
            private Integer applayStatus;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 审核人
        */
            @TableField("auditor")
            private String auditor;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
    @TableField("applayDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date applayDate;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
    @TableField("proposer")
    private String proposer = "";

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
    @TableField("insuranceGaers")
    private String insuranceGaers = "";

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告 0-未报告 1-已报告")
    @TableField("reportStatus")
    private Integer reportStatus = 0;

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
    @TableField("applayStatus")
    private Integer applayStatus = 0;

    @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
    @TableField("auditor")
    private String auditor = "";

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java

@@ -1,120 +1,146 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
    import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.math.BigDecimal;

import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpLabortrouble
* package:cc.mrbird.febs.server.hr.controller
* description:员工劳资案件数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:59
* @since JDK1.8
*/
 * name:EmpLabortrouble
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工劳资案件数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:36
 * @since JDK1.8
 */
@Data
@TableName("t_emp_labortrouble")
public class EmpLaborTrouble {
public class EmpLaborTrouble implements Serializable {

        /**
        * 仲裁Id
        */
            @TableId(value = "arbitrationId", type = IdType.AUTO)
            private String arbitrationId;
    private static final long serialVersionUID = -7587978188799851715L;
    @FieldInfo(name = "arbitrationId", type = "bigint", explain = "仲裁Id")
    @TableId(value = "arbitrationId")
    private Long arbitrationId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 仲裁日期
        */
            @TableField("arbitrationDate")
            private Date arbitrationDate;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 仲裁类型
        */
            @TableField("arbitrationType")
            private String arbitrationType;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 仲裁事由
        */
            @TableField("arbitrationReason")
            private String arbitrationReason;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 报备人
        */
            @TableField("reporter")
            private String reporter;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 仲裁赔付（元）
        */
            @TableField("arbitrationPay")
            private BigDecimal arbitrationPay;
        /**
        * 仲裁状态
        */
            @TableField("arbitrationStatus")
            private Integer arbitrationStatus;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 案结日期
        */
            @TableField("settleDate")
            private Date settleDate;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
    @TableField("arbitrationDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date arbitrationDate;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "arbitrationType", type = "varchar", explain = "仲裁类型")
    @TableField("arbitrationType")
    private String arbitrationType = "";

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
    @TableField("arbitrationReason")
    private String arbitrationReason = "";

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
    @TableField("reporter")
    private String reporter = "";

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付（元）")
    @TableField("arbitrationPay")
    private BigDecimal arbitrationPay = BigDecimal.ZERO;

    @FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
    @TableField("arbitrationStatus")
    private Integer arbitrationStatus = 0;

    @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
    @TableField("settleDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date settleDate;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java

@@ -1,114 +1,145 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
    import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.math.BigDecimal;

import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpLeaveinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工请假记录数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:29
* @since JDK1.8
*/
 * name:EmpLeaveinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工请假记录数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:13
 * @since JDK1.8
 */
@Data
@TableName("t_emp_leaveinfo")
public class EmpLeaveInfo {
public class EmpLeaveInfo implements Serializable {

        /**
        * 请假申请Id
        */
            @TableId(value = "leaveId", type = IdType.AUTO)
            private Long leaveId;
    private static final long serialVersionUID = -906183894054123470L;
    @FieldInfo(name = "leaveId", type = "bigint", explain = "请假申请Id")
    @TableId(value = "leaveId")
    private Long leaveId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 开始时间
        */
            @TableField("beginTime")
            private Date beginTime;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 结束时间
        */
            @TableField("endTime")
            private Date endTime;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 请假类型
        */
            @TableField("leaveType")
            private String leaveType;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 请假天数
        */
            @TableField("leaveDay")
            private BigDecimal leaveDay;
        /**
        * 报备人
        */
            @TableField("reporter")
            private String reporter;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 到岗时间
        */
            @TableField("returnDate")
            private Date returnDate;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "beginTime", type = "datetime", explain = "开始时间")
    @TableField("beginTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date beginTime;

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "endTime", type = "datetime", explain = "结束时间")
    @TableField("endTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
    @TableField("leaveType")
    private String leaveType = "";

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
    @TableField("leaveDay")
    private BigDecimal leaveDay = BigDecimal.ZERO;

    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
    @TableField("reporter")
    private String reporter = "";

    @FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
    @TableField("returnDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date returnDate;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java

@@ -1,228 +1,232 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
    import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.math.BigDecimal;

import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpOccupational
* package:cc.mrbird.febs.server.hr.controller
* description:员工工伤案件数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:24
* @since JDK1.8
*/
 * name:EmpOccupational
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工伤案件数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:32
 * @since JDK1.8
 */
@Data
@TableName("t_emp_occupational")
public class EmpOccupational {
public class EmpOccupational implements Serializable {

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    private static final long serialVersionUID = 5704201515491620531L;
    @FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
    @TableField("occupationalId")
    private Long occupationalId = 0L;

        /**
        * 案件Id
        */
            @TableField("occupationalId")
            private Long occupationalId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 
        */
            @TableField("injuredTime")
            private Date injuredTime;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 受伤地点
        */
            @TableField("injuredAddress")
            private String injuredAddress;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 受伤部位
        */
            @TableField("injuredPart")
            private String injuredPart;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 
        */
            @TableField("injuredDiacrisis")
            private String injuredDiacrisis;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 受伤经过描述
        */
            @TableField("injuredDescribe")
            private String injuredDescribe;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 就诊医院
        */
            @TableField("hospitalName")
            private String hospitalName;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 就诊科室
        */
            @TableField("treatmentName")
            private String treatmentName;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 是否住院
        */
            @TableField("hospitalizatioFlag")
            private Integer hospitalizatioFlag;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 床号
        */
            @TableField("bedNumb")
            private Byte bedNumb;
    @FieldInfo(name = "injuredTime", type = "datetime", explain = "")
    @TableField("injuredTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date injuredTime;

        /**
        * 报案时间
        */
            @TableField("reprotTime")
            private Date reprotTime;
    @FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
    @TableField("injuredAddress")
    private String injuredAddress = "";

        /**
        * 
        */
            @TableField("submitTime")
            private Date submitTime;
    @FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
    @TableField("injuredPart")
    private String injuredPart = "";

        /**
        * 递交人
        */
            @TableField("sbumitBy")
            private String sbumitBy;
    @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
    @TableField("injuredDiacrisis")
    private String injuredDiacrisis = "";

        /**
        * 人事处理时间
        */
            @TableField("hrDoDate")
            private Date hrDoDate;
    @FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
    @TableField("injuredDescribe")
    private String injuredDescribe = "";

        /**
        * 医疗总费用
        */
            @TableField("expensesFee")
            private BigDecimal expensesFee;
        /**
        * 剔除总额
        */
            @TableField("eliminate")
            private BigDecimal eliminate;
        /**
        * 一次性伤残补助金
        */
            @TableField("socialDisability")
            private BigDecimal socialDisability;
        /**
        * 住院伙食补贴
        */
            @TableField("socialAllowance")
            private BigDecimal socialAllowance;
        /**
        * 一次性医疗补助金
        */
            @TableField("socialSubsidy")
            private BigDecimal socialSubsidy;
        /**
        * 社保赔偿总费用
        */
            @TableField("socialCompensation")
            private BigDecimal socialCompensation;
        /**
        * 已赔付医药费用
        */
            @TableField("compensated")
            private BigDecimal compensated;
        /**
        * 其他赔偿报销
        */
            @TableField("otherCompensated")
            private BigDecimal otherCompensated;
        /**
        * 
        */
            @TableField("companylDisability")
            private BigDecimal companylDisability;
        /**
        * 工伤生活补贴
        */
            @TableField("companyAllowance")
            private BigDecimal companyAllowance;
        /**
        * 公司一次性医疗补助金
        */
            @TableField("companySubsidy")
            private BigDecimal companySubsidy;
        /**
        * 公司赔偿总费用
        */
            @TableField("companyCompensation")
            private BigDecimal companyCompensation;
        /**
        * 公司一次性就业补助金
        */
            @TableField("jobSubsidy")
            private BigDecimal jobSubsidy;
        /**
        * 结案状态 0-未结案 1-已结案
        */
            @TableField("settleStatus")
            private Integer settleStatus;
    @FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
    @TableField("hospitalName")
    private String hospitalName = "";

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
    @TableField("treatmentName")
    private String treatmentName = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
    @TableField("hospitalizatioFlag")
    private Integer hospitalizatioFlag = 0;

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
    @TableField("bedNumb")
    private Integer bedNumb = 0;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
    @TableField("reprotTime")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date reprotTime;

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "submitTime", type = "datetime", explain = "")
    @TableField("submitTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date submitTime;

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
    @TableField("sbumitBy")
    private String sbumitBy = "";

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
    @TableField("hrDoDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date hrDoDate;

    @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
    @TableField("expensesFee")
    private BigDecimal expensesFee = BigDecimal.ZERO;

    @FieldInfo(name = "eliminate", type = "decimal", explain = "剔除总额")
    @TableField("eliminate")
    private BigDecimal eliminate = BigDecimal.ZERO;

    @FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
    @TableField("socialDisability")
    private BigDecimal socialDisability = BigDecimal.ZERO;

    @FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
    @TableField("socialAllowance")
    private BigDecimal socialAllowance = BigDecimal.ZERO;

    @FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
    @TableField("socialSubsidy")
    private BigDecimal socialSubsidy = BigDecimal.ZERO;

    @FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
    @TableField("socialCompensation")
    private BigDecimal socialCompensation = BigDecimal.ZERO;

    @FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
    @TableField("compensated")
    private BigDecimal compensated = BigDecimal.ZERO;

    @FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
    @TableField("otherCompensated")
    private BigDecimal otherCompensated = BigDecimal.ZERO;

    @FieldInfo(name = "companylDisability", type = "decimal", explain = "")
    @TableField("companylDisability")
    private BigDecimal companylDisability = BigDecimal.ZERO;

    @FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
    @TableField("companyAllowance")
    private BigDecimal companyAllowance = BigDecimal.ZERO;

    @FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
    @TableField("companySubsidy")
    private BigDecimal companySubsidy = BigDecimal.ZERO;

    @FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
    @TableField("companyCompensation")
    private BigDecimal companyCompensation = BigDecimal.ZERO;

    @FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
    @TableField("jobSubsidy")
    private BigDecimal jobSubsidy = BigDecimal.ZERO;

    @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
    @TableField("settleStatus")
    private Integer settleStatus = 0;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java

@@ -1,120 +1,143 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
import java.io.Serializable;
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpPhysicalexam
* name:EmpPhysicalExam
* package:cc.mrbird.febs.server.hr.controller
* description:员工体检信息数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:19
* @date 2021-01-31 09:11:00
* @since JDK1.8
*/
@Data
@TableName("t_emp_physicalexam")
public class EmpPhysicalExam {
public class EmpPhysicalExam implements Serializable{

        /**
        * 体检Id
        */
            @TableId(value = "physicalExamId", type = IdType.AUTO)
            private Long physicalExamId;
            @FieldInfo(name = "physicalExamId",type = "bigint",explain = "体检Id")
            @TableId(value = "physicalExamId")
            private Long physicalExamId=0L;

        /**
        * 员工Id
        */
            @FieldInfo(name = "empId",type = "bigint",explain = "员工Id")
            @TableField("empId")
            private Long empId;
            private Long empId=0L;

        /**
        * 体检医院
        */
            @TableField("hosptial")
            private String hosptial;
            @FieldInfo(name = "empNumb",type = "varchar",explain = "员工编号")
            @TableField("empNumb")
            private String empNumb="";

        /**
        * 体检日期
        */
            @FieldInfo(name = "empName",type = "varchar",explain = "员工姓名")
            @TableField("empName")
            private String empName="";

            @FieldInfo(name = "certificateNumb",type = "varchar",explain = "证件号码")
            @TableField("certificateNumb")
            private String certificateNumb="";

            @FieldInfo(name = "sex",type = "varchar",explain = "性别码")
            @TableField("sex")
            private String sex="";

            @FieldInfo(name = "deptId",type = "bigint",explain = "部门Id")
            @TableField("deptId")
            private Long deptId=0L;

            @FieldInfo(name = "deptName",type = "varchar",explain = "部门名称")
            @TableField("deptName")
            private String deptName="";

            @FieldInfo(name = "JobId",type = "bigint",explain = "岗位Id")
            @TableField("JobId")
            private Long jobId=0L;

            @FieldInfo(name = "jobName",type = "varchar",explain = "岗位名称")
            @TableField("jobName")
            private String jobName="";

            @FieldInfo(name = "hospital",type = "varchar",explain = "体检医院")
            @TableField("hospital")
            private String hospital="";

            @FieldInfo(name = "physicalExamDate",type = "date",explain = "体检日期")
            @TableField("physicalExamDate")
            @JsonSerialize(using = DateSerializer.class)
            @JsonDeserialize(using = DateDeSerializer.class)
            @DateTimeFormat(pattern="yyyy-MM-dd")
            private Date physicalExamDate;

        /**
        * 体检类型
        */
            @FieldInfo(name = "physicalExamType",type = "varchar",explain = "体检类型")
            @TableField("physicalExamType")
            private String physicalExamType;
            private String physicalExamType="";

        /**
        * 血压
        */
            @FieldInfo(name = "bloodPressure",type = "varchar",explain = "血压")
            @TableField("bloodPressure")
            private String bloodPressure;
            private String bloodPressure="";

        /**
        * 转氨酶
        */
            @FieldInfo(name = "transaminase",type = "varchar",explain = "转氨酶")
            @TableField("transaminase")
            private String transaminase;
            private String transaminase="";

        /**
        * 心电图
        */
            @FieldInfo(name = "ecg",type = "varchar",explain = "心电图")
            @TableField("ecg")
            private String ecg;
            private String ecg="";

        /**
        * 体检结论
        */
            @FieldInfo(name = "conclusion",type = "varchar",explain = "体检结论")
            @TableField("conclusion")
            private String conclusion;
            private String conclusion="";

        /**
        * 复查记录
        */
            @FieldInfo(name = "reviewRecord",type = "varchar",explain = "复查记录")
            @TableField("reviewRecord")
            private String reviewRecord;
            private String reviewRecord="";

        /**
        * 备注
        */
            @FieldInfo(name = "remark",type = "varchar",explain = "备注")
            @TableField("remark")
            private String remark;
            private String remark="";

        /**
        * 记录创建人
        */
            @FieldInfo(name = "createTime",type = "datetime",explain = "记录创建时间")
            @TableField("createTime")
            @JsonSerialize(using = DateTimeSerializer.class)
            @JsonDeserialize(using = DateTimeDeserializer.class)
            @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
            private Date createTime;

            @FieldInfo(name = "creator",type = "varchar",explain = "记录创建人")
            @TableField("creator")
            private String creator;
            private String creator="";

        /**
        * 记录最后更新时间
        */
            @FieldInfo(name = "modifyTime",type = "datetime",explain = "记录最后更新时间")
            @TableField("modifyTime")
            @JsonSerialize(using = DateTimeSerializer.class)
            @JsonDeserialize(using = DateTimeDeserializer.class)
            @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
            private Date modifyTime;

        /**
        * 记录最后更新人
        */
            @FieldInfo(name = "modifier",type = "varchar",explain = "记录最后更新人")
            @TableField("modifier")
            private String modifier;
            private String modifier="";

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @FieldInfo(name = "delFlag",type = "bit",explain = "记录删除标志。0-未删除 1-已删除，默认0")
            @TableField("delFlag")
            private Integer delFlag;
            private Integer delFlag=0;

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @FieldInfo(name = "version",type = "int",explain = "记录版本号，用来进行乐观锁控制")
            @TableField("version")
            private Integer version;
            @Version
            private Integer version=0;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java

@@ -1,84 +1,116 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpRemarkinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工备注信息数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:15
* @since JDK1.8
*/
 * name:EmpRemarkinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工备注信息数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:48
 * @since JDK1.8
 */
@Data
@TableName("t_emp_remarkinfo")
public class EmpRemarkInfo {
public class EmpRemarkInfo implements Serializable {

        /**
        * 备注Id
        */
            @TableId(value = "remarkId", type = IdType.AUTO)
            private Long remarkId;
    private static final long serialVersionUID = 3084540653935731579L;
    @FieldInfo(name = "remarkId", type = "bigint", explain = "备注Id")
    @TableId(value = "remarkId")
    private Long remarkId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 备注内容
        */
            @TableField("remarkContent")
            private String remarkContent;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 备注日期
        */
            @TableField("remarkDate")
            private Date remarkDate;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

    @FieldInfo(name = "remarkContent", type = "varchar", explain = "备注内容")
    @TableField("remarkContent")
    private String remarkContent = "";

    @FieldInfo(name = "remarkDate", type = "date", explain = "备注日期")
    @TableField("remarkDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date remarkDate;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java

@@ -1,96 +1,124 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpResign
* package:cc.mrbird.febs.server.hr.controller
* description:员工辞职申请数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:08
* @since JDK1.8
*/
 * name:EmpResign
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工辞职申请数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:18
 * @since JDK1.8
 */
@Data
@TableName("t_emp_resign")
public class EmpResign {
public class EmpResign implements Serializable {

        /**
        * 辞职Id
        */
            @TableId(value = "resignId", type = IdType.AUTO)
            private Long resignId;
    private static final long serialVersionUID = -4692256235815402125L;
    @FieldInfo(name = "resignId", type = "bigint", explain = "辞职Id")
    @TableId(value = "resignId")
    private Long resignId = 0L;

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 申请日期
        */
            @TableField("applayDate")
            private Date applayDate;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb = "";

        /**
        * 报备人
        */
            @TableField("reporter")
            private String reporter;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";

        /**
        * 事由
        */
            @TableField("reason")
            private String reason;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    private String sex = "";

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
    @TableField("applayDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date applayDate;

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
    @TableField("reporter")
    private String reporter = "";

    @FieldInfo(name = "reason", type = "varchar", explain = "事由")
    @TableField("reason")
    private String reason = "";

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java

New file
@@ -0,0 +1,126 @@
package cc.mrbird.febs.server.hr.entity;

import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * name:EmpWorkexperience
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工作经历数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-28 12:33:31
 * @since JDK1.8
 */
@Data
@TableName("t_emp_workExperience")
public class EmpWorkExperience implements Serializable {

    @FieldInfo(name = "workExperienceId", type = "bigint", explain = "工作经历Id")
    @TableId(value = "workExperienceId")
    private Long workExperienceId;

    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId;

    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb;

    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName;

    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb;

    @FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
    @TableField("sex")
    private String sex;

    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    private String deptName = "";

    @FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
    @TableField("jobId")
    private Long jobId = 0L;

    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    private String jobName = "";

    @FieldInfo(name = "workUnit", type = "varchar", explain = "工作单位")
    @TableField("workUnit")
    private String workUnit;

    @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
    @TableField("beginDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date beginDate;

    @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
    @TableField("endDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date endDate;

    @FieldInfo(name = "jobContent", type = "varchar", explain = "主要工作内容")
    @TableField("jobContent")
    private String jobContent;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator;

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier;

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工意外险案件实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:36:10
* @date 2021-01-31 11:26:27
* @since JDK1.8
*/
public interface EmpAccidentCasesMapper extends BaseMapper<EmpAccidentCases> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:27
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_accidentcases SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE accidentId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId}\n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java

@@ -8,34 +8,35 @@
import java.util.List;

/**
 * name:EmpBadrecord
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工不良记录信息实体Mapper
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @since JDK1.8
 */
*
* name:EmpBadrecord
* package:cc.mrbird.febs.server.hr.controller
* description:员工不良记录信息实体Mapper
*
* @author luoyibo
* @date 2021-01-31 11:26:42
* @since JDK1.8
*/
public interface EmpBadRecordMapper extends BaseMapper<EmpBadRecord> {
    /**
     *
     * 根据Id批量逻辑删除记录
     *
     * date 2021-01-28 10:32
     * @author: luoyibo
     * @param list 待删除Id
     * @param operatorId 操作员Id
     * @return void
     */
    @Update("<script>        " +
            " UPDATE t_emp_badRecord SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE badId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId}\n" +
            "        </foreach>\n" +
            "</script>")
    void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:42
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_badrecord SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE badId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java

New file
@@ -0,0 +1,42 @@
package cc.mrbird.febs.server.hr.mapper;

import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
* name:EmpBaseinfo
* package:cc.mrbird.febs.server.hr.controller
* description:实体Mapper
*
* @author luoyibo
* @date 2021-01-30 08:04:50
* @since JDK1.8
*/
public interface EmpBaseInfoMapper extends BaseMapper<EmpBaseInfo> {
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-30 08:04:50
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_baseinfo SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE badId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "          #{delId}  \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.EmpBaseInfoMapper">

</mapper>

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工合同信息实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:42
* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
public interface EmpContractInfoMapper extends BaseMapper<EmpContractInfo> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:28:23
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_contractinfo SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE contractId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:离职当月考勤实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:38
* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
public interface EmpDimissionAttendMapper extends BaseMapper<EmpDimissionAttend> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:04
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_dimissionattend SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE dimissionAttendId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "           #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工社保申请实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:33
* @date 2021-01-31 11:26:23
* @since JDK1.8
*/
public interface EmpInsuranceMapper extends BaseMapper<EmpInsurance> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:23
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_insurance SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE insuranceId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "           #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工劳资案件实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:59
* @date 2021-01-31 11:26:36
* @since JDK1.8
*/
public interface EmpLaborTroubleMapper extends BaseMapper<EmpLaborTrouble> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:36
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_labortrouble SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE arbitrationId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工请假记录实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:29
* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
public interface EmpLeaveInfoMapper extends BaseMapper<EmpLeaveInfo> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:13
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_leaveinfo SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE leaveId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工工伤案件实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:24
* @date 2021-01-31 11:26:32
* @since JDK1.8
*/
public interface EmpOccupationalMapper extends BaseMapper<EmpOccupational> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:32
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_occupational SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE occupationalId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "           #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java

@@ -2,17 +2,40 @@

import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
* name:EmpPhysicalexam
* package:cc.mrbird.febs.server.hr.controller
* description:员工体检信息实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:19
* @since JDK1.8
*/
 * name:EmpPhysicalexam
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工体检信息实体Mapper
 *
 * @author luoyibo
 * @date 2021-01-31 09:11:00
 * @since JDK1.8
 */
public interface EmpPhysicalExamMapper extends BaseMapper<EmpPhysicalExam> {

}
    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date luoyibo
     *
     * @param list       待删除Id
     * @param operatorId 操作员Id
     * @return void
     * @author: 2021-01-31 09:11:00
     */
    @Update("<script> " +
            " UPDATE t_emp_physicalexam SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE physicalExamId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工备注信息实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:15
* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
public interface EmpRemarkInfoMapper extends BaseMapper<EmpRemarkInfo> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:48
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_remarkinfo SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE remarkId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpResign;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,29 @@
* description:员工辞职申请实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:08
* @date 2021-01-31 11:26:18
* @since JDK1.8
*/
public interface EmpResignMapper extends BaseMapper<EmpResign> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:26:18
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_resign SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE resignId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java

New file
@@ -0,0 +1,41 @@
package cc.mrbird.febs.server.hr.mapper;

import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
 * name:EmpWorkexperience
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工作经历实体Mapper
 *
 * @author luoyibo
 * @date 2021-01-28 12:33:31
 * @since JDK1.8
 */
public interface EmpWorkExperienceMapper extends BaseMapper<EmpWorkExperience> {
    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date luoyibo
     *
     * @param list       待删除Id
     * @param operatorId 操作员Id
     * @return void
     * @author: 2021-01-28 12:33:31
     */
    @Update("<script> " +
            " UPDATE t_emp_workExperience SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE workExperienceId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId}\n" +
            "        </foreach>\n" +
            "</script>")
    void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

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

@@ -15,7 +15,7 @@
* description:员工意外险案件服务接口
*
* @author luoyibo
* @date 2021-01-24 20:36:10
* @date 2021-01-31 11:26:27
* @since JDK1.8
*/
public interface IEmpAccidentCasesService extends IService<EmpAccidentCases> {
@@ -56,4 +56,15 @@
* @param empAccidentcases empAccidentcases
*/
void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpAccidentcases(String ids);
}

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

@@ -9,60 +9,62 @@
import java.util.List;

/**
 * name:EmpBadrecord
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工不良记录信息服务接口
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @since JDK1.8
 */
*
* name:EmpBadrecord
* package:cc.mrbird.febs.server.hr.controller
* description:员工不良记录信息服务接口
*
* @author luoyibo
* @date 2021-01-31 11:26:42
* @since JDK1.8
*/
public interface IEmpBadRecordService extends IService<EmpBadRecord> {
    /**
     * 查询（分页）
     *
     * @param request      QueryRequest
     * @param empBadrecord empBadrecord
     * @return IPage<EmpBadrecord>
     */
    IPage<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord);
/**
* 查询（分页）
*
* @param request QueryRequest
* @param empBadrecord empBadrecord
* @return IPage<EmpBadrecord>
*/
IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord);

    /**
     * 查询（所有）
     *
     * @param empBadrecord empBadrecord
     * @return List<EmpBadrecord>
     */
    List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord);
/**
* 查询（所有）
*
* @param empBadrecord empBadrecord
* @return List<EmpBadrecord>
*/
List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord);

    /**
     * 新增
     *
     * @param empBadrecord empBadrecord
     */
    void createEmpBadRecord(EmpBadRecord empBadrecord);
/**
* 新增
*
* @param empBadrecord empBadrecord
*/
void createEmpBadrecord(EmpBadRecord empBadrecord);

    /**
     * 修改
     *
     * @param empBadrecord empBadrecord
     */
    void updateEmpBadRecord(EmpBadRecord empBadrecord);
/**
* 修改
*
* @param empBadrecord empBadrecord
*/
void updateEmpBadrecord(EmpBadRecord empBadrecord);

    /**
     * 删除
     *
     * @param empBadrecord empBadrecord
     */
    void deleteEmpBadRecord(EmpBadRecord empBadrecord);
    /**
     *
     * 根据Id批量逻辑删除记录
     *
     * date 2021-01-28 10:48
     * @author: luoyibo
     * @param ids 待删除Id
     * @return void
     */
    void logicDelEmpBadRecord(String ids);
/**
* 删除
*
* @param empBadrecord empBadrecord
*/
void deleteEmpBadrecord(EmpBadRecord empBadrecord);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpBadrecord(String ids);
}

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

New file
@@ -0,0 +1,70 @@
package cc.mrbird.febs.server.hr.service;

import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;

import cc.mrbird.febs.common.core.entity.QueryRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
*
* name:EmpBaseinfo
* package:cc.mrbird.febs.server.hr.controller
* description:服务接口
*
* @author luoyibo
* @date 2021-01-30 08:04:50
* @since JDK1.8
*/
public interface IEmpBaseInfoService extends IService<EmpBaseInfo> {
/**
* 查询（分页）
*
* @param request QueryRequest
* @param empBaseInfo empBaseinfo
* @return IPage<EmpBaseinfo>
*/
IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);

/**
* 查询（所有）
*
* @param empBaseInfo empBaseInfo
* @return List<EmpBaseinfo>
*/
List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo);

/**
* 新增
*
* @param empBaseInfo empBaseInfo
*/
void createEmpBaseInfo(EmpBaseInfo empBaseInfo);

/**
* 修改
*
* @param empBaseInfo empBaseInfo
*/
void updateEmpBaseInfo(EmpBaseInfo empBaseInfo);

/**
* 删除
*
* @param empBaseInfo empBaseInfo
*/
void deleteEmpBaseInfo(EmpBaseInfo empBaseInfo);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpBaseInfo(String ids);
}

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

@@ -15,7 +15,7 @@
* description:员工合同信息服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:42
* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
public interface IEmpContractInfoService extends IService<EmpContractInfo> {
@@ -56,4 +56,15 @@
* @param empContractinfo empContractinfo
*/
void deleteEmpContractinfo(EmpContractInfo empContractinfo);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpContractinfo(String ids);
}

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

@@ -15,7 +15,7 @@
* description:离职当月考勤服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:38
* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
public interface IEmpDimissionAttendService extends IService<EmpDimissionAttend> {
@@ -56,4 +56,15 @@
* @param empDimissionattend empDimissionattend
*/
void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpDimissionattend(String ids);
}

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

@@ -15,7 +15,7 @@
* description:员工社保申请服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:33
* @date 2021-01-31 11:26:23
* @since JDK1.8
*/
public interface IEmpInsuranceService extends IService<EmpInsurance> {
@@ -56,4 +56,15 @@
* @param empInsurance empInsurance
*/
void deleteEmpInsurance(EmpInsurance empInsurance);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpInsurance(String ids);
}

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

@@ -15,7 +15,7 @@
* description:员工劳资案件服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:59
* @date 2021-01-31 11:26:36
* @since JDK1.8
*/
public interface IEmpLaborTroubleService extends IService<EmpLaborTrouble> {
@@ -56,4 +56,15 @@
* @param empLabortrouble empLabortrouble
*/
void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpLabortrouble(String ids);
}

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

@@ -15,7 +15,7 @@
* description:员工请假记录服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:29
* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
public interface IEmpLeaveInfoService extends IService<EmpLeaveInfo> {
@@ -56,4 +56,15 @@
* @param empLeaveinfo empLeaveinfo
*/
void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpLeaveinfo(String ids);
}

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

@@ -15,7 +15,7 @@
* description:员工工伤案件服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:24
* @date 2021-01-31 11:26:32
* @since JDK1.8
*/
public interface IEmpOccupationalService extends IService<EmpOccupational> {
@@ -56,4 +56,15 @@
* @param empOccupational empOccupational
*/
void deleteEmpOccupational(EmpOccupational empOccupational);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpOccupational(String ids);
}

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

@@ -9,51 +9,61 @@
import java.util.List;

/**
*
* name:EmpPhysicalexam
* package:cc.mrbird.febs.server.hr.controller
* description:员工体检信息服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:19
* @since JDK1.8
*/
 * name:EmpPhysicalexam
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工体检信息服务接口
 *
 * @author luoyibo
 * @date 2021-01-31 09:11:00
 * @since JDK1.8
 */
public interface IEmpPhysicalExamService extends IService<EmpPhysicalExam> {
/**
* 查询（分页）
*
* @param request QueryRequest
* @param empPhysicalexam empPhysicalexam
* @return IPage<EmpPhysicalexam>
*/
IPage<EmpPhysicalExam> findEmpPhysicalexams(QueryRequest request, EmpPhysicalExam empPhysicalexam);
    /**
     * 查询（分页）
     *
     * @param request         QueryRequest
     * @param empPhysicalExam empPhysicalExam
     * @return IPage<EmpPhysicalExam>
     */
    IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalExam);

/**
* 查询（所有）
*
* @param empPhysicalexam empPhysicalexam
* @return List<EmpPhysicalexam>
*/
List<EmpPhysicalExam> findEmpPhysicalexams(EmpPhysicalExam empPhysicalexam);
    /**
     * 查询（所有）
     *
     * @param empPhysicalExam empPhysicalExam
     * @return List<EmpPhysicalExam>
     */
    List<EmpPhysicalExam> findEmpPhysicalExams(EmpPhysicalExam empPhysicalExam);

/**
* 新增
*
* @param empPhysicalexam empPhysicalexam
*/
void createEmpPhysicalexam(EmpPhysicalExam empPhysicalexam);
    /**
     * 新增
     *
     * @param empPhysicalExam empPhysicalExam
     */
    void createEmpPhysicalExam(EmpPhysicalExam empPhysicalExam);

/**
* 修改
*
* @param empPhysicalexam empPhysicalexam
*/
void updateEmpPhysicalexam(EmpPhysicalExam empPhysicalexam);
    /**
     * 修改
     *
     * @param empPhysicalExam empPhysicalExam
     */
    void updateEmpPhysicalExam(EmpPhysicalExam empPhysicalExam);

/**
* 删除
*
* @param empPhysicalexam empPhysicalexam
*/
void deleteEmpPhysicalexam(EmpPhysicalExam empPhysicalexam);
    /**
     * 删除
     *
     * @param empPhysicalExam empPhysicalExam
     */
    void deleteEmpPhysicalExam(EmpPhysicalExam empPhysicalExam);

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    void logicDelEmpPhysicalExam(String ids);
}

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

File was renamed from febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkInfoService.java
@@ -15,10 +15,10 @@
* description:员工备注信息服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:15
* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
public interface IEmpRemarkInfoService extends IService<EmpRemarkInfo> {
public interface IEmpRemarkinfoService extends IService<EmpRemarkInfo> {
/**
* 查询（分页）
*
@@ -56,4 +56,15 @@
* @param empRemarkinfo empRemarkinfo
*/
void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpRemarkinfo(String ids);
}

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

@@ -15,7 +15,7 @@
* description:员工辞职申请服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:08
* @date 2021-01-31 11:26:18
* @since JDK1.8
*/
public interface IEmpResignService extends IService<EmpResign> {
@@ -56,4 +56,15 @@
* @param empResign empResign
*/
void deleteEmpResign(EmpResign empResign);

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDelEmpResign(String ids);
}

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

New file
@@ -0,0 +1,69 @@
package cc.mrbird.febs.server.hr.service;

import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;

import cc.mrbird.febs.common.core.entity.QueryRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * name:EmpWorkexperience
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工作经历服务接口
 *
 * @author luoyibo
 * @date 2021-01-28 12:33:31
 * @since JDK1.8
 */
public interface IEmpWorkExperienceService extends IService<EmpWorkExperience> {
    /**
     * 查询（分页）
     *
     * @param request           QueryRequest
     * @param empWorkexperience empWorkexperience
     * @return IPage<EmpWorkexperience>
     */
    IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience);

    /**
     * 查询（所有）
     *
     * @param empWorkexperience empWorkexperience
     * @return List<EmpWorkexperience>
     */
    List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience);

    /**
     * 新增
     *
     * @param empWorkexperience empWorkexperience
     */
    void createEmpWorkExperience(EmpWorkExperience empWorkexperience);

    /**
     * 修改
     *
     * @param empWorkexperience empWorkexperience
     */
    void updateEmpWorkExperience(EmpWorkExperience empWorkexperience);

    /**
     * 删除
     *
     * @param empWorkexperience empWorkexperience
     */
    void deleteEmpWorkExperience(EmpWorkExperience empWorkexperience);

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    void logicDelEmpWorkExperience(String ids);
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.mapper.EmpAccidentCasesMapper;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpAccidentcases
* package:cc.mrbird.febs.server.hr.controller
* description:员工意外险案件服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:36:10
* @since JDK1.8
*/
 * name:EmpAccidentcases
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工意外险案件服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:27
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpAccidentCasesServiceImpl extends ServiceImpl
<EmpAccidentCasesMapper, EmpAccidentCases> implements IEmpAccidentCasesService {
class EmpAccidentCasesServiceImpl extends ServiceImpl<EmpAccidentCasesMapper, EmpAccidentCases> implements IEmpAccidentCasesService {

private final EmpAccidentCasesMapper empAccidentcasesMapper;
    private final EmpAccidentCasesMapper empAccidentcasesMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
        Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
this.save(empAccidentcases);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
        empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empAccidentcases.setCreator(operatorId);
        empAccidentcases.setModifier(operatorId);
        this.save(empAccidentcases);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) {
this.saveOrUpdate(empAccidentcases);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) {
        EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
        empAccidentcases.setCreateTime(dbData.getCreateTime());
        empAccidentcases.setCreator(dbData.getCreator());
        empAccidentcases.setDelFlag(dbData.getDelFlag());
        empAccidentcases.setModifyTime(new Date());
        empAccidentcases.setModifier(operatorId);
        this.saveOrUpdate(empAccidentcases);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) {
        LambdaQueryWrapper<EmpAccidentCases> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpAccidentcases(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empAccidentcasesMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,12 +1,9 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -16,6 +13,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.*;

@@ -25,13 +24,13 @@
 * description:员工不良记录信息服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @date 2021-01-31 11:26:42
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {

    private final EmpBadRecordMapper empBadrecordMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
@@ -39,25 +38,23 @@
            .orElse("1");

    @Override
    public IPage<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord) {
    public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, 0);

        Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

    @Override
    public List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord) {
    public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, 0);

        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpBadRecord(EmpBadRecord empBadrecord) {
    public void createEmpBadrecord(EmpBadRecord empBadrecord) {
        empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empBadrecord.setCreator(operatorId);
        empBadrecord.setModifier(operatorId);
@@ -66,35 +63,38 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpBadRecord(EmpBadRecord empBadrecord) {
    public void updateEmpBadrecord(EmpBadRecord empBadrecord) {
        EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
        empBadrecord.setCreateTime(dbData.getCreateTime());
        empBadrecord.setCreator(dbData.getCreator());
        empBadrecord.setDelFlag(dbData.getDelFlag());
        empBadrecord.setModifyTime(new Date());
        empBadrecord.setModifier(operatorId);

        this.saveOrUpdate(empBadrecord);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpBadRecord(EmpBadRecord empBadrecord) {
        UpdateWrapper<EmpBadRecord> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("delFlag", 1);
        updateWrapper.set("modifyTime", new Date());
        updateWrapper.set("modifier", operatorId);
        updateWrapper.set("version", empBadrecord.getVersion() + 1);

        updateWrapper.eq("badId", empBadrecord.getBadId());
        this.update(updateWrapper);
    public void deleteEmpBadrecord(EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    public void logicDelEmpBadRecord(String ids) {
        List<String> list = new ArrayList<>();
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpBadrecord(String ids) {
        String[] str = ids.split(",");
        list.addAll(Arrays.asList(str));
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBadrecordMapper.logicDeleteByIds(list, operatorId);
    }
}
}

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

New file
@@ -0,0 +1,102 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.*;

/**
 * name:EmpBaseinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工基本信息服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-30 08:04:50
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpBaseInfoServiceImpl extends ServiceImpl<EmpBaseInfoMapper, EmpBaseInfo> implements IEmpBaseInfoService {

    private final EmpBaseInfoMapper empBaseInfoMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

    @Override
    public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
        LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBaseInfo::getDelFlag, 0);
        Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

    @Override
    public List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo) {
        LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBaseInfo::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
        empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empBaseInfo.setDeptId(1L);
        empBaseInfo.setJobId(1L);
        empBaseInfo.setCreator(operatorId);
        empBaseInfo.setModifier(operatorId);
        this.save(empBaseInfo);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpBaseInfo(EmpBaseInfo empBaseInfo) {
        EmpBaseInfo dbData = this.getById(empBaseInfo.getEmpId());
        empBaseInfo.setCreateTime(dbData.getCreateTime());
        empBaseInfo.setCreator(dbData.getCreator());
        empBaseInfo.setDelFlag(dbData.getDelFlag());
        empBaseInfo.setModifyTime(new Date());
        empBaseInfo.setModifier(operatorId);
        this.saveOrUpdate(empBaseInfo);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpBaseInfo(EmpBaseInfo empBaseInfo) {
        LambdaQueryWrapper<EmpBaseInfo> wrapper = new LambdaQueryWrapper<>();
        // TODO 设置删除条件
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpBaseInfo(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBaseInfoMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpContractinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工合同信息服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:42
* @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
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpContractInfoServiceImpl extends ServiceImpl
<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {

private final EmpContractInfoMapper empContractinfoMapper;
    private final EmpContractInfoMapper empContractinfoMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
        LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
        LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpContractinfo(EmpContractInfo empContractinfo) {
this.save(empContractinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpContractinfo(EmpContractInfo empContractinfo) {
        empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empContractinfo.setCreator(operatorId);
        empContractinfo.setModifier(operatorId);
        this.save(empContractinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpContractinfo(EmpContractInfo empContractinfo) {
this.saveOrUpdate(empContractinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpContractinfo(EmpContractInfo empContractinfo) {
        EmpContractInfo dbData = this.getById(empContractinfo.getContractId());
        empContractinfo.setCreateTime(dbData.getCreateTime());
        empContractinfo.setCreator(dbData.getCreator());
        empContractinfo.setDelFlag(dbData.getDelFlag());
        empContractinfo.setModifyTime(new Date());
        empContractinfo.setModifier(operatorId);
        this.saveOrUpdate(empContractinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpContractinfo(EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpContractinfo(EmpContractInfo empContractinfo) {
        LambdaQueryWrapper<EmpContractInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpContractinfo(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empContractinfoMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpDimissionattend
* package:cc.mrbird.febs.server.hr.controller
* description:离职当月考勤服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:38
* @since JDK1.8
*/
 * name:EmpDimissionattend
 * package:cc.mrbird.febs.server.hr.controller
 * description:离职当月考勤服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:04
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpDimissionAttendServiceImpl extends ServiceImpl
<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
class EmpDimissionAttendServiceImpl extends ServiceImpl<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {

private final EmpDimissionAttendMapper empDimissionattendMapper;
    private final EmpDimissionAttendMapper empDimissionattendMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
        LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
        Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
        LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
this.save(empDimissionattend);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        empDimissionattend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empDimissionattend.setCreator(operatorId);
        empDimissionattend.setModifier(operatorId);
        this.save(empDimissionattend);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
this.saveOrUpdate(empDimissionattend);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        EmpDimissionAttend dbData = this.getById(empDimissionattend.getDimissionAttendId());
        empDimissionattend.setCreateTime(dbData.getCreateTime());
        empDimissionattend.setCreator(dbData.getCreator());
        empDimissionattend.setDelFlag(dbData.getDelFlag());
        empDimissionattend.setModifyTime(new Date());
        empDimissionattend.setModifier(operatorId);
        this.saveOrUpdate(empDimissionattend);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        LambdaQueryWrapper<EmpDimissionAttend> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpDimissionattend(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empDimissionattendMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.mapper.EmpInsuranceMapper;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpInsurance
* package:cc.mrbird.febs.server.hr.controller
* description:员工社保申请服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:33
* @since JDK1.8
*/
 * name:EmpInsurance
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工社保申请服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:23
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpInsuranceServiceImpl extends ServiceImpl
<EmpInsuranceMapper, EmpInsurance> implements IEmpInsuranceService {
class EmpInsuranceServiceImpl extends ServiceImpl<EmpInsuranceMapper, EmpInsurance> implements IEmpInsuranceService {

private final EmpInsuranceMapper empInsuranceMapper;
    private final EmpInsuranceMapper empInsuranceMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
        LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpInsurance::getDelFlag, 0);
        Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
        LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpInsurance::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpInsurance(EmpInsurance empInsurance) {
this.save(empInsurance);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpInsurance(EmpInsurance empInsurance) {
        empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empInsurance.setCreator(operatorId);
        empInsurance.setModifier(operatorId);
        this.save(empInsurance);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpInsurance(EmpInsurance empInsurance) {
this.saveOrUpdate(empInsurance);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpInsurance(EmpInsurance empInsurance) {
        EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
        empInsurance.setCreateTime(dbData.getCreateTime());
        empInsurance.setCreator(dbData.getCreator());
        empInsurance.setDelFlag(dbData.getDelFlag());
        empInsurance.setModifyTime(new Date());
        empInsurance.setModifier(operatorId);
        this.saveOrUpdate(empInsurance);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpInsurance(EmpInsurance empInsurance) {
LambdaQueryWrapper<EmpInsurance> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpInsurance(EmpInsurance empInsurance) {
        LambdaQueryWrapper<EmpInsurance> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpInsurance(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empInsuranceMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpLabortrouble
* package:cc.mrbird.febs.server.hr.controller
* description:员工劳资案件服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:59
* @since JDK1.8
*/
 * name:EmpLabortrouble
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工劳资案件服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:36
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpLaborTroubleServiceImpl extends ServiceImpl
<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {
class EmpLaborTroubleServiceImpl extends ServiceImpl<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {

private final EmpLaborTroubleMapper empLabortroubleMapper;
    private final EmpLaborTroubleMapper empLabortroubleMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
        LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLaborTrouble::getDelFlag, 0);
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
        LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLaborTrouble::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
this.save(empLabortrouble);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
        empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empLabortrouble.setCreator(operatorId);
        empLabortrouble.setModifier(operatorId);
        this.save(empLabortrouble);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
this.saveOrUpdate(empLabortrouble);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
        EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
        empLabortrouble.setCreateTime(dbData.getCreateTime());
        empLabortrouble.setCreator(dbData.getCreator());
        empLabortrouble.setDelFlag(dbData.getDelFlag());
        empLabortrouble.setModifyTime(new Date());
        empLabortrouble.setModifier(operatorId);
        this.saveOrUpdate(empLabortrouble);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
        LambdaQueryWrapper<EmpLaborTrouble> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpLabortrouble(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empLabortroubleMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpLeaveinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工请假记录服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:29
* @since JDK1.8
*/
 * name:EmpLeaveinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工请假记录服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:13
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpLeaveInfoServiceImpl extends ServiceImpl
<EmpLeaveInfoMapper, EmpLeaveInfo> implements IEmpLeaveInfoService {
class EmpLeaveInfoServiceImpl extends ServiceImpl<EmpLeaveInfoMapper, EmpLeaveInfo> implements IEmpLeaveInfoService {

private final EmpLeaveInfoMapper empLeaveinfoMapper;
    private final EmpLeaveInfoMapper empLeaveinfoMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
        LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
        Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
        LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
this.save(empLeaveinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
        empLeaveinfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empLeaveinfo.setCreator(operatorId);
        empLeaveinfo.setModifier(operatorId);
        this.save(empLeaveinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
this.saveOrUpdate(empLeaveinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
        EmpLeaveInfo dbData = this.getById(empLeaveinfo.getLeaveId());
        empLeaveinfo.setCreateTime(dbData.getCreateTime());
        empLeaveinfo.setCreator(dbData.getCreator());
        empLeaveinfo.setDelFlag(dbData.getDelFlag());
        empLeaveinfo.setModifyTime(new Date());
        empLeaveinfo.setModifier(operatorId);
        this.saveOrUpdate(empLeaveinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
        LambdaQueryWrapper<EmpLeaveInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpLeaveinfo(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empLeaveinfoMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpOccupational
* package:cc.mrbird.febs.server.hr.controller
* description:员工工伤案件服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:24
* @since JDK1.8
*/
 * name:EmpOccupational
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工伤案件服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:32
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpOccupationalServiceImpl extends ServiceImpl
<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {

private final EmpOccupationalMapper empOccupationalMapper;
    private final EmpOccupationalMapper empOccupationalMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
        LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpOccupational::getDelFlag, 0);
        Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
        LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpOccupational::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpOccupational(EmpOccupational empOccupational) {
this.save(empOccupational);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpOccupational(EmpOccupational empOccupational) {
        empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empOccupational.setCreator(operatorId);
        empOccupational.setModifier(operatorId);
        this.save(empOccupational);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpOccupational(EmpOccupational empOccupational) {
this.saveOrUpdate(empOccupational);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpOccupational(EmpOccupational empOccupational) {
        EmpOccupational dbData = this.getById(empOccupational.getOccupationalId());
        empOccupational.setCreateTime(dbData.getCreateTime());
        empOccupational.setCreator(dbData.getCreator());
        empOccupational.setDelFlag(dbData.getDelFlag());
        empOccupational.setModifyTime(new Date());
        empOccupational.setModifier(operatorId);
        this.saveOrUpdate(empOccupational);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpOccupational(EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpOccupational(EmpOccupational empOccupational) {
        LambdaQueryWrapper<EmpOccupational> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpOccupational(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empOccupationalMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpPhysicalexam
* package:cc.mrbird.febs.server.hr.controller
* description:员工体检信息服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:19
* @since JDK1.8
*/
 * name:EmpPhysicalexam
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工体检信息服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 09:11:00
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpPhysicalExamServiceImpl extends ServiceImpl
<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {
class EmpPhysicalExamServiceImpl extends ServiceImpl<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {

private final EmpPhysicalExamMapper empPhysicalexamMapper;
    private final EmpPhysicalExamMapper empPhysicalexamMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpPhysicalExam> findEmpPhysicalexams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
        LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpPhysicalExam::getDelFlag, 0);
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpPhysicalExam> findEmpPhysicalexams(EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpPhysicalExam> findEmpPhysicalExams(EmpPhysicalExam empPhysicalexam) {
        LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpPhysicalExam::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) {
this.save(empPhysicalexam);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
        empPhysicalexam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empPhysicalexam.setCreator(operatorId);
        empPhysicalexam.setModifier(operatorId);
        this.save(empPhysicalexam);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) {
this.saveOrUpdate(empPhysicalexam);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
        EmpPhysicalExam dbData = this.getById(empPhysicalexam.getPhysicalExamId());
        empPhysicalexam.setCreateTime(dbData.getCreateTime());
        empPhysicalexam.setCreator(dbData.getCreator());
        empPhysicalexam.setDelFlag(dbData.getDelFlag());
        empPhysicalexam.setModifyTime(new Date());
        empPhysicalexam.setModifier(operatorId);
        this.saveOrUpdate(empPhysicalexam);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpPhysicalexam(EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
        LambdaQueryWrapper<EmpPhysicalExam> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpPhysicalExam(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empPhysicalexamMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,8 +1,9 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpRemarkInfoService;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpRemarkinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工备注信息服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:15
* @since JDK1.8
*/
 * name:EmpRemarkinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工备注信息服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:48
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpRemarkInfoServiceImpl extends ServiceImpl
<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkInfoService {
class EmpRemarkInfoServiceImpl extends ServiceImpl<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkinfoService {

private final EmpRemarkInfoMapper empRemarkinfoMapper;
    private final EmpRemarkInfoMapper empRemarkinfoMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
this.save(empRemarkinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
        empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empRemarkinfo.setCreator(operatorId);
        empRemarkinfo.setModifier(operatorId);
        this.save(empRemarkinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
this.saveOrUpdate(empRemarkinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
        EmpRemarkInfo dbData = this.getById(empRemarkinfo.getRemarkId());
        empRemarkinfo.setCreateTime(dbData.getCreateTime());
        empRemarkinfo.setCreator(dbData.getCreator());
        empRemarkinfo.setDelFlag(dbData.getDelFlag());
        empRemarkinfo.setModifyTime(new Date());
        empRemarkinfo.setModifier(operatorId);
        this.saveOrUpdate(empRemarkinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpRemarkinfo(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empRemarkinfoMapper.logicDeleteByIds(list, operatorId);
    }
}

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.*;

/**
*
* name:EmpResign
* package:cc.mrbird.febs.server.hr.controller
* description:员工辞职申请服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:08
* @since JDK1.8
*/
 * name:EmpResign
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工辞职申请服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:18
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpResignServiceImpl extends ServiceImpl
<EmpResignMapper, EmpResign> implements IEmpResignService {
class EmpResignServiceImpl extends ServiceImpl<EmpResignMapper, EmpResign> implements IEmpResignService {

private final EmpResignMapper empResignMapper;
    private final EmpResignMapper empResignMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
        LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpResign::getDelFlag, 0);
        Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

@Override
public List<EmpResign> findEmpResigns(EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
    @Override
    public List<EmpResign> findEmpResigns(EmpResign empResign) {
        LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpResign::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpResign(EmpResign empResign) {
this.save(empResign);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpResign(EmpResign empResign) {
        empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empResign.setCreator(operatorId);
        empResign.setModifier(operatorId);
        this.save(empResign);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpResign(EmpResign empResign) {
this.saveOrUpdate(empResign);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpResign(EmpResign empResign) {
        EmpResign dbData = this.getById(empResign.getResignId());
        empResign.setCreateTime(dbData.getCreateTime());
        empResign.setCreator(dbData.getCreator());
        empResign.setDelFlag(dbData.getDelFlag());
        empResign.setModifyTime(new Date());
        empResign.setModifier(operatorId);
        this.saveOrUpdate(empResign);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpResign(EmpResign empResign) {
LambdaQueryWrapper<EmpResign> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpResign(EmpResign empResign) {
        LambdaQueryWrapper<EmpResign> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
}
        this.remove(wrapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpResign(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empResignMapper.logicDeleteByIds(list, operatorId);
    }
}

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

New file
@@ -0,0 +1,103 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;

import java.util.*;

/**
 * name:EmpWorkexperience
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工作经历服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-28 12:33:31
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpWorkExperienceServiceImpl extends ServiceImpl<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {

    private final EmpWorkExperienceMapper empWorkexperienceMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

    @Override
    public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }

    @Override
    public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) {
        empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empWorkexperience.setDeptId(1L);
        empWorkexperience.setJobId(1L);
        empWorkexperience.setCreator(operatorId);
        empWorkexperience.setModifier(operatorId);
        this.save(empWorkexperience);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) {
        EmpWorkExperience dbData = this.getById(empWorkexperience.getWorkExperienceId());
        empWorkexperience.setCreateTime(dbData.getCreateTime());
        empWorkexperience.setCreator(dbData.getCreator());
        empWorkexperience.setDelFlag(dbData.getDelFlag());
        empWorkexperience.setModifyTime(new Date());
        empWorkexperience.setModifier(operatorId);
        this.saveOrUpdate(empWorkexperience);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpWorkExperience(EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> wapper = new LambdaQueryWrapper<>();
        // TODO 设置删除条件
        this.remove(wapper);
    }

    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpWorkExperience(String ids) {
        List<String> list = new ArrayList<>();
        String[] str = ids.split(",");
        list.addAll(Arrays.asList(str));
        empWorkexperienceMapper.logicDeleteByIds(list, operatorId);
    }
}