huminmin
10 天以前 eeeccc7389757ae4a766ab7267fcbc2b008faf9c
增加注解
已修改13个文件
96 ■■■■■ 文件已修改
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/AnalyticsController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/StaffContractController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -14,6 +14,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@
 */
@RestController
@RequestMapping("/quality/qualityInspect")
@Api(tags = "检验")
public class QualityInspectController {
    @Resource
@@ -49,6 +52,7 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增检验单")
    public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
    }
@@ -59,6 +63,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检验单")
    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -86,6 +91,7 @@
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation("检验单详情")
    public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityInspectService.getDetailById(id));
    }
@@ -96,6 +102,7 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("修改检验单")
    public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
    }
@@ -107,6 +114,7 @@
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("检验单分页查询")
    public AjaxResult qualityInspectListPage(Page page, QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
    }
@@ -117,6 +125,7 @@
     * @param qualityInspect
     */
    @PostMapping("/export")
    @ApiOperation("导出检验单")
    public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
        qualityInspectService.qualityInspectExport(response, qualityInspect);
    }
@@ -127,6 +136,7 @@
     * @return
     */
    @PostMapping("/submit")
    @ApiOperation("提交检验单")
    public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.submit(qualityInspect));
    }
@@ -137,6 +147,7 @@
     * @param qualityInspect
     */
    @PostMapping("/down")
    @ApiOperation("下载检验单")
    public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
        qualityInspectService.down(response, qualityInspect);
    }
src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
@@ -9,6 +9,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,7 @@
 */
@RestController
@RequestMapping("/quality/qualityInspectFile")
@Api(tags = "检验附件")
public class QualityInspectFileController {
@@ -34,6 +37,7 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增检验附件")
    public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
        return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
    }
@@ -43,6 +47,7 @@
     * @param ids
     * @return
     */
    @ApiOperation("删除检验附件")
    @DeleteMapping("/del")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
@@ -58,6 +63,7 @@
     * @param qualityInspectFile
     * @return
     */
    @ApiOperation("分页查询检验附件")
    @GetMapping("/listPage")
    public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
        return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
@@ -9,6 +9,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,7 @@
 */
@RestController
@RequestMapping("/quality/qualityInspectParam")
@Api(tags = "检验参数项")
public class QualityInspectParamController {
    @Resource
@@ -31,6 +34,7 @@
     * @param inspectId
     * @return
     */
    @ApiOperation("查询检验参数项详情")
    @GetMapping("/{inspectId}")
    public AjaxResult QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
        return AjaxResult.success(qualityInspectParamService.qualityInspectParamDetail(inspectId));
@@ -43,6 +47,7 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("修改")
    public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
        return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
    }
@@ -53,6 +58,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
@@ -6,6 +6,8 @@
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardBindingService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +22,7 @@
 * @author 芯导软件(江苏)有限公司
 * @since 2026-01-13 03:39:40
 */
@Api(tags = "检测标准主表与产品关联表")
@RestController
@RequestMapping("/qualityTestStandardBinding")
public class QualityTestStandardBindingController {
@@ -33,6 +36,7 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增检测标准主表与产品关联表")
    public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
        return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
    }
@@ -43,6 +47,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检测标准主表与产品关联表")
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -55,6 +60,7 @@
     * @return
     */
    @GetMapping("/list")
    @ApiOperation("检测指标维护查询")
    public AjaxResult listBinding(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardBindingService.listBinding(testStandardId));
    }
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -7,6 +7,8 @@
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,7 @@
 * @author 芯导软件(江苏)有限公司
 * @since 2026-01-13 03:40:24
 */
@Api(tags = "检测标准主表")
@RestController
@RequestMapping("/qualityTestStandard")
public class QualityTestStandardController {
@@ -39,6 +42,7 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增检测标准主表")
    public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
    }
@@ -49,6 +53,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检测标准主表")
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -62,6 +67,7 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("检测标准主表修改")
    public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
    }
@@ -73,6 +79,7 @@
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("检测标准主表分页查询")
    public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
    }
@@ -83,6 +90,7 @@
     * @return
     */
    @PostMapping("/copyParam")
    @ApiOperation("检测标准复制参数")
    public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
    }
@@ -93,6 +101,7 @@
     * @return
     */
    @PostMapping("/qualityTestStandardAudit")
    @ApiOperation("检测标准批量审核")
    public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
        return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
    }
@@ -102,6 +111,7 @@
     * @return
     */
    @GetMapping("/getQualityTestStandardByProductId")
    @ApiOperation("根据产品id查询相关的检验标准")
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
    }
@@ -111,6 +121,7 @@
     * @return
     */
    @GetMapping("/getQualityTestStandardParamByTestStandardId")
    @ApiOperation("根据检测标准id查询相关的检验标准参数")
    public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
    }
src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
@@ -6,6 +6,8 @@
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,7 @@
 */
@RestController
@RequestMapping("/qualityTestStandardParam")
@Api(tags = "检测标准参数")
public class QualityTestStandardParamController {
    @Autowired
@@ -33,6 +36,7 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增检测标准参数")
    public AjaxResult add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
        return AjaxResult.success(qualityTestStandardParamService.save(qualityTestStandardParam));
    }
@@ -42,6 +46,7 @@
     * @param ids
     * @return
     */
    @ApiOperation("删除检测指标维护")
    @DeleteMapping("/del")
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
@@ -56,6 +61,7 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("检测指标维护修改")
    public AjaxResult update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
        return AjaxResult.success(qualityTestStandardParamService.updateById(qualityTestStandardParam));
    }
@@ -65,6 +71,7 @@
     * @return
     */
    @GetMapping("/list")
    @ApiOperation("检测指标维护查询")
    public AjaxResult list(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
    }
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -4,6 +4,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -16,6 +18,7 @@
 */
@RestController
@RequestMapping("/quality/qualityUnqualified")
@Api(tags = "不合格管理")
public class QualityUnqualifiedController {
    @Resource
@@ -28,6 +31,7 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增不合格管理")
    public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
        qualityUnqualified.setInspectState(0);
        return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
@@ -39,6 +43,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除不合格管理")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
       qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
           if (qualityUnqualified.getInspectState()==1){
@@ -54,6 +59,7 @@
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation("不合格管理详情")
    public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
    }
@@ -64,6 +70,7 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("不合格管理修改")
    public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
    }
@@ -74,7 +81,8 @@
     * @param qualityUnqualified
     * @return
     */
    @GetMapping("/listPage")
    @PostMapping("/listPage")
    @ApiOperation("不合格管理分页查询")
    public AjaxResult qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
    }
@@ -85,6 +93,7 @@
     * @param qualityUnqualified
     */
    @PostMapping("/export")
    @ApiOperation("不合格管理导出")
    public void qualityUnqualifiedExport(HttpServletResponse response,QualityUnqualified qualityUnqualified) {
        qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
    }
@@ -95,6 +104,7 @@
     * @return
     */
    @PostMapping("/deal")
    @ApiOperation("不合格管理处理")
    public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
    }
src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
@@ -2,6 +2,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.service.AnalyticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,21 +12,25 @@
@RestController
@RequestMapping("/staff/analytics")
@Api(tags = "员工分析")
public class AnalyticsController {
    @Resource
    private AnalyticsService analyticsService;
    @ApiOperation("离职原因分析")
    @GetMapping("/reason")
    public AjaxResult staffLeaveReasonAnalytics() {
        return AjaxResult.success(analyticsService.staffLeaveReasonAnalytics());
    }
    @ApiOperation("12个月离职率分析")
    @GetMapping("/monthly_turnover_rate")
    public AjaxResult getMonthlyTurnoverRateFor12Months() {
        return AjaxResult.success(analyticsService.getMonthlyTurnoverRateFor12Months());
    }
    @ApiOperation("总统计分析")
    @GetMapping("/total_statistic")
    public AjaxResult getTotalStatistic() {
        return AjaxResult.success(analyticsService.getTotalStatistic());
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -4,17 +4,21 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/staff/holidayApplication")
@Api(tags = "请假申请")
public class HolidayApplicationController {
    @Autowired
    private HolidayApplicationService holidayApplicationService;
    /**
     * 请假申请分页查询
     */
    @ApiOperation("请假申请分页查询")
    @GetMapping("/listPage")
    public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
@@ -22,6 +26,7 @@
    /**
     * 新增请假申请
     */
    @ApiOperation("新增请假申请")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.save(holidayApplication));
@@ -29,6 +34,7 @@
    /**
     * 修改请假申请
     */
    @ApiOperation("修改请假申请")
    @PostMapping("/update")
    public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
@@ -36,6 +42,7 @@
    /**
     * 删除请假申请
     */
    @ApiOperation("删除请假申请")
    @DeleteMapping("/delete/{id}")
    public AjaxResult delete(@PathVariable("id") Long id){
        return AjaxResult.success(holidayApplicationService.removeById(id));
src/main/java/com/ruoyi/staff/controller/StaffContractController.java
@@ -5,6 +5,7 @@
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.service.StaffContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -28,6 +29,7 @@
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("员工合同分页查询")
    public AjaxResult staffContractListPage(Page page, StaffContract staffContract) {
        return AjaxResult.success(staffContractService.staffContractListPage(page, staffContract));
    }
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -5,6 +5,7 @@
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +28,7 @@
     * @param staffLeaveDto
     * @return
     */
    @ApiOperation("新增离职分页查询")
    @GetMapping("/listPage")
    public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
        return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
@@ -38,6 +40,7 @@
     * @return
     */
    @PostMapping("")
    @ApiOperation("新增离职")
    public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
        return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
    }
@@ -49,6 +52,7 @@
     * @return
     */
    @PutMapping("/{id}")
    @ApiOperation("更新离职信息")
    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
        return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
    }
@@ -59,6 +63,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除入职")
    public AjaxResult del(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -70,6 +75,7 @@
     * 离职导出
     * @param staffLeaveDto
     */
    @ApiOperation("离职导出")
    @PostMapping("/export")
    public void export(HttpServletResponse response, StaffLeaveDto staffLeaveDto) {
        staffLeaveService.export(response, staffLeaveDto);
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -38,6 +38,7 @@
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("在职员工台账分页查询")
    public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
        return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
    }
@@ -47,6 +48,7 @@
     * @return
     */
    @GetMapping("/list")
    @ApiOperation("在职员工下拉(新增离职用)")
    public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
        return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
    }
@@ -57,6 +59,7 @@
     * @return
     */
    @PostMapping("")
    @ApiOperation("新增入职")
    public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
        return AjaxResult.success(staffOnJobService.add(staffOnJob));
    }
@@ -67,6 +70,7 @@
     * @return
     */
    @PutMapping("/{id}")
    @ApiOperation("更新入职信息")
    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
        return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
    }
@@ -77,6 +81,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除入职")
    public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -90,6 +95,7 @@
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation("在职员工详情")
    public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
        return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
    }
@@ -101,6 +107,7 @@
     * @return
     */
    @PostMapping("/renewContract/{id}")
    @ApiOperation("续签合同")
    public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
        return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
    }
@@ -109,6 +116,7 @@
     * 在职员工导入
     */
    @PostMapping("/import")
    @ApiOperation("在职员工导入")
    @Log(title = "在职员工导入", businessType = BusinessType.IMPORT)
    public AjaxResult importData(@RequestPart("file") MultipartFile file) {
        Boolean b = staffOnJobService.importData(file);
@@ -124,6 +132,7 @@
     * @param staffOnJob
     */
    @PostMapping("/export")
    @ApiOperation("在职员工导出")
    public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
        staffOnJobService.staffOnJobExport(response, staffOnJob);
    }
src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
@@ -10,6 +10,8 @@
import com.ruoyi.staff.dto.StaffSchedulingDto;
import com.ruoyi.staff.service.StaffSchedulingService;
import com.ruoyi.staff.vo.SearchSchedulingVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,28 +28,33 @@
@RestController
@RequestMapping("/staff/staffScheduling")
@RequiredArgsConstructor
@Api(tags = "排班")
public class StaffSchedulingController {
    private final StaffSchedulingService staffSchedulingService;
    @PostMapping("/listPage")
    @ApiOperation("分页查询排班")
    public AjaxResult listPage(@RequestBody SearchSchedulingVo vo){
       return AjaxResult.success(staffSchedulingService.listPage(vo));
    }
    @PostMapping("/save")
    @ApiOperation("新增排班")
    public AjaxResult save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
        staffSchedulingService.saveStaffScheduling(saveStaffSchedulingDto);
        return AjaxResult.success();
    }
    @DeleteMapping("/delByIds")
    @ApiOperation("批量删除排班")
    public AjaxResult delByIds(@RequestBody List<Integer> ids){
        staffSchedulingService.removeByIds(ids);
        return AjaxResult.success();
    }
    @DeleteMapping("/del/{id}")
    @ApiOperation("删除排班")
    public AjaxResult del(@PathVariable("id") Integer id){
        staffSchedulingService.removeById(id);
        return AjaxResult.success();