修改自提签收图片回显

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java

@@ -71,6 +71,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private Integer signedFor ; //已签收
 	private Integer stopNum; //实提件数
 	private Integer sumTotal; //总数
+	private Boolean printState; //是否上传图片
 
 	@ApiModelProperty(value = "提货状态")
 	private String conditionName;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java

@@ -1,7 +1,10 @@
 package com.logpm.distribution.vo;
 
+import com.logpm.distribution.entity.DistributionPrintEntity;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @program: LogisticsPlatform-Service
  * @description:
@@ -17,6 +20,7 @@ public class DistrilbutionBillLadingViewVO {
 	private String consigneeUnit;
 	private String customerName;
 	private String customerTelephone;
-
+	//图片集合
+	private List<DistributionPrintEntity> printList;
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java

@@ -86,7 +86,9 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 		if(ObjectUtil.isNull( aftersalesProcessingResults.getWorkOrderId())){
 			throw new ServiceException("异常工单ID不能为空");
 		}
-
+//		if(ObjectUtil.isNotNull(aftersalesProcessingResults.getId())){
+//			baseMapper.deleteById(aftersalesProcessingResults.getId());
+//		}
 		if(ObjectUtil.isNull(aftersalesProcessingResults.getId())){
 			//添加
 			baseMapper.insert(aftersalesProcessingResults);
@@ -101,11 +103,29 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 
 			return true;
 		}else{
-
 			//修改
 			baseMapper.updateById(aftersalesProcessingResults);
-			return true;
+			if(ObjectUtil.isNotNull(aftersalesProcessingResults.getProcessingMoneyEntityList())){
+				aftersalesProcessingResults.getProcessingMoneyEntityList().forEach(i ->{
+					if(ObjectUtil.isNotNull(i.getId()) ){
+						//修改
+						AftersalesProcessingMoneyEntity processingMoneyEntity = new AftersalesProcessingMoneyEntity();
+						BeanUtil.copyProperties(i,processingMoneyEntity);
+						aftersalesProcessingMoneyService.updateById(processingMoneyEntity);
+					}else{
+						//新增
+						AftersalesProcessingMoneyEntity processingMoneyEntity = new AftersalesProcessingMoneyEntity();
+						BeanUtil.copyProperties(i,processingMoneyEntity);
+						processingMoneyEntity.setProcessingResultsId( aftersalesProcessingResults.getId());
+						aftersalesProcessingMoneyService.save(processingMoneyEntity);
+					}
+				});
+			}
+
+
+
 		}
+		return true;
 	}
 
 	/**

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1435,7 +1435,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		//修改异常工单处理信息！
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
 		workOrderEntity.setId(aftersalesWorkOrderDTO.getId());
-		workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
+		if(!byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.lipeijineweichu.getValue())){
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
+		}
 		workOrderEntity.setCompletionName(myCurrentWarehouse.getName());
 		workOrderEntity.setCompletionId(myCurrentWarehouse.getId());
 		baseMapper.updateById(workOrderEntity);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java

@@ -142,6 +142,7 @@ public class DistrilbutionBillLadingController extends BladeController {
 		records.forEach( i ->{
 			i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
 			i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
+			//查询图片数据
 			// 遍历BillLadingStatusConstant的所有枚举值
 			Arrays.stream(BillLadingStatusConstant.values())
 				.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -858,13 +858,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		distrilbutionBillLadingDTO.setWarehouseIdList(collect);
 		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO);
 		List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();
-
 		records.forEach(i -> {
 			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
 				.eq(DistributionDeliveryChargeEntity::getBillLading, i.getId())
 			);
 			list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
 			i.setList(list);
+			//查询是不是上传图片
+			List<DistributionPrintEntity> list1 = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
+				.eq(DistributionPrintEntity::getBillLadingId, i.getId())
+			);
+			int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count();
+			int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count();
+			int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count();
+			if(count1 >= 1 && count >= 1 && count2 >= 1){
+				i.setPrintState(true);
+			}else{
+				i.setPrintState(false);
+			}
 		});
 		distrilbutionBillLadingVOIPage.setRecords(records);
 		return distrilbutionBillLadingVOIPage;
@@ -1821,8 +1832,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	 */
 	@Override
 	public List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id) {
-
+		List<DistrilbutionBillLadingViewVO> viewDetailOwn = baseMapper.getViewDetailOwn(id);
-		return baseMapper.getViewDetailOwn(id);
+		viewDetailOwn.forEach(i ->{
+			List<DistributionPrintEntity> list = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
+				.eq(DistributionPrintEntity::getBillLadingId, id)
+			);
+			if(!viewDetailOwn.isEmpty()){
+				i.setPrintList(list);
+			}
+		});
+		return viewDetailOwn;
 	}
 
 	@Transactional(rollbackFor = Exception.class)