司机评分修改

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -415,15 +415,15 @@ public class RemoteContractServiceImpl implements RemoteContractService {
     public KwcContractLogisticsDto findLogContractByEntId(Long entId) {
         //查询物流企业合同信息
         List<KwcContractLogisticsUnit> contractLogisticsUnits = kwcContractLogisticsUnitRepository.queryByEntIdAndEntType(entId, EntTypeEnum.LOGISTICS4.getCode());
-        if (contractLogisticsUnits == null) {
-            return new KwcContractLogisticsDto();
+        if (CollectionUtils.isEmpty(contractLogisticsUnits)) {
+            return null;
         }
         List<Long> contractIds = contractLogisticsUnits.stream().map(KwcContractLogisticsUnit::getContractId).distinct().collect(Collectors.toList());
 
         //查询自动派车且有效的物流合同
         List<KwcContractLogistics> kwcContractLogistics = contractLogisticsRepository.queryByIdsAndDispatch(contractIds);
-        if (kwcContractLogistics == null) {
-            return new KwcContractLogisticsDto();
+        if (CollectionUtils.isEmpty(kwcContractLogistics)) {
+            return null;
         }
         if (kwcContractLogistics.size() > 1) {
             throw new BusinessPlatfromException(ErrorCodeEnum.DATA_NOT_EXIST, "只能存在有且只有一条的自动派单有效的物流合同！");
@@ -459,7 +459,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
                 dto.setSupEntId(unit.getEntId());
             }
             return dto;
-        }).orElse(new KwcContractLogisticsDto());
+        }).orElse(null);
     }
 
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/DriverScorerDetailRequest.java

@@ -22,7 +22,6 @@ public class DriverScorerDetailRequest extends PageReq implements Serializable {
     /**
      * 评分id
      */
-    @NotNull(message = "评分id不能为空")
     @Schema(description = "评分id")
     private Long scoreId;
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/DriverScorerDetailVO.java

@@ -1,9 +1,11 @@
 package com.sckw.fleet.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Author: donglang
@@ -61,4 +63,11 @@ public class DriverScorerDetailVO {
     @Schema(description = "变动后评分")
     private BigDecimal score;
 
+    /**
+     * 时间
+     */
+    @Schema(description = "时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverConductRulesLogVO.java

@@ -75,6 +75,7 @@ public class KwfDriverConductRulesLogVO implements Serializable {
         rulesVO.setDescription(rules.getDescription());
         rulesVO.setCreateTime(rules.getCreateTime());
         rulesVO.setCreateUser(rules.getCreateUser());
+        rulesVO.setCreateTime(rules.getCreateTime());
 
         return rulesVO;
     }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverScoreService.java

@@ -302,7 +302,10 @@ public class KwfDriverScoreService {
      */
     public PageDataResult<DriverScorerDetailVO> queryScoreDetailPage(DriverScorerDetailRequest request) {
         log.info("分页查询司机评分明细：{}", JSON.toJSONString(request));
-
+        if (request.getScoreId() == null) {
+            log.info("司机评分id不能为空，司机id:{}", request.getDriverId());
+            return PageDataResult.empty(request.getPageNum(), request.getPageSize());
+        }
         LambdaQueryWrapper<KwfDriverScoreDetail> queryWrapper = Wrappers.<KwfDriverScoreDetail>lambdaQuery()
                 .eq(KwfDriverScoreDetail::getDriverId, request.getDriverId())
                 .eq(KwfDriverScoreDetail::getScoreId, request.getScoreId())

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -396,10 +396,6 @@ public class KwfDriverService {
      * @return
      */
     private void getDriverScore(String entId, String driverId, KwfDriverVo driver) {
-        if (true) {
-            return;
-        }
-
         if (StringUtils.isEmpty(entId) || StringUtils.isEmpty(driverId)) {
             return;
         }