Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

sckw-auth/src/main/java/com/sckw/auth/controller/AuthController.java

@@ -118,6 +118,17 @@ public class AuthController {
     }
 
 
+    /**
+     * @return HttpResult
+     * @desc: 根据token获取登录信息
+     * @author: czh
+     * @date: 2023/9/27
+     */
+    @PostMapping("getLoginResByToken")
+    public HttpResult getLoginResByToken(@RequestHeader(name = "Client-Type", required = true) String clientType,
+                                         @RequestHeader(name = "Access-Token", required = true) String token) {
+        return HttpResult.ok(authService.getLoginResByToken(clientType, token));
+    }
 
 
     /**

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo1.java

@@ -116,8 +116,14 @@ public class LoginResVo1 implements Serializable {
      */
     private String token;
 
+    /**
+     * 机构id
+     */
     private Long deptId;
 
+    /**
+     * 岗位角色id
+     */
     private Long roleId;
 
 }

sckw-auth/src/main/java/com/sckw/auth/service/IAuthService.java

@@ -2,6 +2,7 @@ package com.sckw.auth.service;
 
 import com.sckw.auth.model.vo.req.*;
 import com.sckw.auth.model.vo.res.LoginResVo;
+import com.sckw.auth.model.vo.res.LoginResVo1;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.web.response.HttpResult;
 
@@ -56,4 +57,12 @@ public interface IAuthService {
      **/
     HttpResult commonAuth(LoginBase loginBase);
 
+
+    /**
+     * @return LoginResVo1
+     * @desc: 根据token获取登录信息
+     * @author: czh
+     * @date: 2023/9/27
+     */
+    LoginResVo1 getLoginResByToken(String clientType, String token);
 }

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -13,6 +13,7 @@ import com.sckw.core.model.enums.ClientTypeEnum;
 import com.sckw.core.model.enums.LoginMethodEnum;
 import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.utils.*;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.model.EntCertificateInfo;
 import com.sckw.core.web.model.LoginEntInfo;
 import com.sckw.core.web.model.LoginUserInfo;
@@ -430,7 +431,7 @@ public class AuthServiceImpl implements IAuthService {
         LoginResVo1 loginRes = new LoginResVo1();
         loginRes.setId(user.getId());
         loginRes.setName(user.getName());
-        loginRes.setAccount(loginBase.getAccount());
+        loginRes.setAccount(user.getAccount());
         loginRes.setPhone(user.getPhone());
         loginRes.setPhoto(user.getPhoto());
         loginRes.setIsMain(user.getIsMain());
@@ -444,7 +445,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setEntTypes(enterprise != null ? enterprise.getEntTypes() : null);
         loginRes.setEntTypeNames(enterprise != null ? enterprise.getEntTypeNames() : null);
         loginRes.setClientType(loginBase.getClientType());
-        loginRes.setSystemType(loginBase.getSystemType());
+        loginRes.setSystemType(user.getSystemType());
         loginRes.setToken(token);
         loginRes.setDeptId(user.getDeptId());
         loginRes.setRoleId(user.getRoleId());
@@ -457,6 +458,49 @@ public class AuthServiceImpl implements IAuthService {
         return HttpResult.ok(loginRes);
     }
 
+
+    /**
+     * @return LoginResVo1
+     * @desc: 根据token获取登录信息
+     * @author: czh
+     * @date: 2023/9/27
+     */
+    @Override
+    public LoginResVo1 getLoginResByToken(String clientType, String token) {
+        KwsUserResDto user = systemService.queryUserDetails(LoginUserHolder.getAccount(), LoginUserHolder.getSystemType());
+        if (Objects.isNull(user)) {
+            return null;
+        }
+        EntCacheResDto enterprise = systemService.queryEntDetails(user.getEntId());
+        LoginResVo1 loginRes = new LoginResVo1();
+        loginRes.setId(user.getId());
+        loginRes.setName(user.getName());
+        loginRes.setAccount(user.getAccount());
+        loginRes.setPhone(user.getPhone());
+        loginRes.setPhoto(user.getPhoto());
+        loginRes.setIsMain(user.getIsMain());
+        loginRes.setStatus(user.getStatus());
+        loginRes.setRoleName(user.getRoleName());
+        loginRes.setDeptName(user.getDeptName());
+        loginRes.setClientId(user.getClientId());
+        loginRes.setEntId(user.getEntId());
+        loginRes.setFirmName(enterprise != null ? enterprise.getFirmName() : null);
+        loginRes.setApproval(enterprise != null ? enterprise.getApproval() : null);
+        loginRes.setEntTypes(enterprise != null ? enterprise.getEntTypes() : null);
+        loginRes.setEntTypeNames(enterprise != null ? enterprise.getEntTypeNames() : null);
+        loginRes.setSystemType(user.getSystemType());
+        loginRes.setClientType(clientType);
+        loginRes.setToken(token);
+        loginRes.setDeptId(user.getDeptId());
+        loginRes.setRoleId(user.getRoleId());
+        if (user.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
+            loginRes.setValid(true);
+        } else {
+            loginRes.setValid(!Objects.isNull(enterprise) && enterprise.getValid());
+        }
+        return loginRes;
+    }
+
     /**
      * @param loginBase {}
      * @param userId 用户ID

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/file/FileInfo.java

@@ -75,6 +75,7 @@ public class FileInfo implements Serializable {
 
     @NotNull(message = "文件删除标志不能为空")
     private Integer delFlag;
+
     @NotNull(message = "文件状态不能为空")
     private Integer status;
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/DateTimeUtil.java → sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateTimeUtil.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.utils;
+package com.sckw.core.utils;
 
 
 import java.time.LocalDate;
@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * @description: 时间工具类
- * @author: LengFaQiang
+ * @author: xucaiqin
  * @copyright
  * @create: 2022-01-27 16:04
  **/
@@ -26,6 +26,26 @@ public class DateTimeUtil {
     public static final DateTimeFormatter YYYY_MM = DateTimeFormatter.ofPattern(YM);
     public static final DateTimeFormatter HH_MM_SS = DateTimeFormatter.ofPattern(HMS);
 
+    /**
+     * 拼接 00:00:00
+     *
+     * @param localDate 日期
+     * @return yyyy-MM-dd 00:00:00
+     */
+    public static LocalDateTime appendStart(LocalDate localDate) {
+        return LocalDateTime.of(localDate, LocalTime.MIN);
+    }
+
+    /**
+     * 拼接 23:59:59
+     *
+     * @param localDate 日期
+     * @return yyyy-MM-dd 23:59:59
+     */
+    public static LocalDateTime appendEnd(LocalDate localDate) {
+        return LocalDateTime.of(localDate, LocalTime.MAX);
+    }
+
     public static LocalDateTime parse(String date) {
         return LocalDateTime.parse(date, YYYY_MM_DD_HH_MM_SS);
     }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -12,6 +12,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Objects;
 
+
 /**
  * 日期处理
  *
@@ -508,10 +509,7 @@ public class DateUtils extends DateUtil {
     }
 
     public static void main(String[] ager) throws InterruptedException {
-        Date newTime = new Date();
-        Date time = addDateMinutes(new Date(), 10);
-        int result = newTime.compareTo(time);
-        System.out.println(result);
+        System.out.println(getEndOfDay(new Date()));
     }
 
     /**
@@ -691,6 +689,9 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date formatDate(LocalDateTime time) {
+        if (Objects.isNull(time)) {
+            return null;
+        }
         return Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
     }
 
@@ -702,6 +703,9 @@ public class DateUtils extends DateUtil {
      * @return: java.time.LocalDate
      */
     public static LocalDate dateToLocalDate(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
     }
 
@@ -714,7 +718,78 @@ public class DateUtils extends DateUtil {
      * @return: java.lang.String
      */
     public static String localDateToString(LocalDate date, String pattern) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern);
         return date.format(fmt);
     }
+
+    /**
+     * @desc: localDate转换为date 开始时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     * @Param localDate:
+     * @return: java.util.Date
+     */
+    public static Date localDateToDateStart(LocalDate localDate) {
+        if (Objects.isNull(localDate)) {
+            return null;
+        }
+        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MIN);
+        return formatDate(time);
+    }
+
+    /**
+     * @desc: 一天的开始时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getStartOfDay(Date date) {
+        String dateStr = format(date, DATE_PATTERN);
+        return parse(dateStr, DATE_PATTERN);
+    }
+
+    /**
+     * @desc: 一天的开始时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getStartOfDay(Date date, String format) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
+        String dateStr = format(date, format);
+        return parse(dateStr, format);
+    }
+
+    /**
+     * @desc: 一天的结束时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getEndOfDay(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
+        String dateStr = format(date, DATE_PATTERN);
+        return parse(dateStr + " 23:59:59", DATE_TIME_PATTERN);
+    }
+
+
+
+    /**
+     * @desc: localDate转换为date 结束时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     * @Param localDate:
+     * @return: java.util.Date
+     */
+    public static Date localDateToDateEnd(LocalDate localDate) {
+        if (Objects.isNull(localDate)) {
+            return null;
+        }
+        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MAX).withNano(0);
+        return formatDate(time);
+    }
 }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/response/HttpResult.java

@@ -78,4 +78,12 @@ public class HttpResult implements Serializable {
 		r.setData(data);
 		return r;
 	}
+
+    public static HttpResult ok(int code,String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
 }

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -76,13 +76,21 @@ public class DateUtil {
         return format;
     }
 
-    public static LocalDate localDateToLocalDate(LocalDate date) {
+    public static LocalDateTime localDateToLocalDateEnd(LocalDate date) {
         String str = dateToStr(date, "yyyy-MM-dd") + " 23:59:59";
 //        LocalDate localDate = parseLocalDate(str);
-        LocalDate localDate = LocalDate.parse(str, YYYY_MM_DD_HH_MM_SS);
-        return localDate;
+        LocalDateTime localDateTime = LocalDateTime.parse(str, YYYY_MM_DD_HH_MM_SS);
+        return localDateTime;
+    }
+
+    public static LocalDateTime localDateToLocalDateStart(LocalDate date) {
+        String str = dateToStr(date, "yyyy-MM-dd") + " 00:00:00";
+//        LocalDate localDate = parseLocalDate(str);
+        LocalDateTime localDateTime = LocalDateTime.parse(str, YYYY_MM_DD_HH_MM_SS);
+        return localDateTime;
     }
 
+
     public static String dateToStr(LocalDate date) {
         return dateToStr(date, "yyyy-MM-dd");
     }

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java

@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -80,14 +79,14 @@ public class SckwTradeOrder {
     /**
      * 订单开始日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate startTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
 
     /**
      * 订单结束日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate endTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
 
     /**
      * 订单已委托量

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -2,6 +2,7 @@ package com.sckw.contract.service;
 
 import java.util.Date;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -192,7 +193,9 @@ public class KwcContractLogisticsService {
         kwcContractLogistics.setSigningWay(baseInfo.getSigningWay());
         kwcContractLogistics.setCharging(baseInfo.getCharging());
         kwcContractLogistics.setStartTime(baseInfo.getStartTime());
-        kwcContractLogistics.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractLogistics.setPerformedAmount(new BigDecimal("0"));
         kwcContractLogistics.setContractPid(pid);
         kwcContractLogistics.setRemark(remark);
@@ -512,6 +515,9 @@ public class KwcContractLogisticsService {
         kwcContractLogistics.setCharging(baseInfo.getCharging());
         kwcContractLogistics.setStartTime(baseInfo.getStartTime());
         kwcContractLogistics.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractLogistics.setPerformedAmount(new BigDecimal("0"));
         kwcContractLogistics.setContractPid(reqVo.getPid());
         kwcContractLogistics.setRemark(reqVo.getRemark());
@@ -722,6 +728,10 @@ public class KwcContractLogisticsService {
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
             queryListResVo.setAmount(queryListResDto.getAmount());
+
+            if (Objects.nonNull(queryListResVo.getEndTime())) {
+                queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+            }
             list.add(queryListResVo);
         }
         return list;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -3,6 +3,9 @@ package com.sckw.contract.service;
 import java.io.IOException;
 import java.util.Date;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -197,6 +200,10 @@ public class KwcContractTradeService {
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setAmount(queryListResDto.getAmount());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
+
+            if(Objects.nonNull(queryListResVo.getEndTime())) {
+                queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+            }
             list.add(queryListResVo);
         }
         return list;
@@ -276,7 +283,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setSigningWay(baseInfo.getSigningWay());
         kwcContractTrade.setTrading(baseInfo.getTrading());
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
-        kwcContractTrade.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(pid);
         kwcContractTrade.setRemark(remark);
@@ -586,6 +595,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setTrading(baseInfo.getTrading());
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
         kwcContractTrade.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(reqVo.getPid());
         kwcContractTrade.setRemark(reqVo.getRemark());

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -3,11 +3,10 @@ package com.sckw.file.controller;
 import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.result.Result;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
-import com.sckw.file.service.FileService;
 import com.sckw.file.dubbo.FileDubboApiServiceImpl;
+import com.sckw.file.service.FileService;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -139,13 +138,13 @@ public class FileApiController {
      * @param file
      * @return
      */
-    @RequestMapping(value = "/appUploadFileInfo", method = RequestMethod.POST)
-    public Result appUploadFileInfo(@RequestParam("file") MultipartFile file) {
+    @RequestMapping(value = "/appUploadFileInfo", method = RequestMethod.POST,produces = "application/json")
+    public HttpResult appUploadFileInfo(@RequestParam("file") MultipartFile file) {
         try {
             return fileService.appUploadFileInfo(file);
         } catch (Exception e) {
             log.info("上传文件失败:{}",e.getMessage(),e);
-            return Result.build(Status.FAILURE,"上传文件失败:" + e.getMessage());
+            return HttpResult.error(Status.FAILURE.getCode(),"上传文件失败:" + e.getMessage());
         }
     }
 

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -13,7 +13,6 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.result.Result;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
 import com.sckw.file.config.FileListConfig;
@@ -264,7 +263,7 @@ public class FileService {
         return HttpResult.ok(fileInfoVO);
     }
 
-    private void insertFile(FileInfo fileInfo) throws ParseException {
+    private void insertFile(FileInfo fileInfo){
         kwfFileInfo kwfFileInfo = new kwfFileInfo();
         kwfFileInfo.setOriginalName(fileInfo.getFileOriginalName());
         kwfFileInfo.setFileSuffix(FilenameUtils.getExtension(fileInfo.getFileOriginalName()));
@@ -284,10 +283,11 @@ public class FileService {
     }
 
 
-    public Result appUploadFileInfo(MultipartFile file) throws ParseException {
+    @Transactional
+    public HttpResult appUploadFileInfo(MultipartFile file){
         boolean flag = checkFileFormat(file);
         if (!flag) {
-            return Result.build(Status.FAILURE, "上传文件格式错误!");
+            return HttpResult.error(Status.FAILURE.getCode(), "上传文件格式错误!");
         }
         FileInfo fileInfo = FileUtils.getFileDataList(file);
         fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
@@ -295,7 +295,7 @@ public class FileService {
         FileInfoVO fileInfoVO = new FileInfoVO();
         BeanUtils.copyProperties(returnFileInfo, fileInfoVO);
         insertFile(returnFileInfo);
-        return Result.build(Status.SUCCESS, fileInfoVO);
+        return HttpResult.ok(Status.SUCCESS.getCode(),"", fileInfoVO);
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -262,26 +262,8 @@ public class KwfTruckController {
      **/
     @PostMapping("/findGpsByTruckNo")
     public HttpResult findGpsByTruckNo(@RequestBody @Valid GpsByTruckNoDto params) {
-        Long hours = (params.getEndTime().getTime() - params.getStartTime().getTime()) /1000/60;
+        /*Long hours = (params.getEndTime().getTime() - params.getStartTime().getTime()) /1000/60;
         List data = new ArrayList();
-        /*data.add(new HashMap(){{put("truckNo", params.getTruckNo()); put("speed", 95.0);
-            put("lng", "103.53"); put("lat", "29.48");
-            put("gpsTime", DateUtils.format(params.getStartTime(), DateUtils.DATE_TIME_PATTERN));}});
-        for (long i=0; i<hours; i++) {
-            int aaa = new Random().nextInt(10) / 3;
-            int bbb = new Random().nextInt(10) / 4;
-            data.add(new HashMap(){{
-                put("truckNo", params.getTruckNo());
-                put("speed", new Random().nextInt(100));
-                put("lat", "29.48"+new Random().nextInt(10000));
-                put("lng", "103.53"+new Random().nextInt(10000));
-                put("businessStatus", aaa == 0 ? 0 : 1);
-                put("runStatus", bbb == 0 ? 0 : bbb == 1 ? 1 : 2);
-                put("gpsTime", DateUtils.getCurrentTime());}});
-        }
-        data.add(new HashMap(){{put("truckNo", params.getTruckNo()); put("speed", 95.0);
-            put("lat", "29.48"); put("lng", "103.53");
-            put("gpsTime", DateUtils.format(params.getEndTime(), DateUtils.DATE_TIME_PATTERN));}});*/
         String str = new KwfTruckController().ReadFile();
         JSONArray array = JSON.parseArray(str);
         for (int i=0; i<array.size(); i++) {
@@ -292,8 +274,8 @@ public class KwfTruckController {
             obj.put("businessStatus", aaa == 0 ? 0 : 1);
             obj.put("runStatus", bbb == 0 ? 0 : bbb == 1 ? 1 : 2);
             data.add(obj);
-        }
-        return HttpResult.ok(data);
+        }*/
+        return HttpResult.ok(truckService.queryLocateTrack(params));
     }
 
     /**

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

@@ -518,11 +518,15 @@ public class KwfDriverService {
         KwfDriverCard driverCard = new KwfDriverCard();
         BeanUtils.copyProperties(params, driverCard);
         driverCard.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverCard.getCertificateMain()) && StringUtils.isBlank(driverCard.getCertificateRevolt())) {
+        String certificateMain = driverCard.getCertificateMain();
+        String certificateRevolt = driverCard.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverCard.setStatus(Global.NO);
             driverCard.setCertificateMain(Global.EMPTY_STRING);
             driverCard.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverCard.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverCard.getCertificateMain());
+        driverCard.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverCard.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -569,11 +573,15 @@ public class KwfDriverService {
         KwfDriverLicense driverLicense = new KwfDriverLicense();
         BeanUtils.copyProperties(params, driverLicense);
         driverLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverLicense.getCertificateMain()) && StringUtils.isBlank(driverLicense.getCertificateRevolt())) {
+        String certificateMain = driverLicense.getCertificateMain();
+        String certificateRevolt = driverLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverLicense.setStatus(Global.NO);
             driverLicense.setCertificateMain(Global.EMPTY_STRING);
             driverLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverLicense.getCertificateMain());
+        driverLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -621,11 +629,15 @@ public class KwfDriverService {
         KwfDriverQualification driverQual = new KwfDriverQualification();
         BeanUtils.copyProperties(params, driverQual);
         driverQual.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverQual.getCertificateMain()) && StringUtils.isBlank(driverQual.getCertificateRevolt())) {
+        String certificateMain = driverQual.getCertificateMain();
+        String certificateRevolt = driverQual.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverQual.setStatus(Global.NO);
             driverQual.setCertificateMain(Global.EMPTY_STRING);
             driverQual.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverQual.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverQual.getCertificateMain());
+        driverQual.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverQual.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;

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

@@ -478,11 +478,15 @@ public class KwfTruckService {
         KwfTruckLicense truckLicense = new KwfTruckLicense();
         BeanUtils.copyProperties(params, truckLicense);
         truckLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(truckLicense.getCertificateMain()) && StringUtils.isBlank(truckLicense.getCertificateRevolt())) {
+        String certificateMain = truckLicense.getCertificateMain();
+        String certificateRevolt = truckLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             truckLicense.setStatus(Global.NO);
             truckLicense.setCertificateMain(Global.EMPTY_STRING);
             truckLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        truckLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : truckLicense.getCertificateMain());
+        truckLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : truckLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -520,11 +524,15 @@ public class KwfTruckService {
         KwfTransportLicense transportLicense = new KwfTransportLicense();
         BeanUtils.copyProperties(params, transportLicense);
         transportLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(transportLicense.getCertificateMain()) && StringUtils.isBlank(transportLicense.getCertificateRevolt())) {
+        String certificateMain = transportLicense.getCertificateMain();
+        String certificateRevolt = transportLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             transportLicense.setStatus(Global.NO);
             transportLicense.setCertificateMain(Global.EMPTY_STRING);
             transportLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        transportLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : transportLicense.getCertificateMain());
+        transportLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : transportLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -963,6 +971,8 @@ public class KwfTruckService {
 
     @Value("${external.openapi.queryLocate}")
     private String queryLocate;
+    @Value("${external.openapi.queryLocateTrack}")
+    private String queryLocateTrack;
 
     /**
      * @param truckNos 车牌号
@@ -983,17 +993,14 @@ public class KwfTruckService {
 
             long begTime = System.currentTimeMillis();
             String httpResult = HttpClientUtil.post(queryLocate, JSON.toJSONString(params));
-            System.out.println(httpResult);
             long entTime = System.currentTimeMillis();
             if (StringUtils.isNotBlank(httpResult)) {
                 JSONObject result = JSONObject.parseObject(httpResult);
                 if (result.getInteger("code") != null && result.getInteger("code") != 200) {
                     return truckGpsMap;
-                } else {
-
                 }
                 JSONArray trucks = result.getJSONArray("data");
-                log.info("车牌号数量="+ truckNos.size() + " GPS数量=" + (trucks != null ? trucks.size() : 0) + " 响应时间="+(entTime - begTime));
+                //log.info("车牌号数量="+ truckNos.size() + " GPS数量=" + (trucks != null ? trucks.size() : 0) + " 响应时间="+(entTime - begTime));
                 for (int i=0; trucks != null && i < trucks.size(); i++) {
                     JSONObject truck = trucks.getJSONObject(i);
                     JSONObject locateInfo = truck.getJSONObject("locateInfo");
@@ -1013,6 +1020,83 @@ public class KwfTruckService {
         return truckGpsMap;
     }
 
+    /**
+     * @param params {truckNos 車牌號集, startTime 開始實際, endTime 結束時間}
+     * @desc 车辆查询GPS(通过车牌号查询)
+     * @author zk
+     * @date 2023/9/27
+     **/
+    public List<KwfTruckGpsVo> queryLocateTrack(GpsByTruckNoDto params) {
+        List<KwfTruckGpsVo>  truckGpsList = new ArrayList<>();
+        long page = 1, pageSize = 1000, size = 0, pages = 0;
+        Map queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("vehicleNo", params.getTruckNo());
+            put("startTime", params.getStartTime());
+            put("endTime", params.getEndTime());
+            put("page", page);
+            put("pageSize", pageSize);
+        }};
+
+        String httpResult = HttpClientUtil.post(queryLocateTrack, JSON.toJSONString(queryParams));
+        if (StringUtils.isNotBlank(httpResult)) {
+            JSONObject result = JSONObject.parseObject(httpResult);
+            if (result.getInteger("code") != null && result.getInteger("code") != 200) {
+                return truckGpsList;
+            }
+            JSONObject data = result.getJSONObject("data");
+            if (data == null) {
+                return truckGpsList;
+            }
+            size = data.getLong("size");
+            pages = size/pageSize + (size%pageSize > 0 ? 1 : 0);
+            JSONArray trucks = data.getJSONArray("list");
+            for (int i=0; trucks != null && i < trucks.size(); i++) {
+                JSONObject truck = trucks.getJSONObject(i);
+                KwfTruckGpsVo truckGps = new KwfTruckGpsVo();
+                truckGps.setLat(truck.getString("lat"));
+                truckGps.setLng(truck.getString("lng"));
+                truckGps.setSpeed(truck.getDouble("speed"));
+                truckGps.setGpsTime(truck.getString("createTime"));
+                truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
+                truckGpsList.add(truckGps);
+            }
+
+            if (pages <= 1) {
+                return truckGpsList;
+            }
+
+            for (long i=2; i <= pages; i++) {
+                queryParams.put("page", i);
+                httpResult = HttpClientUtil.post(queryLocate, JSON.toJSONString(queryParams));
+                if (StringUtils.isNotBlank(httpResult)) {
+                    result = JSONObject.parseObject(httpResult);
+                    if (result.getInteger("code") != null && result.getInteger("code") != 200) {
+                        continue;
+                    }
+                    data = result.getJSONObject("data");
+                    if (data == null) {
+                        continue;
+                    }
+                    trucks = data.getJSONArray("list");
+                    for (int j=0; trucks != null && j < trucks.size(); j++) {
+                        JSONObject truck = trucks.getJSONObject(j);
+                        KwfTruckGpsVo truckGps = new KwfTruckGpsVo();
+                        truckGps.setTruckNo(truck.getString("vehicleNo"));
+                        truckGps.setLat(truck.getString("lat"));
+                        truckGps.setLng(truck.getString("lng"));
+                        truckGps.setSpeed(truck.getDouble("speed"));
+                        truckGps.setGpsTime(truck.getString("createTime"));
+                        truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
+                        truckGpsList.add(truckGps);
+                    }
+                }
+            }
+
+        }
+        return truckGpsList;
+    }
+
+
     /**
      * @param truckNos 车牌号
      * @desc 查询车辆定位数据-单车牌号

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoProject.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 项目管理
@@ -34,11 +34,11 @@ public class KwoProject extends BaseModel {
     /**
      * 开始日期
      */
-    private LocalDate startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDate entTime;
+    private Date entTime;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 交易订单（采购订单/销售订单）
@@ -77,12 +77,12 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     /**
      * 开始日期
      */
-    private LocalDate startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDate endTime;
+    private Date endTime;
 
     /**
      * 已委托量

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTransportDemand.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 运需
@@ -62,9 +62,9 @@ public class KwoTransportDemand extends BaseModel implements Serializable {
     private String amount;
 
     /**
-     * 截止时间(yyyy-MM-dd)
+     * 截止时间
      */
-    private LocalDate deadline;
+    private Date deadline;
 
     /**
      * 联系人姓名

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -122,7 +122,10 @@ public class KwoTradeOrderService {
      */
     public void addPurchaseOrderDraft(PurchaseOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(OrderSourceEnum.PURCHASE.getType()).setStatus(OrderStatusEnum.SAVED.getCode());
         kwoTradeOrderMapper.insert(order);
@@ -264,7 +267,10 @@ public class KwoTradeOrderService {
      */
     public void addValetOrderDraft(ValetOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(OrderSourceEnum.SALE.getType()).setStatus(OrderStatusEnum.SAVED.getCode());
         kwoTradeOrderMapper.insert(order);
@@ -289,7 +295,10 @@ public class KwoTradeOrderService {
                 .setOrderSource(OrderSourceEnum.PURCHASE.getType());
         orderCheck(orderCheck, false);
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(param.getGoodsInfo().getUnit())
                 .setSource(OrderSourceEnum.PURCHASE.getType())
                 .setStatus(OrderStatusEnum.WAIT_ACCEPTED.getCode());
@@ -486,8 +495,12 @@ public class KwoTradeOrderService {
         contractCheck(contract);
         param.setContractInfo(contract);
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
-                .setUnit(param.getGoodsInfo().getUnit()).setSource(OrderSourceEnum.SALE.getType());
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
+                .setUnit(param.getGoodsInfo().getUnit())
+                .setSource(OrderSourceEnum.SALE.getType());
         String contractStatus = contract.getContractStatus();
         if (Objects.equals(contractStatus, ContractStatusEnum.WAIT_SIGNED.getCode())) {
             order.setStatus(OrderStatusEnum.WAIT_SIGNED.getCode());
@@ -769,7 +782,9 @@ public class KwoTradeOrderService {
         }
         order.setAmount(param.getAmount()).setUnit(Objects.isNull(param.getGoodsInfo()) ? null : param.getGoodsInfo().getUnit())
                 .setPrice(param.getPrice()).setTrading(param.getTrading()).setPickupType(param.getPickupType())
-                .setDeliveryType(param.getDeliveryType()).setStartTime(param.getStartTime()).setEndTime(param.getEndTime())
+                .setDeliveryType(param.getDeliveryType())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setRemark(param.getRemark());
         LambdaUpdateWrapper<KwoTradeOrder> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(KwoTradeOrder::getAmount, order.getAmount())
@@ -961,6 +976,8 @@ public class KwoTradeOrderService {
         } else {
             throw new BusinessException("Invalid contract status");
         }
+        order.setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()));
         kwoTradeOrderMapper.updateById(order);
         //更新商品价格
         kwoTradeOrderGoodsService.updateUnitPrice(param.getId(), param.getUnitPrice());
@@ -983,6 +1000,8 @@ public class KwoTradeOrderService {
         SckwTradeOrder updateParam = BeanUtils.copyProperties(param, SckwTradeOrder.class);
         updateParam.setTOrderId(param.getId())
                 .setStatus(order.getStatus())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setPrice(order.getPrice().doubleValue())
                 .setAmount(order.getAmount().doubleValue())
                 .setUnitPrice(param.getUnitPrice().doubleValue())

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -65,6 +65,7 @@ public class KwoTransportDemandService {
      */
     public void addDraft(AddTransportDemandDraftParam param) {
         KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setDeadline(DateUtils.localDateToDateEnd(param.getDeadline()));
         transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(TransportDemandStatusEnum.SAVED.getCode());
         kwoTransportDemandMapper.insert(transportDemand);
     }
@@ -78,6 +79,7 @@ public class KwoTransportDemandService {
      */
     public void addShelves(AddTransportDemandParam param) {
         KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setDeadline(DateUtils.localDateToDateEnd(param.getDeadline()));
         transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(TransportDemandStatusEnum.PUT_ON_SHELVES.getCode());
         kwoTransportDemandMapper.insert(transportDemand);
     }
@@ -152,7 +154,7 @@ public class KwoTransportDemandService {
                 .set(KwoTransportDemand::getTrading, param.getTrading())
                 .set(KwoTransportDemand::getPrice, param.getPrice())
                 .set(KwoTransportDemand::getAmount, param.getAmount())
-                .set(KwoTransportDemand::getDeadline, param.getDeadline())
+                .set(KwoTransportDemand::getDeadline, DateUtils.localDateToDateEnd(param.getDeadline()))
                 .set(KwoTransportDemand::getContacts, param.getContacts())
                 .set(KwoTransportDemand::getPhone, param.getPhone())
                 .set(KwoTransportDemand::getLoadAreaCode, param.getLoadAreaCode())
@@ -386,9 +388,9 @@ public class KwoTransportDemandService {
                     .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
                     .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress()).setSerialNumber(String.valueOf(i.getAndIncrement()))
                     .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
-                    .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtil.dateToStr(e.getDeadline()))
-                    .setCreateTime(Objects.isNull(e.getCreateTime()) ? null : DateUtil.getDateTime(e.getCreateTime()))
-                    .setUpdateTime(Objects.isNull(e.getUpdateTime()) ? null : DateUtil.getDateTime(e.getUpdateTime()))
+                    .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtils.format(e.getDeadline(), DateUtils.DATE_PATTERN))
+                    .setCreateTime(DateUtil.getDateTime(e.getCreateTime()))
+                    .setUpdateTime(DateUtil.getDateTime(e.getUpdateTime()))
                     .setEntName(entMap.get(e.getEntId()));
             result.add(export);
         });

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerLogisticsController.java

@@ -250,7 +250,7 @@ public class KwpLedgerLogisticsController {
         logisticsReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
         List<LedgerLogisticsDto> list = kwpLedgerLogisticsService.exportList(logisticsReq, logisticsReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerLogisticsVo> collect = list.stream().map(a -> {
             LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();
@@ -275,7 +275,7 @@ public class KwpLedgerLogisticsController {
         logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<LedgerLogisticsDto> list = kwpLedgerLogisticsService.exportList(logisticsReq, logisticsReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerLogisticsVo> collect = list.stream().map(a -> {
             LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerTradeController.java

@@ -248,7 +248,7 @@ public class KwpLedgerTradeController {
         tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
         List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerTradeVo> collect = list.stream().map(a -> {
             LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();
@@ -272,7 +272,7 @@ public class KwpLedgerTradeController {
         tradeReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerTradeVo> collect = list.stream().map(a -> {
             LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementLogisticsController.java

@@ -105,7 +105,7 @@ public class KwpSettlementLogisticsController {
      */
     private HttpResult export(HttpServletResponse response, List<SettlementLogisticsDto> list) {
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementLogisticsVo> collect = list.stream().map(a -> {
             SettlementLogisticsVo settlementLogisticsVo = new SettlementLogisticsVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -166,7 +166,7 @@ public class KwpSettlementTradeController {
      */
     private HttpResult export(HttpServletResponse response, List<SettlementTradeDto> list) {
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementTradeVo> collect = list.stream().map(a -> {
             SettlementTradeVo settlementTradeVo = new SettlementTradeVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerLogisticsController.java

@@ -76,7 +76,7 @@ public class LedgerLogisticsController {
 
 
     /**
-     * 导出 todo
+     * 导出
      *
      * @param response
      * @param logisticsReq
@@ -92,7 +92,7 @@ public class LedgerLogisticsController {
             list = ledgerLogisticsService.selectList(logisticsReq.getIdList());
         }
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerLogisticsExport> collect = list.stream().map(a -> {
             LedgerLogisticsExport ledgerLogisticsVo = new LedgerLogisticsExport();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerTradeController.java

@@ -92,7 +92,7 @@ public class LedgerTradeController {
         }
 
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerTradeExport> collect = list.stream().map(a -> {
             LedgerTradeExport ledgerTradeVo = new LedgerTradeExport();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementLogisticsController.java

@@ -69,7 +69,7 @@ public class SettlementLogisticsController {
         settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<SettlementLogistics> list = settlementLogisticsService.exportList(settlementReq);
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementLogisticsExportVo> collect = list.stream().map(a -> {
             SettlementLogisticsExportVo settlementLogisticsVo = new SettlementLogisticsExportVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementTradeController.java

@@ -75,7 +75,7 @@ public class SettlementTradeController {
         settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         List<SettlementTrade> list = settlementTradeService.exportList(settlementReq,settlementReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementTradeExportVo> collect = list.stream().map(a -> {
             SettlementTradeExportVo settlementTradeExportVo = new SettlementTradeExportVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -14,7 +14,7 @@ import com.sckw.payment.model.constant.TradeUnitType;
 import com.sckw.payment.model.dto.LedgerSize;
 import com.sckw.payment.model.dto.MoneyType;
 import com.sckw.payment.service.*;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import com.sckw.payment.utils.DecimalUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementRecordService.java

@@ -2,7 +2,7 @@ package com.sckw.payment.service;
 
 import com.sckw.payment.dao.KwpSettlementRecordMapper;
 import com.sckw.payment.model.vo.SettlementRecord;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -41,7 +41,7 @@ import com.sckw.payment.model.vo.req.page.MoneyPage;
 import com.sckw.payment.model.vo.req.page.PrePayPage;
 import com.sckw.payment.model.vo.req.page.RefundPage;
 import com.sckw.payment.model.vo.res.*;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisLockKey;
 import com.sckw.system.api.RemoteSystemService;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WorkbenchService.java

@@ -5,7 +5,7 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.model.vo.SettlementRecord;
 import com.sckw.payment.model.vo.req.FinanceCount;
 import com.sckw.payment.model.vo.res.EChartsVo;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import com.sckw.payment.utils.DecimalUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -127,6 +127,9 @@
         <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
             and ( l.name like concat('%'
             , #{settlementReq.keywords,jdbcType=VARCHAR}
+            , '%')
+            or l.l_ledger_no like concat('%'
+            , #{settlementReq.keywords,jdbcType=VARCHAR}
             , '%')
                 or lu2.firm_name like concat('%'
             , #{settlementReq.keywords,jdbcType=VARCHAR}

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -104,6 +104,7 @@
             <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
                 and (
                             klt.name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
+                        or klt.t_ledger_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
                         or kltu.firm_name like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
                         or kst.st_order_no like concat('%', #{settlementReq.keywords,jdbcType=VARCHAR}, '%')
                     )

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsImageService.java

@@ -3,6 +3,7 @@ package com.sckw.product.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.product.dao.KwpGoodsImageMapper;
 import com.sckw.product.model.KwpGoodsImage;
 import lombok.RequiredArgsConstructor;
@@ -45,7 +46,8 @@ public class KwpGoodsImageService {
         LambdaQueryWrapper<KwpGoodsImage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpGoodsImage::getGoodsId, goodsId).eq(KwpGoodsImage::getDelFlag, Global.NO)
                 .orderByAsc(KwpGoodsImage::getSort);
-        return kwpGoodsImageMapper.selectList(wrapper);
+        List<KwpGoodsImage> list = kwpGoodsImageMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(list);
     }
 
     /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -86,6 +86,8 @@ public class KwpGoodsService {
     private String pcGoodsListUrl;
     @Value("${goods.url.list.app}")
     private String appGoodsListUrl;
+    @Value("${filePathPrefix}")
+    private String pathPrefix;
 
 
     /**
@@ -218,7 +220,8 @@ public class KwpGoodsService {
             RecommendGoods recommendGoods = BeanUtils.copyProperties(e, RecommendGoods.class);
             List<KwpGoodsPriceRange> prices = map.get(recommendGoods.getId());
             recommendGoods.setUnitLabel(CollectionUtils.isNotEmpty(unitMap) ? unitMap.get(recommendGoods.getUnit()) : null)
-                    .setPrice(CollectionUtils.isNotEmpty(prices) ? prices.get(0).getPrice() : null);
+                    .setPrice(CollectionUtils.isNotEmpty(prices) ? prices.get(0).getPrice() : null)
+                    .setThumb(StringUtils.isNotEmpty(e.getThumb()) ? pathPrefix + e.getThumb() : null);
             recommendGoodsList.add(recommendGoods);
         });
         detail.setRecommendGoodsList(recommendGoodsList);
@@ -272,7 +275,16 @@ public class KwpGoodsService {
                 .setStatusLabel(CollectionUtils.isNotEmpty(goodsStatusMap) ? goodsStatusMap.get(String.valueOf(detail.getStatus())) : null)
                 .setPrepaidLimitLabel(Objects.equals(detail.getPrepaidLimit(), 1) ? "是" : "否");
         //商品图片信息
+        if (Objects.nonNull(goods.getThumb())) {
+            detail.setThumb(pathPrefix + goods.getThumb());
+        }
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
+        goodsImages.forEach(e -> {
+            String image = e.getImage();
+            if (StringUtils.isNotEmpty(image)) {
+                e.setImage(pathPrefix + image);
+            }
+        });
         List<GoodsImagesDetail> images = BeanUtils.copyToList(goodsImages, GoodsImagesDetail.class);
         //商品价格段信息
         List<KwpGoodsPriceRange> priceRanges = kwpGoodsPriceRangeService.getByGoodsId(id);
@@ -708,6 +720,7 @@ public class KwpGoodsService {
                     .setAddress(addressMap.get(id)).setSupplyEnt(entMap.get(e.getSupplyEntId()))
                     .setManageName(Objects.nonNull(manager) ? manager.getName() : null)
                     .setPhone(Objects.nonNull(manager) ? manager.getPhone() : null)
+                    .setThumb(Objects.nonNull(e.getThumb()) ? pathPrefix + e.getThumb() : null)
                     .setCreateByName(Objects.nonNull(createUser) ? createUser.getName() : null);
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(id);
             if (CollectionUtils.isNotEmpty(priceRanges)) {
@@ -915,6 +928,7 @@ public class KwpGoodsService {
                     .setAddressName(Objects.isNull(address) ? null : address.getCityName())
                     .setDetailAddress(Objects.isNull(address) ? null : address.getDetailAddress())
                     .setPrice(CollectionUtils.isEmpty(priceRanges) ? null : priceRanges.get(0).getPrice())
+                    .setThumb(StringUtils.isNotEmpty(e.getThumb()) ? pathPrefix + e.getThumb() : null)
                     .setSupplyEnt(entMap.get(e.getSupplyEntId()));
             result.add(materials);
         });
@@ -992,7 +1006,11 @@ public class KwpGoodsService {
      * @return: java.util.List<com.sckw.product.model.KwpGoods>
      */
     public KwpGoods selectById(Long id) {
-        return kwpGoodsMapper.selectById(id);
+        KwpGoods goods = kwpGoodsMapper.selectById(id);
+        if (Objects.nonNull(goods) && StringUtils.isNotBlank(goods.getThumb())) {
+            goods.setThumb(pathPrefix + goods.getThumb());
+        }
+        return goods;
     }
 
 
@@ -1005,6 +1023,13 @@ public class KwpGoodsService {
      */
     public List<KwpGoods> selectByIds(List<Long> ids) {
         List<KwpGoods> list = kwpGoodsMapper.selectBatchIds(ids);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(e -> {
+                if (StringUtils.isNotBlank(e.getThumb())) {
+                    e.setThumb(pathPrefix + e.getThumb());
+                }
+            });
+        }
         return CollectionUtils.emptyIfNull(list);
     }
 

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -7,6 +7,7 @@ import com.sckw.core.model.vo.TableStatisticRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
@@ -470,8 +471,8 @@ public class KwOrderService {
                     .setTrading(tradeMap.get(e.getTrading()))
                     .setLoadDetailAddressInfo(loadCityName + loadDetailAddress)
                     .setUnloadDetailAddressInfo(unloadCityName + unloadDetailAddress)
-                    .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtil.dateToStr(e.getStartTime()))
-                    .setEndTime(Objects.isNull(e.getEndTime()) ? null : DateUtil.dateToStr(e.getEndTime()))
+                    .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtils.format(e.getStartTime(), DateUtils.DATE_PATTERN))
+                    .setEndTime(Objects.isNull(e.getEndTime()) ? null : DateUtils.format(e.getEndTime(), DateUtils.DATE_PATTERN))
                     .setCreateTime(DateUtil.getDateTime(e.getCreateTime()));
             list.add(export);
         });

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindMenuTreePojo.java

@@ -42,4 +42,9 @@ public class FindMenuTreePojo {
      */
     private List<String> entTypeList;
 
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -318,6 +318,7 @@ public class KwsMenuService {
     }
 
     private void extracted(Long userId, FindMenuTreePojo findMenuTreePojo) {
+        findMenuTreePojo.setSystemType(LoginUserHolder.getSystemType());
         //运营端的管理员不做过滤
         if (Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode())) {
             return;

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -320,7 +320,7 @@
     <select id="queryEntInfoByCityCodeAndEntTypesWithPage" resultType="com.sckw.system.model.KwsEnterprise">
       SELECT a.*
         FROM kws_enterprise a
-             LEFT JOIN sys_area b ON a.city_code = b.CODE
+        LEFT JOIN sys_area b ON a.city_code = b.CODE
       where 1 = 1
         <if test="cityCode != null">
           and (b.code = #{cityCode} or b.province_code = #{cityCode} or b.pcode = #{cityCode})
@@ -342,6 +342,12 @@
                             #{item}
                          </foreach>
                     )
+        and exists (
+                    select 1
+                      from kws_ent_check_track e
+                     where a.id = e.ent_id
+                       and a.status = 0
+                )
     </select>
 
   <select id="findManageInfoByEntIds" resultType="com.sckw.system.model.pojo.FindManagePojo">

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -270,7 +270,9 @@
     from kws_menu sm
     left join kws_menu_rights smr on sm.id = smr.menu_id
     where sm.del_flag = 0
-      and smr.del_flag = 0
+      <if test="systemType != 1">
+        and smr.del_flag = 0
+      </if>
     <if test="clientType != null">
       and sm.client_type = #{clientType}
     </if>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ManagementCarWaybillVo.java

@@ -32,6 +32,12 @@ public class ManagementCarWaybillVo implements Serializable {
     @JsonProperty(value="wOrderNo")
     private String wOrderNo;
 
+    /**
+     * 承运订单号
+     */
+    @JsonProperty(value="lOrderNo")
+    private String lOrderNo;
+
     /**
      * 车辆牌照
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementWaybillOrderService.java

@@ -131,6 +131,8 @@ public class ManagementWaybillOrderService {
         if (CollectionUtils.isNotEmpty(list)) {
             for (SckwWaybillOrder waybillOrder : list) {
                 ManagementCarWaybillVo vo = new ManagementCarWaybillVo();
+                vo.setLOrderNo(waybillOrder.getLOrderNo() == null ?
+                        null : waybillOrder.getLOrderNo());
                 vo.setWOrderNo(waybillOrder.getWOrderNo() == null ?
                         null : waybillOrder.getWOrderNo());
                 vo.setWOrderId(waybillOrder.getWOrderId() == null ?

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -337,11 +337,16 @@ public class WaybillManagementService {
         List<Integer> statuses = initWaybillIndexStatus();
         // 初始化各状态
         List<WaybillStatusVO> statusVOS = new ArrayList<>();
+        // 已作废
+        List<Integer> abortStatues = new ArrayList<>();
+        abortStatues.add(CarWaybillQueryEnum.REJECT_ORDER.getCode());
+        abortStatues.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
+        abortStatues.add(CarWaybillEnum.REVOKED.getCode());
         statuses.forEach(e -> {
             WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
             waybillStatusVO.setStatus(false);
-            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
-                // 默认选中 待接单 状态
+            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode()) && !abortStatues.contains(e)) {
+                // 默认选中 待接单 状态, 已作废的不选中
                 waybillStatusVO.setStatus(true);
             }
             waybillStatusVO.setCode(e);
@@ -783,6 +788,13 @@ public class WaybillManagementService {
         if (CollectionUtils.isNotEmpty(_statuses)) {
             criteria.and("status").in(_statuses);
         }
+        // 查询时间段
+        if (Objects.nonNull(query.getStartDate()) && Objects.nonNull(query.getEndDate())) {
+            Date endDate = DateUtil.strDateTimeToDateTime(query.getEndDate());
+            criteria.and("createTime")
+                    .gte(DateUtil.strDateTimeToDateTime(query.getStartDate()))
+                    .lte(DateUtil.offsetDay(endDate, 1));
+        }
         Query queryFormat = new Query(criteria);
         // 总记录数
         long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);