Merge remote-tracking branch 'origin/v1.1.6.3_20240808_现场问题修复' into v1.1.6.3_20240808_现场问题修复

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/CmWorkflowServiceImpl.java

@@ -39,6 +39,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
         try {
             log.info("开始请求工作流启动接口:/start/batch,请求参数：{}", JSONObject.toJSONString(params));
             processTasks = workFlowFeignService.startForBatch(params).getResult();
+            log.info("请求工作流接口startBatch结束，返回结果：{}", JSONObject.toJSONString(processTasks));
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = getErrorMessage(e);
@@ -70,17 +71,18 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
         try {
             if(PASS_OPERATE.equals(operate)){
                 // 通过操作
-                log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                log.info("开始请求工作流-完成任务-接口:/complete/standard/{taskId},请求参数：{},{},{}", taskId, operate, JSONObject.toJSONString(data));
                 processTaskDTO = workFlowFeignService.completeByTaskFroStandard(taskId, data).getResult();
             } else if(REJECT_OPERATE.equals(operate)) {
                 // 驳回操作
-                log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                log.info("开始请求工作流-驳回任务-接口:/reject/{taskId},请求参数：{},{},{}", taskId, operate, JSONObject.toJSONString(data));
                 processTaskDTO = workFlowFeignService.reject(taskId, data).getResult();
             } else {
                 // 执行普通节点（提交）
-                log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{},{}", taskId, operate, JSONObject.toJSONString(data));
                 processTaskDTO = workFlowFeignService.completeByTaskFroStandard(taskId, data).getResult();
             }
+            log.info("请求工作流接口completeOrReject结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = getErrorMessage(e);
@@ -96,7 +98,9 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
     @Override
     public ProcessTaskDTO rollBack(String processInstanceId) {
         log.info("开始请求工作流撤回接口:/rollBack/standard/{processInstanceId},请求参数：{}", processInstanceId);
-        return FeignUtil.remoteCall(() -> workFlowFeignService.rollBackTask(processInstanceId));
+        ProcessTaskDTO processTaskDTO = FeignUtil.remoteCall(() -> workFlowFeignService.rollBackTask(processInstanceId));
+        log.info("请求工作流接口rollBack结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
+        return processTaskDTO;
     }
 
 
@@ -106,6 +110,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
         try {
             log.info("开始请求工作流转办任务接口:/assign/{taskVo},请求参数：{}", taskVo);
             processTaskDTO = workFlowFeignService.assign(taskVo).getResult();
+            log.info("请求工作流接口assign结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = getErrorMessage(e);
@@ -125,6 +130,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
         try {
             log.info("开始请求工作流终止流程接口:/stopProcess/{processInstanceId},请求参数：{}，{}", processInstanceId, stopReason);
             processTaskDTO = workFlowFeignService.stopProcess(processInstanceId, stopReason).getResult();
+            log.info("请求工作流接口stopProcess结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = getErrorMessage(e);

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/JgVehicleInformationServiceImpl.java

@@ -51,6 +51,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
@@ -89,6 +90,7 @@ import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistration
  * @date 2024-03-18
  */
 @Service
+@Slf4j
 public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInformationDto, JgVehicleInformation, JgVehicleInformationMapper> implements IJgVehicleInformationService {
     public static final String SUBMIT_DATA = "0";
     public static final String SUBMIT_TYPE_FLOW = "1";
@@ -687,6 +689,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             List<WorkflowResultDto> resultDto = commonService.buildWorkFlowInfo(processTaskDTOS);
             if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
                 WorkflowResultDto workflowResultDto = resultDto.get(0);
+                log.info("车用气瓶使用登记-执行工作流结束-workflowResultDto：{}", JSON.toJSONString(workflowResultDto));
                 this.updateData(jgVehicleInformation.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE, equDefineCode);
             }
             this.delRepeatUseEquipData(jgVehicleInformation);