楚江ERP-增加调试日志

@@ -7,6 +7,7 @@ import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.*;
@@ -30,6 +31,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -56,6 +58,7 @@ import java.util.stream.Collectors;
 @Validated
 @RestController
 @RequestMapping("/customer/develop")
+@Slf4j
 public class CustomerDevelopPlanController extends DefaultBaseController {
 
 
@@ -88,6 +91,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         if (!CollectionUtil.isEmpty(dataList)) {
             results = this.packCustomerDevelopData(dataList);
         }
+        log.info("====================== CustomerDevelopPlanController.query results:{}", JsonUtil.toJsonString(results));
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
     }
 
@@ -220,9 +224,12 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         if (CollectionUtils.isNotEmpty(officeList)) {
             officeMap = officeList.stream().collect(Collectors.toMap(Office::getId, Function.identity()));
         }
+        log.info("=================== packCustomerDevelopData SecurityUtil.getCurrentUser.getId =================={}"
+                , JsonUtil.toJsonString(SecurityUtil.getCurrentUser().getId()));
         // 获取流程任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo()
                 , SecurityUtil.getCurrentUser().getId());
+        log.info("=================== packCustomerDevelopData flowTaskList =================={}", JsonUtil.toJsonString(flowTaskList));
         Map<String, FlowTaskDto> flowTaskMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
             flowTaskMap = flowTaskList.stream().collect(Collectors.toMap(FlowTaskDto::getBusinessId, Function.identity()));

@@ -3,11 +3,7 @@ package com.lframework.xingyun.sc.impl.customer;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
-import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
-import com.lframework.starter.bpm.entity.FlowDefinitionWrapper;
-import com.lframework.starter.bpm.enums.FlowDefinitionExtBizType;
-import com.lframework.starter.bpm.enums.FlowDefinitionIsPublish;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
@@ -24,9 +20,9 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.warm.flow.core.dto.FlowParams;
 import org.dromara.warm.flow.core.entity.Instance;
 import org.dromara.warm.flow.core.service.InsService;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +38,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+
 @Service
+@Slf4j
 public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDevelopPlanMapper, CustomerDevelopPlan> implements CustomerDevelopPlanService {
 
 
@@ -89,8 +87,11 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if ("COMPLETED".equals(todoType)) {
             vo.setStatus(CustomerDevelopStatus.PASS.getCode());
         } else if ("WAIT".equals(todoType)) {
+            log.info("=================== CustomerDevelopPlanService.query SecurityUtil.getCurrentUser.getId =================={}"
+                    , JsonUtil.toJsonString(SecurityUtil.getCurrentUser().getId()));
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            log.info("=================== CustomerDevelopPlanService.query flowTaskList =================={}", JsonUtil.toJsonString(flowTaskList));
             if (CollectionUtils.isEmpty(flowTaskList)) {
                 return new PageResult<>();
             }