Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-11-29 704e7207d74b6477c5f472c5aba92d484ab17f98

 ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java

@@ -25,6 +25,7 @@

import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.Arrays;

/**
 * <p>
@@ -59,7 +60,8 @@
                .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
                        .like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
                        .eq(status != null, TeamConstruction::getStatus, status)
                        .eq(TeamConstruction::getIsDelete, isDelete)));
                        .eq(TeamConstruction::getIsDelete, isDelete)
                        .orderByDesc(TeamConstruction::getId)));
    }

    @PostMapping("/addition")
@@ -87,30 +89,34 @@
        return CommonResult.success(iTeamConstructionService.updateById(teamConstruction));
    }

    @ApiOperation(value = "批量删除违规类型")
    @DeleteMapping("/batch_delete")
    @LogSave(operationType = "运营基础设置", contain = "批量删除违规事项")
    public CommonResult removeViolations(@RequestParam Long[] ids) {

        return CommonResult.success(iTeamConstructionService.removeBatchByIds(Arrays.asList(ids)));
    }

    @PostMapping("/export")
    @ApiOperation("导出")
    @LogSave(operationType = "队伍建设管理", contain = "导出")
    @ApiImplicitParams(
            {
                    @ApiImplicitParam(name = "size", required = true, value = "页面数量"),
                    @ApiImplicitParam(name = "current", required = true, value = "页码"),
                    @ApiImplicitParam(name = "departName", value = "部门名称"),
                    @ApiImplicitParam(name = "status", value = "状态")}
    )
    @SneakyThrows
    public void export(@RequestParam() Integer size,
                       @RequestParam() Integer current,
                       @RequestParam(name = "departName", required = false) String departName,
                       @RequestParam(name = "status", required = false) Integer status,
                       HttpServletResponse response) {
    public void export(
            @RequestParam(name = "departName", required = false) String departName,
            @RequestParam(name = "status", required = false) Integer status,
            HttpServletResponse response) {
        Integer isDelete = 0;
        String sheetName = "数据";
        EasyExcelUtils.export(response, sheetName, TeamConstruction.class, iTeamConstructionService
                .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
                .list(new LambdaQueryWrapper<TeamConstruction>()
                        .like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
                        .eq(status != null, TeamConstruction::getStatus, status)
                        .eq(TeamConstruction::getIsDelete, isDelete))
                .getRecords());
                        .eq(TeamConstruction::getIsDelete, isDelete)));
    }


@@ -118,7 +124,7 @@
    @ApiOperation("导入")
    @SneakyThrows
    @LogSave(operationType = "队伍建设管理", contain = "导入")
    public CommonResult export(MultipartFile multipartFile) {
    public CommonResult export(@RequestParam("file") MultipartFile multipartFile) {
        EasyExcel.read(multipartFile.getInputStream(), TeamConstruction.class, new ReadListener() {
            @Override
            public void invoke(Object o, AnalysisContext analysisContext) {