初始化提交

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneDetailsServiceImpl.java

@@ -56,6 +56,9 @@ public class RollClubOneDetailsServiceImpl extends ServiceImpl<RollClubOneDetail
         String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
         String shift = getShiftInfo(ccmNo, "class:shift:%s");
 
+        rollOnDutyVo.setShiftGroup(shiftGroup);
+        rollOnDutyVo.setShift(shift);
+
         // 获取交班记录
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/impl/RollClubThreeDetailsServiceImpl.java

@@ -55,6 +55,9 @@ public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDe
         String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
         String shift = getShiftInfo(ccmNo, "class:shift:%s");
 
+        rollOnDutyVo.setShiftGroup(shiftGroup);
+        rollOnDutyVo.setShift(shift);
+
         // 2. 获取交班记录
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/service/impl/RollClubTwoDetailsServiceImpl.java

@@ -54,6 +54,9 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
         String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
         String shift = getShiftInfo(ccmNo, "class:shift:%s");
 
+        rollOnDutyVo.setShiftGroup(shiftGroup);
+        rollOnDutyVo.setShift(shift);
+
         // 2. 获取交班记录
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/service/impl/RollHeightDetailsServiceImpl.java

@@ -56,6 +56,9 @@ public class RollHeightDetailsServiceImpl extends ServiceImpl<RollHeightDetailsM
         String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
         String shift = getShiftInfo(ccmNo, "class:shift:%s");
 
+        rollOnDutyVo.setShiftGroup(shiftGroup);
+        rollOnDutyVo.setShift(shift);
+
         // 获取交班记录
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/impl/RollOutShippDetailsServiceImpl.java

@@ -53,6 +53,9 @@ public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDeta
         String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
         String shift = getShiftInfo(ccmNo, "class:shift:%s");
 
+        rollOnDutyVo.setShiftGroup(shiftGroup);
+        rollOnDutyVo.setShift(shift);
+
         // 2. 获取交班记录
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -6418,10 +6418,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     rollDetail.setCarAllNum(bill.getCarAllNum());
                     rollDetail.setRollAmount(bill.getAmountTotal());
                     rollDetail.setLicensePlate(bill.getLicensePlate());
+                    rollDetail.setOutTime(bill.getOutTime());
                     rollDetail.setType("热装");
                     return rollDetail;
                 })
-                .sorted(Comparator.comparing(StorageCenterCarVO.RollDetail::getCarAllNum))
+                .sorted(Comparator.comparing(
+                        StorageCenterCarVO.RollDetail::getOutTime,
+                        Comparator.nullsLast(Comparator.reverseOrder())
+                ))
                 .collect(Collectors.toList());
     }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/vo/RollOnDutyDataVo.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.billet.storageBill.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -7,6 +8,12 @@ import java.util.List;
 @Data
 public class RollOnDutyDataVo {
 
+    @ApiModelProperty(value = "班组")
+    private String shiftGroup;
+
+    @ApiModelProperty(value = "班别")
+    private String shift;
+
     private List<RollOnDutyInfoVo> rollOnDutyInfoList;
 
     private List<RollOnDutyRecordVo> rollOnDutyRecordList;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/vo/StorageCenterCarVO.java

@@ -1,9 +1,12 @@
 package org.jeecg.modules.billet.storageBill.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -58,5 +61,10 @@ public class StorageCenterCarVO {
         @ApiModelProperty(value = "类型（热装/热送）")
         private String type;
 
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty(value = "发车时间")
+        private Date outTime;
+
     }
 }

zgztBus/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml

@@ -13,22 +13,22 @@ db:
   num: 1
 
   url:
-#    '0': jdbc:mysql://192.168.1.190:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-#  研发环境
-   '0': jdbc:mysql://123.57.213.14:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-#  本地环境
-#   '0': jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    #    '0': jdbc:mysql://192.168.1.190:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    #  研发环境
+    #   '0': jdbc:mysql://123.57.213.14:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    #  本地环境
+    '0': jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
   user:
     '0': root
   password:
-    '0': 1qaz2wsx@..
+    '0': root
 management:
   metrics:
     export:
       elastic:
         enabled: false
-#      influx:
-#        enabled: false
+  #      influx:
+  #        enabled: false
   health:
     rabbit:
       enabled: false