分包商审核只要评价人提交就能看到审核数据
This commit is contained in:
parent
43a3f0bc82
commit
f3b5c732a1
|
|
@ -159,4 +159,6 @@ public interface OutsourcerEvaluateDao {
|
||||||
List<String> getOrgList();
|
List<String> getOrgList();
|
||||||
|
|
||||||
Integer selectScore(EvaluateDataBean o);
|
Integer selectScore(EvaluateDataBean o);
|
||||||
|
|
||||||
|
Integer getExaminePerson(ExamineBean o);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ public interface OutsourcerEvaluateService {
|
||||||
*/
|
*/
|
||||||
int isWait(String evaluateId);
|
int isWait(String evaluateId);
|
||||||
|
|
||||||
int addExaminePerson(ExamineBean o);
|
void addExaminePerson(ExamineBean o);
|
||||||
|
|
||||||
//根据评价id 获取需要审核的部门数
|
//根据评价id 获取需要审核的部门数
|
||||||
int examineNumByEvaluateId(String evaluateId);
|
int examineNumByEvaluateId(String evaluateId);
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -435,17 +433,16 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
||||||
examineBean.setUserId(userId);
|
examineBean.setUserId(userId);
|
||||||
if ("0".equals(deptId) || ("1".equals(orgType) && "评价人".equals(roleName))) {
|
if ("0".equals(deptId) || ("1".equals(orgType) && "评价人".equals(roleName))) {
|
||||||
System.err.println("项目部或者事业部评价人");
|
System.err.println("项目部或者事业部评价人");
|
||||||
int num = isWait(o.getEvaluateId());
|
// int num = isWait(o.getEvaluateId());
|
||||||
System.err.println("isWait==" + num);
|
// System.err.println("isWait==" + num);
|
||||||
if (num <= 0) {
|
// if (num <= 0) {
|
||||||
addExaminePerson(examineBean);
|
addExaminePerson(examineBean);
|
||||||
}
|
// }
|
||||||
} else {
|
} else {
|
||||||
System.err.println("其他部门,直接去审核");
|
System.err.println("其他部门,直接去审核");
|
||||||
//直接去审核
|
//直接去审核
|
||||||
addExaminePerson(examineBean);
|
addExaminePerson(examineBean);
|
||||||
}
|
}
|
||||||
//
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||||
|
|
@ -1288,7 +1285,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int addExaminePerson(ExamineBean o) {
|
public void addExaminePerson(ExamineBean o) {
|
||||||
String postId = o.getPostId();
|
String postId = o.getPostId();
|
||||||
//如果是项目部,则获取事业部orgId 插入
|
//如果是项目部,则获取事业部orgId 插入
|
||||||
if (postId != null && "0".equals(postId)) {
|
if (postId != null && "0".equals(postId)) {
|
||||||
|
|
@ -1300,7 +1297,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
||||||
stringList.addAll(dao.getExaminePersonByDeptAndRoleName(o.getPostId(), "汇总审批人"));
|
stringList.addAll(dao.getExaminePersonByDeptAndRoleName(o.getPostId(), "汇总审批人"));
|
||||||
}
|
}
|
||||||
o.setUserList(String.join(",", stringList));
|
o.setUserList(String.join(",", stringList));
|
||||||
return dao.addExaminePerson(o);
|
if (dao.getExaminePerson(o) == 0){
|
||||||
|
dao.addExaminePerson(o);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -834,6 +834,28 @@
|
||||||
where
|
where
|
||||||
evaluate_id = #{evaluateId} and post_id = #{deptId} and details_id = #{detailsId} and score is null
|
evaluate_id = #{evaluateId} and post_id = #{deptId} and details_id = #{detailsId} and score is null
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getExaminePerson" resultType="java.lang.Integer">
|
||||||
|
SELECT
|
||||||
|
count(*)
|
||||||
|
FROM
|
||||||
|
pj_task_examine
|
||||||
|
WHERE 1=1
|
||||||
|
<if test="evaluateId != null">
|
||||||
|
AND evaluate_id = #{evaluateId}
|
||||||
|
</if>
|
||||||
|
<if test="postId != null">
|
||||||
|
AND post_id = #{postId}
|
||||||
|
</if>
|
||||||
|
<if test="userList != null">
|
||||||
|
AND user_list = #{userList}
|
||||||
|
</if>
|
||||||
|
<if test="evaluateType != null">
|
||||||
|
AND evaluate_type = #{evaluateType}
|
||||||
|
</if>
|
||||||
|
<if test="evaluateNode != null">
|
||||||
|
AND evaluate_node = #{evaluateNode}
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
|
|
||||||
<update id="updateEvaluateRecordByEvaluateId">
|
<update id="updateEvaluateRecordByEvaluateId">
|
||||||
update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}
|
update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue