Merge remote-tracking branch 'origin/master'

@@ -5,8 +5,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.biz.IConsignmentQueryController;
-import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,7 +36,7 @@ public class ConsignmentQueryController extends BaseController implements IConsi
         ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
         query.setUserId(user.getId());
         query.setUuid(user.getUserUuid());
-        return consignmentQueryService.findConsignments(query);
+        return consignmentQueryService.findConsignments(query,user);
     }
 
     @Override

@@ -5,7 +5,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.biz.IUploadRecordController;
-import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
+import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -31,18 +31,15 @@ public class UploadRecordController extends BaseController implements IUploadRec
     @ApiOperation(value = "ResponseVo", notes = "运单历史上传记录查询")
     @OperationMethodLog(describe = "business_log_20006")
     public ResponseVo queryHistoryList(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
+        AttachmentHistoryQuery attachmentHistoryQuery = AttachmentHistoryQuery.getInstance(consignmentId);
         /**
          * 运单id非空校验
          */
-        consignmentInfoValidate.validateConsignmentId(consignmentId);
+        consignmentInfoValidate.validateConsignmentId(attachmentHistoryQuery.getConsignmentId());
         /**
          * 获取当前用户信息
          */
         User user = this.getCurrentUserInfo();
-        /**
-         * 构造查询对象
-         */
-        UserConsignmentInfoQuery userConsignmentInfoQuery = UserConsignmentInfoQuery.getInstance(user,consignmentId);
-        return uploadRecordService.findHistory(userConsignmentInfoQuery);
+        return uploadRecordService.findHistory(attachmentHistoryQuery,user);
     }
 }

+package com.fedex.connect.customer.data.query;
+
+import com.fedex.connect.customer.data.PageBase;
+import lombok.Data;
+/**
+  * @Author Szl
+  * @Description 类说明 用于运单的附件历史上传查询
+  * @Date 2024/11/12
+  */
+@Data
+public class AttachmentHistoryQuery extends PageBase {
+
+    private Long consignmentId;
+
+    /**
+      * @Author Szl
+      * @Description 功能说明 实例化查询对象
+      * @Date 2024/11/12
+      * @param consignmentId
+      * @return com.fedex.connect.customer.data.query.AttachmentHistoryQuery
+      */
+    public static AttachmentHistoryQuery getInstance(Long consignmentId){
+        AttachmentHistoryQuery attachmentHistoryQuery = new AttachmentHistoryQuery();
+        attachmentHistoryQuery.setConsignmentId(consignmentId);
+        attachmentHistoryQuery.setStart(attachmentHistoryQuery.getStart());
+        return attachmentHistoryQuery;
+    }
+}

@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.dao;
 
 import com.fedex.connect.common.model.biz.Attachment;
 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
+import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -11,7 +12,7 @@ import java.util.List;
 
 @Mapper
 public interface AttachmentExtMapper {
-    List<AttachmentHistoryDto> findHistory(@Param("bizId") Long bizId);
+    List<AttachmentHistoryDto> findHistory(AttachmentHistoryQuery attachmentHistoryQuery);
 
     @Select("SELECT * FROM T_BIZ_ATTACHMENT WHERE UPLOAD_RECORD_ID = " +
             "(SELECT MAX(ID) FROM T_BIZ_UPLOAD_RECORD WHERE CREATE_USER_ID = #{query.userId} " +

@@ -28,7 +28,7 @@
     c.CREATE_TIME,
     c.COMMIT_TIME,
     c.STATUS_NAME
-</sql>
+ </sql>
 
   <select id="findConsignments" resultType="com.fedex.connect.customer.data.dto.FindConsignmentsDto">
     <include refid="OracleDialectPrefix"/>

@@ -2,12 +2,13 @@ package com.fedex.connect.customer.repository.repo;
 
 import com.fedex.connect.common.model.biz.Attachment;
 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
+import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 
 import java.util.List;
 
 public interface IAttachmentRepository {
-    List<AttachmentHistoryDto> findHistory(Long bizId);
+    List<AttachmentHistoryDto> findHistory(AttachmentHistoryQuery attachmentHistoryQuery);
 
     Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery);
 }
\ No newline at end of file

 package com.fedex.connect.customer.repository.repo;
 
 import com.fedex.connect.common.model.biz.Consignment;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
@@ -8,7 +9,7 @@ import com.fedex.connect.customer.data.query.ConsignmentQuery;
 import java.util.List;
 
 public interface IConsignmentRepository {
-    List<FindConsignmentsDto> findConsignments(ConsignmentQuery query);
+    List<FindConsignmentsDto> findConsignments(ConsignmentQuery query, User user);
 
     Long findAllCount(ConsignmentQuery query);
 

@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo.impl;
 
 import com.fedex.connect.common.model.biz.Attachment;
 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
+import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.repository.base.BaseDao;
 import com.fedex.connect.customer.repository.repo.IAttachmentRepository;
@@ -12,8 +13,8 @@ import java.util.List;
 @Repository
 public class AttachmentRepositoryImpl extends BaseDao implements IAttachmentRepository {
     @Override
-    public List<AttachmentHistoryDto> findHistory(Long consignmentId) {
-        return attachmentExtMapper.findHistory(consignmentId);
+    public List<AttachmentHistoryDto> findHistory(AttachmentHistoryQuery attachmentHistoryQuery) {
+        return attachmentExtMapper.findHistory(attachmentHistoryQuery);
     }
 
     /**

 package com.fedex.connect.customer.repository.repo.impl;
 
 import com.fedex.connect.common.model.biz.Consignment;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
-import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.repository.base.BaseDao;
 import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collections;
 import java.util.List;
 
 @Repository
 public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRepository {
 
+    /**
+      * @Author Szl
+      * @Description 功能说明 运单创建人如果为空则取当前用户
+      * @Date 2024/11/12
+      * @param query
+      * @param user
+      * @return java.util.List<com.fedex.connect.customer.data.dto.FindConsignmentsDto>
+      */
     @Override
-    public List<FindConsignmentsDto> findConsignments(ConsignmentQuery query) {
-        return consignmentExtMapper.findConsignments(query);
+    public List<FindConsignmentsDto> findConsignments(ConsignmentQuery query, User user) {
+        List<FindConsignmentsDto> consignments = consignmentExtMapper.findConsignments(query);
+        if (consignments == null) {
+            return Collections.emptyList();
+        }
+        consignments.forEach(consignment -> {
+            if (StringUtils.isBlank(consignment.getCreateUserName())) {
+                consignment.setCreateUserName(user.getUserName());
+            }
+        });
+        return consignments;
     }
 
     @Override

 package com.fedex.connect.customer.service.biz;
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
 
@@ -12,7 +13,7 @@ public interface IConsignmentQueryService {
       * @param query
       * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    ResponseVo findConsignments(ConsignmentQuery query);
+    ResponseVo findConsignments(ConsignmentQuery query,User user);
 
     /**
       * @Author mt

 package com.fedex.connect.customer.service.biz;
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
+import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
 
 public interface IUploadRecordService {
-    ResponseVo findHistory(UserConsignmentInfoQuery userConsignmentInfoQuery);
+    ResponseVo findHistory(AttachmentHistoryQuery attachmentHistoryQuery, User user);
 }

@@ -5,6 +5,7 @@ import com.fedex.connect.common.dependencies.date.vo.PageResult;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.biz.Consignment;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
@@ -30,7 +31,7 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
       * @param query
       * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseVo findConsignments(ConsignmentQuery query) {
+    public ResponseVo findConsignments(ConsignmentQuery query, User user) {
         List<String> consignmentCodeList = query.getConsignmentCodeList();
         if (Utils.isNotEmpty(consignmentCodeList) && consignmentCodeList.size() > GlobalConstantFedex.DECLARE_COUNT) {
             responseUtils.fail(ResponseCode.MESSAGE_CODE_30002);
@@ -44,7 +45,7 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
         pageResult.setPage(query.getPage());
         pageResult.setSize(query.getSize());
         if (total != null && total > 0) {
-            List<FindConsignmentsDto> consignments = consignmentRepository.findConsignments(query);
+            List<FindConsignmentsDto> consignments = consignmentRepository.findConsignments(query,user);
             pageResult.setList(consignments);
         }
         return responseUtils.success(pageResult);

@@ -3,10 +3,10 @@ package com.fedex.connect.customer.service.biz.impl;
 import com.fedex.connect.common.dependencies.contants.DigitConstants;
 import com.fedex.connect.common.dependencies.date.vo.PageResult;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
-import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
+import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
 import com.fedex.connect.customer.service.base.BaseService;
-import com.fedex.connect.customer.service.biz.IAttachmentQueryService;
 import com.fedex.connect.customer.service.biz.IUploadRecordService;
 import org.springframework.stereotype.Service;
 
@@ -25,23 +25,25 @@ public class UploadRecordServiceImpl extends BaseService implements IUploadRecor
      * @Author Szl
      * @Description 功能说明 查询该运单历史数据
      * @Date 2024/11/5
-     * @param userConsignmentInfoQuery
+     * @param attachmentHistoryQuery
      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
      */
-    public ResponseVo findHistory(UserConsignmentInfoQuery userConsignmentInfoQuery) {
-        List<AttachmentHistoryDto> history = attachmentRepository.findHistory(userConsignmentInfoQuery.getConsignmentId());
+    public ResponseVo findHistory(AttachmentHistoryQuery attachmentHistoryQuery, User user) {
+        List<AttachmentHistoryDto> history = attachmentRepository.findHistory(attachmentHistoryQuery);
 
         if (history != null) {
             history.forEach(attachmentHistoryDto ->
                     attachmentHistoryDto.setCreatorFlag(
                             (attachmentHistoryDto.getUploadUserId() != null &&
-                                    attachmentHistoryDto.getUploadUserId().equals(userConsignmentInfoQuery.getUserId())) ?
+                                    attachmentHistoryDto.getUploadUserId().equals(user.getId())) ?
                                     DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
                     )
             );
         }
 
         PageResult pageResult = new PageResult();
+        pageResult.setPage(attachmentHistoryQuery.getPage());
+        pageResult.setSize(attachmentHistoryQuery.getSize());
         pageResult.setList(history != null ? history : Collections.emptyList());
 
         return responseUtils.success(pageResult);