Commit 69ad5cc7 by 丁伟峰

Merge branch 'feat-dingwf-mvp616' into develop

2 parents f0aa095f a53448bb
......@@ -31,7 +31,7 @@ public class WorkbenchController {
@GetMapping("/workbench/engineer/schedule/gantt")
public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO reqDTO) {
log.debug("getEngineersGanttList: {}", reqDTO);
log.info("getEngineersGanttList: {}", reqDTO);
Result<?> res = null;
try {
res = workbenchService.getEngineersGanttList(reqDTO);
......
......@@ -73,7 +73,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
@Override
public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO ganttReqDTO) {
// 按日期返回技术员们当天的服务甘特图,不需要翻页
log.debug("getEngineersGanttList: {}", ganttReqDTO);
log.info("getEngineersGanttList: {}", ganttReqDTO);
List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(ganttReqDTO.getDate(), ganttReqDTO.getEngineerCodes());
HashMap<String, List<?>> mapEngineers = new HashMap<>();
for (Object e : orderAppointments) {
......
......@@ -22,9 +22,9 @@ spring:
# - optional:nacos:datasource-config.yaml
datasource:
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
password: dituhui123456
password: 123456
type: com.alibaba.druid.pool.DruidDataSource
seata:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!