添加参数

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -291,6 +291,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+                    taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
                     taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -324,6 +325,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+            taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
             params.put("model", taskMessageDto);
             commonServiceImpl.updateTaskModel(params);
         }
@@ -355,9 +357,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setStartUserCompanyName(jgUseRegistration.getUseUnitName());
         dto.setStartDate(new Date());
         jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
+        // 设备信息
+        LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
+        JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(lambda1);
         jgUseRegistration.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+        taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
         list.add(dto);
@@ -422,10 +429,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<JgUseRegistration> queryWrapper = new QueryWrapper<JgUseRegistration>().lambda();
         queryWrapper.eq(JgUseRegistration::getInstanceId, instanceId);
         JgUseRegistration data = this.baseMapper.selectOne(queryWrapper);
+        // 设备信息
+        LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(data.getSequenceNbr()));
+        JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(lambda1);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
         jsonObject.put("nextTaskId", data.getNextTaskId());
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
+        jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
         // 撤回删除代办
         commonServiceImpl.rollbackTask(instanceId, jsonObject);
     }
@@ -447,6 +459,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
+            jsonObject.put("status", jgUseRegistration.getStatus());
+            jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
             return jsonObject;
         }
         Map<String, Object> detail = this.baseMapper.getDetail(id);