bug修改

xuhy

2 天以前 29ad8c492f475031f9c4bbbf6f6c9cf97f201f87

bug修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java

@@ -47,6 +47,10 @@
    @ApiOperation(value = "新增系统公告")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody SystemBulletinDTO dto) {
        if(dto.getStatus()==1){
            systemBulletinService.update(Wrappers.lambdaUpdate(TSystemBulletin.class)
                    .set(TSystemBulletin::getStatus, 2));
        }
        systemBulletinService.save(dto);
        return R.ok();
    }
@@ -54,6 +58,10 @@
    @ApiOperation(value = "编辑系统公告")
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody SystemBulletinDTO dto) {
        if(dto.getStatus()==1){
            systemBulletinService.update(Wrappers.lambdaUpdate(TSystemBulletin.class)
                    .set(TSystemBulletin::getStatus, 2));
        }
        systemBulletinService.updateById(dto);
        return R.ok();
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java

@@ -293,7 +293,7 @@
        map.put("waitTaskNum", list.stream().filter(tTask -> tTask.getStatus() == 1).count());

        // 总计员工数
        Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),deptType);
        Integer totalEmployeeNum = sysUserService.selectUserCount(null,deptType);
        if (deptType != 1) {
            totalEmployeeNum = totalEmployeeNum + 1;
        }
@@ -1164,6 +1164,8 @@
                analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());
                analysisUnqualifiedCleaningDetailVOS.add(analysisUnqualifiedCleaningDetailVO);
            }
            // 按照数量倒序排序
            analysisUnqualifiedCleaningDetailVOS.sort(Comparator.comparingInt(AnalysisUnqualifiedCleaningDetailVO::getCount).reversed());
            analysisUnqualifiedCleaningVO.setAnalysisUnqualifiedCleaningDetailVOS(analysisUnqualifiedCleaningDetailVOS);
        }