Merge branch 'master' of http://192.168.0.75:3000/liux/gs_sub_evaluate

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) {

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java

@@ -94,6 +94,11 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
     }
 
 
+    /**
+     * 外包商评价
+     * @param o
+     * @return
+     */
     @RequestMapping("saveEvaluateData")
     @ResponseBody
     public AjaxRes saveEvaluateData(EvaluateDataBean o) {
@@ -190,33 +195,42 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
         //修改pj_evaluate状态
         outsourcerEvaluateDao.updatePjEvaluateDetailsStatusByThreeParams(o);
 
-        int startId  = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
+        //从result表根据evaluate_id对deptId分类查询已经评价的deptId
-        String evaluateType = o.getEvaluateType();
+        List<String> deptIdList = outsourcerEvaluateDao.getPjEvaluateResultDeptId(o);
-        System.err.println("startId:"+startId+" ,evaluateType="+evaluateType);
+        //从pj_task_evaluated 根据evaluate_id 查询需要评价的postId
-        if(startId == 0 && "1".equals(evaluateType)){
+        List<String> 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<EvaluateSubBean
                 o.setIsApprove("1");
                 outsourcerEvaluateDao.updatepjEvaluateDetailsStatus(o);
             }
-            //查询是否要开启汇总审核
+            //从result表根据evaluate_id对deptId分类查询已经评价的deptId
-            int startId  = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
+            List<String> deptIdList = outsourcerEvaluateDao.getPjEvaluateResultDeptId(o);
-            String evaluateType = o.getEvaluateType();
+            //从pj_task_evaluated 根据evaluate_id 查询需要评价的postId
-            System.err.println("startId:"+startId+" ,evaluateType="+evaluateType);
+            List<String> postIdList = outsourcerEvaluateDao.getPjTaskEvaluatedPostId(o);
-            if(startId == 0 && "1".equals(evaluateType)){
+            Collections.sort(deptIdList);
-                int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1");
+            Collections.sort(postIdList);
-                if(examineNum == 0){
+            //对两次查询的结果判断是否完全相同
-                    //新增二级审核
+            if (deptIdList.equals(postIdList)){
-                    ExamineBean childBean = new ExamineBean();
+                int startId  = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
-                    childBean.setEvaluateId(o.getEvaluateId());
+                String evaluateType = o.getEvaluateType();
-                    //添加汇总审核人id
+                System.err.println("startId:"+startId+" ,evaluateType="+evaluateType);
-                    childBean.setUserList(String.valueOf(String.join(",",stringList)));
+                if(startId == 0 && "1".equals(evaluateType)){
-                    //添加汇总审核人姓名
+
-                    childBean.setPostId("7");
+                    int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1");
-                    childBean.setEvaluateType("0");
+                    if(examineNum == 0){
-                    childBean.setEvaluateNode("1");
+                        //新增二级审核
-                    outsourcerEvaluateDao.addExaminePerson(childBean);
+                        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());

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<String> getPjEvaluateResultDeptId(EvaluateDataBean o);
+
+    List<String> getPjTaskEvaluatedPostId(EvaluateDataBean o);
 }

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}
     </select>
+    <select id="getPjEvaluateResultDeptId" resultType="java.lang.String">
+        select dept_id from pj_evaluate_result where evaluate_id =#{evaluateId} group by
+            dept_id
+    </select>
+    <select id="getPjTaskEvaluatedPostId" resultType="java.lang.String">
+        select post_id from pj_task_evaluated where evaluate_id =#{evaluateId}
+    </select>
 
     <update id="updateEvaluateRecordByEvaluateId">
         update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}