diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java index 7efb706f..abefb3e6 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java @@ -29,9 +29,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import java.util.*; +import java.util.stream.Collectors; /** * 部门动态审批人 v2 @@ -61,6 +63,8 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac @Autowired private ResourceService resourceService; @Autowired + private JdbcTemplate jdbcTemplate; + @Autowired private TAbilityApplicationService tAbilityApplicationService; @Override @@ -127,31 +131,16 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac if (kv.containsKey("tAbilityApplicationDTOList")) { dtoList = (List) kv.get("tAbilityApplicationDTOList"); } + String[] sqls; if (auditingBaseDTO.getReject() != null && auditingBaseDTO.getReject() == Boolean.TRUE) { // 存在被拒绝的节点 - + sqls = dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET del_flag = 0,approve_status = '不通过' WHERE id = %s", i.getId())) + .collect(Collectors.toList()).toArray(new String[dtoList.size()]); } else { - + sqls = dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET del_flag = 0,approve_status = '通过' WHERE id = %s", i.getId())) + .collect(Collectors.toList()).toArray(new String[dtoList.size()]); } + jdbcTemplate.batchUpdate(sqls); } - -// builder.registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> new Date(json.getAsJsonPrimitive().getAsLong())); -// -// Gson gson = builder.create(); -// JsonElement jsonElement = gson.toJsonTree(kv); -// TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class); -// if (abilityApplicationDTO != null) { -// if (abilityApplicationDTO.getReject() != null && abilityApplicationDTO.getReject() == Boolean.TRUE) { // 存在被拒绝的节点 -// abilityApplicationDTO.setDelFlag(0); -// abilityApplicationDTO.setApproveStatus("不通过"); -// tAbilityApplicationService.update(abilityApplicationDTO); -// logger.error("审批不通过!申请id:" + abilityApplicationDTO.getId()); -// } else { -// abilityApplicationDTO.setDelFlag(0); -// abilityApplicationDTO.setApproveStatus("通过"); -// tAbilityApplicationService.update(abilityApplicationDTO); -// logger.error("审批通过!申请id:" + abilityApplicationDTO.getId()); -// } -// } } /** @@ -199,7 +188,7 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac try { logger.error("流程参数异常" + JSON.toJSONString(kv)); } catch (Exception exception) { - logger.error("", exception); + logger.error("流程参数异常", exception); } } } @@ -222,13 +211,13 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac if (kv.get("gatewayCode") != null || !ActTaskService.Task_HANDLE_STATE_AGREE.equals(kv.get(ActTaskService.Task_HANDLE_STATE))) return; try { - GsonBuilder builder = new GsonBuilder(); - builder.registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> new Date(json.getAsJsonPrimitive().getAsLong())); - - Gson gson = builder.create(); - JsonElement jsonElement = gson.toJsonTree(kv); - TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class); - applyCode(delegateTask, abilityApplicationDTO); + List dtoList = new ArrayList<>(); + if (kv.containsKey("tAbilityApplicationDTOList")) { + dtoList = (List) kv.get("tAbilityApplicationDTOList"); + } + dtoList.stream().forEach(index -> { + applyCode(delegateTask, index); // 列表内都执行 + }); } catch (Exception e) { logger.error(e.getLocalizedMessage(), e); }