|
@@ -71,13 +71,17 @@ public class EVController {
|
|
|
"JSON_UNQUOTE(JSON_EXTRACT(json_data, '$.flag')) as flag," +
|
|
|
"GROUP_CONCAT(create_user) as userId," +
|
|
|
"GROUP_CONCAT(nick_name) as nickName," +
|
|
|
- "sign_type as sigType" +
|
|
|
- " from u_task_batch where is_deleted=0 GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type ASC ";
|
|
|
+ "sign_type as sigType," +
|
|
|
+ "(select count(0) from u_task_parallel b where a.task_parallel_id = b.process_instance_id and b.is_deleted = 0 and (b.status = 1 or b.initiative = 1)) isSignature" +
|
|
|
+ " from u_task_batch a where is_deleted=0 GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type DESC ";
|
|
|
//and JSON_UNQUOTE(JSON_EXTRACT(json_data,'$.taskId')) in(SELECT id from u_task where project_id =1792760669353865218 and is_deleted =0 and approval_type=1 )
|
|
|
List<TaskSignInfoVO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TaskSignInfoVO.class));
|
|
|
|
|
|
if (query != null && query.size() >= 1) {
|
|
|
for (TaskSignInfoVO dataInfo : query) {
|
|
|
+ if(dataInfo.getSigType() == 2 && dataInfo.getIsSignature() > 0){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (executor.getQueue().size() <= 10) {
|
|
|
Boolean aBoolean = RedisTemplate.hasKey("sign-" + dataInfo.getFormDataId());
|
|
|
if (!aBoolean) {
|