From 3db2ea3615b313f2d5788ac982a5fabfb4b2c7d6 Mon Sep 17 00:00:00 2001 From: zfh <15856818120@163.com> Date: Thu, 27 Feb 2025 11:25:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InitiateEvaluateController.java | 10 ++ .../OutsourcerEvaluateController.java | 124 +++++++++++------- .../evaluate/dao/OutsourcerEvaluateDao.java | 4 + .../evaluate/OutsourcerEvaluateMapper.xml | 7 + 4 files changed, 94 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java index 1c49405..8acc14d 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java @@ -33,6 +33,11 @@ public class InitiateEvaluateController { @Resource private InitiateEvaluateDao dao; + /** + * 获取外包商评价列表 + * @param o + * @return + */ @GetMapping("getInitiateEvaluateList") @ResponseBody public AjaxRes getInitiateEvaluateList(InitiateEvaluateBean o){ @@ -142,6 +147,11 @@ public class InitiateEvaluateController { return tree; } + /** + * 新增外包商评价 + * @param o + * @return + */ @RequestMapping("submitInitiateEvaluate") @ResponseBody public AjaxRes submitInitiateEvaluate(InitiateEvaluateBean o) { diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java index 9fb2996..18efc20 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java @@ -94,6 +94,11 @@ public class OutsourcerEvaluateController extends BaseController deptIdList = outsourcerEvaluateDao.getPjEvaluateResultDeptId(o); + //从pj_task_evaluated 根据evaluate_id 查询需要评价的postId + List postIdList = outsourcerEvaluateDao.getPjTaskEvaluatedPostId(o); + Collections.sort(deptIdList); + Collections.sort(postIdList); + //对两次查询的结果判断是否完全相同 + if (deptIdList.equals(postIdList)){ + int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o); + String evaluateType = o.getEvaluateType(); + System.err.println("startId:"+startId+" ,evaluateType="+evaluateType); + if(startId == 0 && "1".equals(evaluateType)){ + + int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); + if(examineNum == 0){ + //新增二级审核 + ExamineBean childBean = new ExamineBean(); + childBean.setEvaluateId(o.getEvaluateId()); + //添加汇总审核人id + childBean.setUserList(String.valueOf(String.join(",",stringList))); + //添加汇总审核人姓名 + childBean.setPostId("7"); + childBean.setEvaluateType("0"); + childBean.setEvaluateNode("1"); + outsourcerEvaluateDao.addExaminePerson(childBean); + } + + } else if (startId == 0 && "3".equals(evaluateType)) { + //汇总审核结束 更新状态 + outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); + //添加到月度排名表 + addMonthRank(o); + }else{ + //过程中 暂不做处理 - int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); - if(examineNum == 0){ - //新增二级审核 - ExamineBean childBean = new ExamineBean(); - childBean.setEvaluateId(o.getEvaluateId()); - //添加汇总审核人id - childBean.setUserList(String.valueOf(String.join(",",stringList))); - //添加汇总审核人姓名 - childBean.setPostId("7"); - childBean.setEvaluateType("0"); - childBean.setEvaluateNode("1"); - outsourcerEvaluateDao.addExaminePerson(childBean); } - - } else if (startId == 0 && "2".equals(evaluateType)) { - //汇总审核结束 更新状态 - outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); - //添加到月度排名表 - addMonthRank(o); - }else{ - //过程中 暂不做处理 - } if("1".equals(o.getType())){ outsourcerEvaluateDao.updateEvalStatus("3",o.getEvaluateId()); @@ -295,34 +309,42 @@ public class OutsourcerEvaluateController extends BaseController deptIdList = outsourcerEvaluateDao.getPjEvaluateResultDeptId(o); + //从pj_task_evaluated 根据evaluate_id 查询需要评价的postId + List postIdList = outsourcerEvaluateDao.getPjTaskEvaluatedPostId(o); + Collections.sort(deptIdList); + Collections.sort(postIdList); + //对两次查询的结果判断是否完全相同 + if (deptIdList.equals(postIdList)){ + int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o); + String evaluateType = o.getEvaluateType(); + System.err.println("startId:"+startId+" ,evaluateType="+evaluateType); + if(startId == 0 && "1".equals(evaluateType)){ + + int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); + if(examineNum == 0){ + //新增二级审核 + ExamineBean childBean = new ExamineBean(); + childBean.setEvaluateId(o.getEvaluateId()); + //添加汇总审核人id + childBean.setUserList(String.valueOf(String.join(",",stringList))); + //添加汇总审核人姓名 + childBean.setPostId("7"); + childBean.setEvaluateType("0"); + childBean.setEvaluateNode("1"); + outsourcerEvaluateDao.addExaminePerson(childBean); + } + + } else if (startId == 0 && "3".equals(evaluateType)) { + //汇总审核结束 更新状态 + outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); + //添加到月度排名表 + addMonthRank(o); + }else{ + //过程中 暂不做处理 } - - - - } else if (startId == 0 && "2".equals(evaluateType)) { - //汇总审核结束 更新状态 - - }else{ - //过程中 - } if("1".equals(o.getType())){ outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId()); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java index 08fac6f..e300797 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java @@ -147,4 +147,8 @@ public interface OutsourcerEvaluateDao { * @param o */ void updateEvalStatus(@Param("status") String status,@Param("id")String id); + + List getPjEvaluateResultDeptId(EvaluateDataBean o); + + List getPjTaskEvaluatedPostId(EvaluateDataBean o); } diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index a62dddb..0c08289 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -795,6 +795,13 @@ select count(1) from pj_evaluate_details where evaluate_id = #{evaluateId} and post_id = #{deptId} and check_two = '1' and sub_evaluate_id = #{templateId} + + update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}