Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 69ad5cc7 by 丁伟峰
Options

Merge branch 'feat-dingwf-mvp616' into develop

2 parents f0aa095f a53448bb
Inline Side-by-side
Showing with 4 additions and 4 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/WorkbenchController.java
...@@ -31,7 +31,7 @@ public class WorkbenchController { ...@@ -31,7 +31,7 @@ public class WorkbenchController {
@GetMapping("/workbench/engineer/schedule/gantt") @GetMapping("/workbench/engineer/schedule/gantt")
public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO reqDTO) { public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO reqDTO) {
log.debug("getEngineersGanttList: {}", reqDTO); log.info("getEngineersGanttList: {}", reqDTO);
Result<?> res = null; Result<?> res = null;
try { try {
res = workbenchService.getEngineersGanttList(reqDTO); res = workbenchService.getEngineersGanttList(reqDTO);
......
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/WorkbenchServiceImpl.java
...@@ -73,7 +73,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -73,7 +73,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
@Override @Override
public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO ganttReqDTO) { public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO ganttReqDTO) {
// 按日期返回技术员们当天的服务甘特图，不需要翻页 // 按日期返回技术员们当天的服务甘特图，不需要翻页
log.debug("getEngineersGanttList: {}", ganttReqDTO); log.info("getEngineersGanttList: {}", ganttReqDTO);
List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(ganttReqDTO.getDate(), ganttReqDTO.getEngineerCodes()); List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(ganttReqDTO.getDate(), ganttReqDTO.getEngineerCodes());
HashMap<String, List<?>> mapEngineers = new HashMap<>(); HashMap<String, List<?>> mapEngineers = new HashMap<>();
for (Object e : orderAppointments) { for (Object e : orderAppointments) {
......
project-order/src/main/resources/application.yaml
...@@ -22,9 +22,9 @@ spring: ...@@ -22,9 +22,9 @@ spring:
# - optional:nacos:datasource-config.yaml # - optional:nacos:datasource-config.yaml
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.10.0.171:52003/saas_aftersale_test?serverTimezone=UTC url: jdbc:mysql://10.10.0.116:3306/saas_aftersale_test?serverTimezone=UTC
username: root username: root
password: dituhui123456 password: 123456
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
seata: seata:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!