删除代码块

xieb

2024-01-02 e7742e158c420b80f2955b4f772f7ba42a938a3c

删除代码块

 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java

@@ -94,19 +94,7 @@
        return R.data(EvaluateTaskWrapper.build().pageVO(pages));
    }

    /**
     * 公司评优
     * @param userId
     * @param query
     * @return
     */
    @GetMapping("/companyList/{userId}")
    public R companyList(@ApiIgnore @PathVariable Long userId, Query query) {
        QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("evaluate_state",1).eq("type", 0);
        IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), wrapper);
        return R.data(EvaluateTaskWrapper.build().companyListPageVO(pages,userId));
    }

    /**
     * 个人评优
     * @param userId

 src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java

@@ -99,71 +99,6 @@
        return evaluateTaskList;
    }

//    @Override
//    @Transactional
//    public boolean saveOrUpdate(EvaluateTaskEntity evaluateTask) {
//        boolean ret = super.saveOrUpdate(evaluateTask);
//        if (null == evaluateTask.getType()) //
//            return ret;
//        if (ret) {
//            //先删除
//            QueryWrapper<EvaluateTaskSetEntity> queryWrapper = new QueryWrapper<>();
//            queryWrapper.eq("evaluate_task_id", evaluateTask.getId());
//            evaluateTaskSetService.remove(queryWrapper);
//
//
//            if (evaluateTask.getType() == 0) { //个人评优处理
//                //保存
//                JSONArray jsonArray = JSONArray.parseArray(JSONObject.toJSONString(evaluateTask.getCandidateNum()));
//                for (int i = 0; i < jsonArray.size(); i++) {
//                    JSONObject obj = jsonArray.getJSONObject(i);//{"deptId":"1737282385453543425","deptName":"中国铜业","val":3,"users":[{"id":"1737304543567310850","name":"张二瑶"}
//                    Long deptId = obj.getLong("deptId");
//                    String deptName = obj.getString("deptName");
//                    String val = obj.getString("val");
//                    JSONArray userJson = JSONArray.parseArray(JSONObject.toJSONString(obj.get("users")));
//                    for (int j = 0; j < userJson.size(); j++) {
//                        EvaluateTaskSetEntity entityPO = new EvaluateTaskSetEntity();
//                        entityPO.setEvaluateTaskId(evaluateTask.getId());
//                        entityPO.setDeptId(deptId);
//                        entityPO.setDeptName(deptName);
//                        entityPO.setUserId(userJson.getJSONObject(j).getLong("id"));
//                        entityPO.setUserName(userJson.getJSONObject(j).getString("name"));
//                        entityPO.setEvaluateTaskName(evaluateTask.getTaskName());
//                        evaluateTaskSetService.save(entityPO);
//                    }
//                    if (userJson.size() == 0) {
//                        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
//                        userQueryWrapper.eq("dept_id", deptId);
//                        List<User> userList = userService.list(userQueryWrapper);
//                        for (User po: userList) {
//                            EvaluateTaskSetEntity entityPO = new EvaluateTaskSetEntity();
//                            entityPO.setEvaluateTaskId(evaluateTask.getId());
//                            entityPO.setDeptId(deptId);
//                            entityPO.setDeptName(deptName);
//                            entityPO.setUserId(po.getId());
//                            entityPO.setUserName(po.getName());
//                            entityPO.setEvaluateTaskName(evaluateTask.getTaskName());
//                            evaluateTaskSetService.save(entityPO);
//                        }
//                    }
//                }
//            } else if (evaluateTask.getType() == 1){ //部门评优
//                //获取所有部门保存
//                List<Dept> list = deptService.list();
//                for (Dept dept: list) {
//                    EvaluateTaskSetEntity entityPO = new EvaluateTaskSetEntity();
//                    entityPO.setEvaluateTaskId(evaluateTask.getId());
//                    entityPO.setDeptId(dept.getId());
//                    entityPO.setDeptName(dept.getDeptName());
//                    entityPO.setType(1);
//                    entityPO.setEvaluateTaskName(evaluateTask.getTaskName());
//                    evaluateTaskSetService.save(entityPO);
//                }
//            }
//
//        }
//        return ret;
//    }
    @Override
    @Transactional
    public boolean deleteLogic(List<Long> ids) {

 src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java

@@ -68,41 +68,4 @@
        return po;
    }

    public IPage<EvaluateTaskVO> companyListPageVO(IPage pages,Long userId) {
        List<EvaluateTaskVO> records = listVO(pages.getRecords());

        for (EvaluateTaskVO vo:records) {
            if (vo.getEvaluateState() == 1) {
                QueryWrapper<EvaluateCandidateEntity> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("evaluate_task_id", vo.getId());
                List<EvaluateCandidateEntity> candidateEntitieList = evaluateCandidateService.list(queryWrapper);
                List<Map<String,Object>> users = new ArrayList<>();
                for (EvaluateCandidateEntity evaluateCandidate:candidateEntitieList) {
                    Map<String,Object> user = new HashMap<>();
                    user.put("id",evaluateCandidate.getUserId());
                    user.put("name",evaluateCandidate.getUserName());
                    users.add(user);
                }
                vo.setSelfCandidate(users);

                //是否评论完成
                QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
                resultEntityQueryWrapper.eq("score_user_id", userId);
                resultEntityQueryWrapper.eq("type", 2);
                resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
                long reqCount = evaluateResultService.count(resultEntityQueryWrapper);

                vo.setIsEvaluateOk(reqCount > 0);
                if (reqCount > 0) {
                    vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
                }
            }
        }

        IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);
        return pageVo;
    }


}