Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
0280ce31 1 parent 33a6fb52

customer|流程代码调整

Inline Side-by-side
Showing 5 changed files with 12 additions and 20 deletions
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
62 #{item} 62 #{item}
63 </foreach> 63 </foreach>
64 </if> 64 </if>
65 + ORDER BY c.CREATE_TIME DESC
65 <include refid="OracleDialectSuffix" /> 66 <include refid="OracleDialectSuffix" />
66 </select> 67 </select>
67 68
......
...@@ -7,15 +7,14 @@ import com.fedex.connect.common.dependencies.util.Utils; ...@@ -7,15 +7,14 @@ import com.fedex.connect.common.dependencies.util.Utils;
7 import com.fedex.connect.common.model.biz.Consignment; 7 import com.fedex.connect.common.model.biz.Consignment;
8 import com.fedex.connect.common.model.sys.User; 8 import com.fedex.connect.common.model.sys.User;
9 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 9 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
10 -import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
11 import com.fedex.connect.customer.data.query.ConsignmentQuery; 10 import com.fedex.connect.customer.data.query.ConsignmentQuery;
11 +import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
12 import com.fedex.connect.customer.enums.ResponseCode; 12 import com.fedex.connect.customer.enums.ResponseCode;
13 import com.fedex.connect.customer.service.base.BaseService; 13 import com.fedex.connect.customer.service.base.BaseService;
14 import com.fedex.connect.customer.service.biz.IConsignmentQueryService; 14 import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
15 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
16 16
17 import java.util.List; 17 import java.util.List;
18 -import java.util.Objects;
19 18
20 /** 19 /**
21 * @Author Szl 20 * @Author Szl
...@@ -62,17 +61,6 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign ...@@ -62,17 +61,6 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
62 */ 61 */
63 public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery) { 62 public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery) {
64 Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery); 63 Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery);
65 - if (consignment != null
66 - && !Objects.equals(consignment.getUserUuid(), userConsignmentInfoQuery.getUserUuid())
67 - && !Objects.equals(consignment.getShipperAccount(), userConsignmentInfoQuery.getShipperAccount())) {
68 - Consignment consignmentTemp = new Consignment();
69 - consignmentTemp.setId(consignment.getId());
70 - consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
71 - consignmentTemp.setShipperAccount(consignment.getShipperAccount());
72 - consignmentTemp.setOriginCountry(consignment.getOriginCountry());
73 - consignmentTemp.setDestinationCountry(consignment.getDestinationCountry());
74 - consignment = consignmentTemp;
75 - }
76 return responseUtils.success(consignment); 64 return responseUtils.success(consignment);
77 } 65 }
78 } 66 }
......
...@@ -38,7 +38,7 @@ public class UploadRecordServiceImpl extends BaseService implements IUploadRecor ...@@ -38,7 +38,7 @@ public class UploadRecordServiceImpl extends BaseService implements IUploadRecor
38 AttachmentHistoryDto attachmentHistoryDto = new AttachmentHistoryDto(); 38 AttachmentHistoryDto attachmentHistoryDto = new AttachmentHistoryDto();
39 attachmentHistoryDto.setUploadRecord(uploadRecord); 39 attachmentHistoryDto.setUploadRecord(uploadRecord);
40 attachmentHistoryDto.setCreatorFlag( 40 attachmentHistoryDto.setCreatorFlag(
41 - (uploadRecord.getCreateUserId() != null) ? 41 + (uploadRecord.getCreateUserId() != null) && uploadRecord.getCreateUserId().equals(user.getId()) ?
42 DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO 42 DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
43 ); 43 );
44 attachmentHistoryDtos.add(attachmentHistoryDto); 44 attachmentHistoryDtos.add(attachmentHistoryDto);
......
...@@ -50,7 +50,7 @@ public class AttachmentUtil { ...@@ -50,7 +50,7 @@ public class AttachmentUtil {
50 * @return void 50 * @return void
51 */ 51 */
52 private void initAttachment(Attachment attachment,String bizType,User user) throws Exception{ 52 private void initAttachment(Attachment attachment,String bizType,User user) throws Exception{
53 - DictionaryEntries attachmentBizTypeEntries = cacheSystem.getDicAttachmentBizType(AttachmentBizTypeEnum.getCodeByExt1(bizType)); 53 + DictionaryEntries attachmentBizTypeEntries = cacheSystem.getDicAttachmentBizType(bizType);
54 attachment.setBizTypeCode(attachmentBizTypeEntries.getCode()); 54 attachment.setBizTypeCode(attachmentBizTypeEntries.getCode());
55 attachment.setBizTypeName(attachmentBizTypeEntries.getDescription()); 55 attachment.setBizTypeName(attachmentBizTypeEntries.getDescription());
56 DictionaryEntries attachmentFileTypeEntries = cacheSystem.getDicAttachmentFileType(AttachmentFileTypeEnum.FILE.getCode()); 56 DictionaryEntries attachmentFileTypeEntries = cacheSystem.getDicAttachmentFileType(AttachmentFileTypeEnum.FILE.getCode());
...@@ -108,7 +108,7 @@ public class AttachmentUtil { ...@@ -108,7 +108,7 @@ public class AttachmentUtil {
108 //用户上传原文件名称 108 //用户上传原文件名称
109 attachment.setSourceFileName(sourceFileName); 109 attachment.setSourceFileName(sourceFileName);
110 //生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf 110 //生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf
111 - String fileName = bizType + BaseSeparatorConstants.SEPARATOR_UNDERLINE + 111 + String fileName = AttachmentBizTypeEnum.getExt1ByCode(bizType) + BaseSeparatorConstants.SEPARATOR_UNDERLINE +
112 consignmentCode + BaseSeparatorConstants.SEPARATOR_UNDERLINE + fileSuffix + suffix; 112 consignmentCode + BaseSeparatorConstants.SEPARATOR_UNDERLINE + fileSuffix + suffix;
113 //系统生成文件名称 113 //系统生成文件名称
114 attachment.setFileName(fileName); 114 attachment.setFileName(fileName);
......
...@@ -61,9 +61,6 @@ public class ConsignmentUtil { ...@@ -61,9 +61,6 @@ public class ConsignmentUtil {
61 //始发国编码 61 //始发国编码
62 consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode()); 62 consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
63 /******提交信息记录******/ 63 /******提交信息记录******/
64 - consignment.setFirstSubmitTime(nowDate);
65 - consignment.setFirstSubmitter(user.getUserName());
66 - consignment.setFirstSubmitterId(user.getId());
67 consignment.setCreateTime(nowDate); 64 consignment.setCreateTime(nowDate);
68 consignment.setCreateUserName(user.getUserName()); 65 consignment.setCreateUserName(user.getUserName());
69 consignment.setCreateUserId(user.getId()); 66 consignment.setCreateUserId(user.getId());
...@@ -72,6 +69,11 @@ public class ConsignmentUtil { ...@@ -72,6 +69,11 @@ public class ConsignmentUtil {
72 consignment.setModifyUserName(user.getUserName()); 69 consignment.setModifyUserName(user.getUserName());
73 consignment.setModifyUserId(user.getId()); 70 consignment.setModifyUserId(user.getId());
74 } 71 }
72 + if (!StringUtils.isEmpty(consignment.getFirstSubmitter())){
73 + consignment.setFirstSubmitTime(nowDate);
74 + consignment.setFirstSubmitter(user.getUserName());
75 + consignment.setFirstSubmitterId(user.getId());
76 + }
75 //记录当前提交人信息 77 //记录当前提交人信息
76 consignment.setSubmitTime(nowDate); 78 consignment.setSubmitTime(nowDate);
77 consignment.setSubmitter(user.getUserName()); 79 consignment.setSubmitter(user.getUserName());
...@@ -172,7 +174,8 @@ public class ConsignmentUtil { ...@@ -172,7 +174,8 @@ public class ConsignmentUtil {
172 * 都不一致，但是输入了shipperAccount，则给出提示 174 * 都不一致，但是输入了shipperAccount，则给出提示
173 */ 175 */
174 if (StringUtils.hasText(bo.getShipperAccount())) { 176 if (StringUtils.hasText(bo.getShipperAccount())) {
175 - consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 177 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
178 + consignmentAddDto.setConsignmentId(null);
176 return responseUtils.success(ResponseCode.MESSAGE_CODE_30005,consignmentAddDto); 179 return responseUtils.success(ResponseCode.MESSAGE_CODE_30005,consignmentAddDto);
177 } 180 }
178 181
......