bugfix

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

@@ -436,6 +436,7 @@ public class KwcContractLogisticsService {
         List<QueryListResVo> list = new ArrayList<>();
         for (QueryListResDto queryListResDto : queryListResDtos) {
             QueryListResVo queryListResVo = new QueryListResVo();
+            BeanUtils.copyProperties(queryListResDto, queryListResVo);
             queryListResVo.setCheckedEntName(queryListResDto.getUnitType().compareTo(EntTypeEnum.LOGISTICS3.getCode()) == 0 ? queryListResDto.getEntName() : queryListResDto.getTargetEntName());
             queryListResVo.setCarrierEntName(queryListResDto.getUnitType().compareTo(EntTypeEnum.LOGISTICS3.getCode()) == 0 ? queryListResDto.getTargetEntName() : queryListResDto.getEntName());
 

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

@@ -106,6 +106,8 @@ public class KwcContractTradeService {
         List<QueryListResVo> list = new ArrayList<>();
         for (QueryListResDto queryListResDto : queryListResDtos) {
             QueryListResVo queryListResVo = new QueryListResVo();
+            BeanUtils.copyProperties(queryListResDto, queryListResVo);
+
             queryListResVo.setProvideEntName(queryListResDto.getUnitType().compareTo(EntTypeEnum.SUPPLIER.getCode()) == 0 ? queryListResDto.getEntName() : queryListResDto.getTargetEntName());
             queryListResVo.setPurchaseEntName(queryListResDto.getUnitType().compareTo(EntTypeEnum.SUPPLIER.getCode()) == 0 ? queryListResDto.getTargetEntName() : queryListResDto.getEntName());
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/controller/KwmAddressController.java

@@ -32,7 +32,7 @@ public class KwmAddressController {
      * @date: 2023/7/12
      */
     @PostMapping("/queryByPage")
-    public HttpResult queryByPage(@Valid @RequestBody AddressQueryReqVo reqVo) throws SystemException {
+    public HttpResult queryByPage(@RequestBody AddressQueryReqVo reqVo) throws SystemException {
         return HttpResult.ok(kwmAddressService.queryByPage(reqVo));
     }
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -75,11 +75,18 @@ public class KwmAddressService {
         wrapper.eq(Objects.nonNull(reqVo.getCityCode()), KwmAddress::getCityCode, reqVo.getCityCode()).
                 eq(Objects.nonNull(reqVo.getType()), KwmAddress::getType, reqVo.getType()).
                 eq(KwmAddress::getDelFlag, Global.NO).
-                ge(Objects.nonNull(reqVo.getStartTime()), KwmAddress::getCreateTime, reqVo.getStartTime()).
-                lt(Objects.nonNull(reqVo.getEndTime()), KwmAddress::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1)).
                 and(StringUtils.isNotBlank(reqVo.getKeywords()),
                         wq -> wq.like(KwmAddress::getDetailAddress, reqVo.getKeywords()).or().
                                 like(KwmAddress::getCityName, reqVo.getKeywords()));
+
+        if (Objects.nonNull(reqVo.getStartTime())) {
+            wrapper.ge(KwmAddress::getCreateTime, reqVo.getStartTime());
+        }
+
+        if (Objects.nonNull(reqVo.getEndTime())) {
+            wrapper.lt(KwmAddress::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
+        }
+
         if (StringUtils.isNotBlank(reqVo.getIds())) {
             wrapper.in(KwmAddress::getId, Arrays.stream(reqVo.getIds().split(Global.COMMA)).map(Long::parseLong).toList());
         }