diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 468d8fb6..3c3f4774 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -194,6 +194,8 @@ public interface Constants { //用户组 String USER_GROUP_ADMINISTRATOR = "ADMINISTRATORS"; + //外协 + String USER_GROUP_WX_USER = "WX_USER"; //车间调度 String USER_GROUP_CJDD = "CJDD"; //总计划 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index 32801b0d..241bcae7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -212,7 +212,9 @@ public class SfcDispatchController { result = sfcDispatchService.page(frontPage.getPagePlus(), queryWrapper); return R.ok(result); } - @PostMapping("/gantt-list") + + + @GetMapping("/gantt-list") public R ganttList(@RequestParam(required = false) Map paramMap) { Map result = new HashMap<>(); @@ -229,6 +231,4 @@ public class SfcDispatchController { return R.ok(result); } - - } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 1192b2e5..57064170 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -107,6 +108,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, startFromDate, StartToDate); map.put("workCenterWorkTimes", processedMap);