Bläddra i källkod

修改变更令 任务人无法变绿的问题

zhuwei 3 dagar sedan
förälder
incheckning
745196ed5c

+ 14 - 2
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3007,8 +3007,11 @@ public class TaskController extends BladeController {
             }
 
             /*副任务状态*/
-            updateTaskParallelStatus(task);
-
+            if(task.getApprovalType()==11){ //变更令  走流程不需要电签
+                updateTaskParallelStatusByBGL(task);
+            }else {
+                updateTaskParallelStatus(task);
+            }
             Set<String> aopParamsSet = new HashSet<>();
             for (TaskParallel taskParallel : taskParallels) {
                 String param = taskParallel.getTaskUser() + "," + task.getProjectId() + "," + task.getContractId();
@@ -3866,6 +3869,15 @@ public class TaskController extends BladeController {
         return this;
     }
 
+    private void updateTaskParallelStatusByBGL(Task task) {
+        TaskParallel taskParallelOne = jdbcTemplate.query("SELECT * FROM u_task_parallel WHERE status=1 and process_instance_id = '" + task.getProcessInstanceId() + "' AND task_user = " + SecureUtil.getUserId(), new BeanPropertyRowMapper<>(TaskParallel.class)).stream().findAny().orElse(null);
+        if (taskParallelOne != null && taskParallelOne.getStatus().equals(1)) {
+            String sql = "UPDATE u_task_parallel SET status = ? ,update_time = ? ,e_visa_status=1,e_visa_content='电签成功',initiative=2, create_time = SYSDATE()  WHERE id = ?";
+            Object[] param = {2, new Date(), taskParallelOne.getId()};
+            jdbcTemplate.update(sql, param);
+        }
+    }
+
     private void updateTaskParallelStatus(Task task) {
         TaskParallel taskParallelOne = jdbcTemplate.query("SELECT * FROM u_task_parallel WHERE status=1 and process_instance_id = '" + task.getProcessInstanceId() + "' AND task_user = " + SecureUtil.getUserId(), new BeanPropertyRowMapper<>(TaskParallel.class)).stream().findAny().orElse(null);
         if (taskParallelOne != null && taskParallelOne.getStatus().equals(1)) {