diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java index 258b7f4..3449a3e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController.java @@ -14,6 +14,7 @@ import com.bonus.sgzb.material.vo.NoticeInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,6 +30,8 @@ import java.util.List; @RestController @RequestMapping("/todo") public class ToDoController extends BaseController { + + @Qualifier("toDoServiceImpl") @Autowired private ToDoService toDoService; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java index cdcc077..25e9458 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_CQ.java @@ -9,6 +9,7 @@ import com.bonus.sgzb.material.vo.NoticeInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -22,6 +23,8 @@ import java.util.List; @RestController @RequestMapping("/cq/todo") public class ToDoController_CQ extends BaseController { + + @Qualifier("toDoServiceImpl_CQ") @Autowired private ToDoService toDoService; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java index 73b9634..35dd8dd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ToDoController_GZ.java @@ -9,6 +9,7 @@ import com.bonus.sgzb.material.vo.NoticeInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -22,6 +23,8 @@ import java.util.List; @RestController @RequestMapping("/gz/todo") public class ToDoController_GZ extends BaseController { + + @Qualifier("toDoServiceImpl_GZ") @Autowired private ToDoService toDoService; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java index 49a1899..56715a7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl.java @@ -55,9 +55,10 @@ public class ToDoServiceImpl implements ToDoService { public AjaxResult getTaskType(ToDoBean bean) { List list =new ArrayList<>(); try { + log.info("通用机具-代办事件-开始查询"); list = toDoMapper.getTaskType(bean); } catch (Exception e) { - log.error("代办事件-查询失败", e); + log.error("通用机具-代办事件-查询失败", e); } return AjaxResult.success(list); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java index 29a0c54..7c7b707 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_CQ.java @@ -2,12 +2,8 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.ToDoBean; -import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; -import com.bonus.sgzb.material.mapper.ToDoMapper; import com.bonus.sgzb.material.mapper.ToDoMapper_CQ; -import com.bonus.sgzb.material.mapper.ToDoMapper_GZ; import com.bonus.sgzb.material.service.ToDoService; -import com.bonus.sgzb.system.api.RemoteUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -25,6 +21,7 @@ public class ToDoServiceImpl_CQ extends ToDoServiceImpl implements ToDoService { public AjaxResult getTaskType(ToDoBean bean) { List list =new ArrayList<>(); try { + log.info("重庆机具-代办事件-开始查询"); list = toDoMapper_cq.getTaskType(bean); } catch (Exception e) { log.error("重庆机具-代办事件-查询失败", e); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java index fb69dc4..c65137e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ToDoServiceImpl_GZ.java @@ -4,7 +4,6 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.ToDoBean; import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; import com.bonus.sgzb.material.mapper.ToDoMapper; -import com.bonus.sgzb.material.mapper.ToDoMapper_CQ; import com.bonus.sgzb.material.mapper.ToDoMapper_GZ; import com.bonus.sgzb.material.service.ToDoService; import com.bonus.sgzb.system.api.RemoteUserService; @@ -34,6 +33,7 @@ public class ToDoServiceImpl_GZ extends ToDoServiceImpl implements ToDoService { public AjaxResult getTaskType(ToDoBean bean) { List list =new ArrayList<>(); try { + log.info("南网机具-代办事件-开始查询"); list = toDoMapper_gz.getTaskType(bean); } catch (Exception e) { log.error("南网仓储-代办事件-查询失败", e);