功能优化
This commit is contained in:
parent
192a5d8066
commit
5b4de0a5e6
|
|
@ -325,13 +325,12 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
|
|||
List<String> postIdList = outsourcerEvaluateDao.getPjTaskEvaluatedPostId(o);
|
||||
Collections.sort(deptIdList);
|
||||
Collections.sort(postIdList);
|
||||
int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
|
||||
String evaluateType = o.getEvaluateType();
|
||||
//对两次查询的结果判断是否完全相同
|
||||
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) {
|
||||
//新增二级审核
|
||||
|
|
@ -350,12 +349,16 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
|
|||
//汇总审核结束 更新状态
|
||||
outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
|
||||
//添加到月度排名表
|
||||
addMonthRank(o);
|
||||
// addMonthRank(o);
|
||||
} else {
|
||||
//过程中 暂不做处理
|
||||
|
||||
}
|
||||
}
|
||||
if (startId == 0 && "3".equals(evaluateType)) {
|
||||
//添加到月度排名表
|
||||
addMonthRank(o);
|
||||
}
|
||||
if ("1".equals(o.getType())) {
|
||||
outsourcerEvaluateDao.updateEvalStatus("3", o.getEvaluateId());
|
||||
} else {
|
||||
|
|
@ -442,9 +445,9 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
|
|||
Collections.sort(deptIdList);
|
||||
Collections.sort(postIdList);
|
||||
//对两次查询的结果判断是否完全相同
|
||||
int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
|
||||
String evaluateType = o.getEvaluateType();
|
||||
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)) {
|
||||
|
||||
|
|
@ -465,17 +468,13 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
|
|||
} else if (startId == 0 && "3".equals(evaluateType)) {
|
||||
//汇总审核结束 更新状态
|
||||
outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
|
||||
// //添加到月度排名表
|
||||
// addMonthRank(o);
|
||||
//添加到月度排名表
|
||||
addMonthRank(o);
|
||||
} else {
|
||||
//过程中 暂不做处理
|
||||
|
||||
}
|
||||
}
|
||||
if (startId == 0 && "3".equals(evaluateType)) {
|
||||
//添加到月度排名表
|
||||
addMonthRank(o);
|
||||
}
|
||||
if ("1".equals(o.getType())) {
|
||||
outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue