生产派工&甘特图&质量代办事项修改。

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";
     //总计划

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<String, Object> result = new HashMap<>();
 
@@ -229,6 +231,4 @@ public class SfcDispatchController {
 
         return R.ok(result);
     }
-
-
 }

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<SfcDispatchMapper, SfcDi
                 if (Constants.USER_GROUP_ADMINISTRATOR.equals(userGroup)) {
                     role = Constants.USER_GROUP_ADMINISTRATOR;
                     break;
+                } else if (Constants.USER_GROUP_WX_USER.equals(userGroup)) {
+                    role = Constants.USER_GROUP_WX_USER;
+                    break;
                 } else if (Constants.USER_GROUP_CJDD.equals(userGroup)) {
                     role = Constants.USER_GROUP_CJDD;
                     break;
@@ -300,8 +304,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             }
         });
 
-        Date startFromDate = (Date) paramMap.get("startFromDate");
+        Date startFromDate = DateUtil.parseDate((String)paramMap.get("startFromDate"));
-        Date StartToDate = (Date) paramMap.get("StartToDate");
+        Date StartToDate = DateUtil.parseDate((String)paramMap.get("StartToDate"));
         Map<String, Map<String, List<WorkCenterWorkTimeDTO>>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, startFromDate, StartToDate);
         map.put("workCenterWorkTimes", processedMap);