修改工单查询回复，配送信息

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -18,6 +18,7 @@ package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -366,6 +366,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入aftersalesWorkOrder")
 	public R update(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) {
+		log.info("修改参数》》》{}",aftersalesWorkOrder.toString());
 		return R.status(aftersalesWorkOrderService.updateById(aftersalesWorkOrder));
 	}
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -58,7 +58,7 @@
         <where>
             <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
-            <if test="param.initiationIdentification != null and paraminitiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
+            <if test="param.initiationIdentification != null and param.initiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
             <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number = #{param.workOrderNumber } </if>
             <if test="param.waybillNumber != null and param.waybillNumber != '' ">and  lawo.waybill_number = #{param.waybillNumber } </if>
@@ -126,7 +126,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
     </select>
 
     <select id="getPendingWorkOrder" resultType="com.logpm.aftersales.vo.AftersalesWorkOrderVO">
-        select  law.id,law.work_order_type, law.initiation_identification,law.discovery_node,law.work_order_number,law.waybill_number,law.order_code, law.train_number, law.first,
+        select DISTINCT  law.id,law.work_order_type, law.initiation_identification,law.discovery_node,law.work_order_number,law.waybill_number,law.order_code, law.train_number, law.first,
         law.secondary, law.vehicle_route,law.deliver_goods_time, law.discovery_time, law.warehousing_time, law.waybill_mall,law.remarks, law.delivery_time,law.delivery_driver
         ,law.work_order_status, law.customer_service_id, law.customer_service_name,law.waybill_mall_id,law.over_time, law.problem_description,law.warehouse_id, law.person_responsible,
         law.process_number, law.reviewed_by, law.audit_time, law.entry_time, law.operator

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

@@ -486,6 +486,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		//查询用户角色信息
 		BladeUser user = AuthUtil.getUser();
 		String roleName = user.getRoleName();
+
 		String tenantId = user.getTenantId();
 
 		//查询客服岗位
@@ -1241,9 +1242,31 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	 */
 	@Override
 	public AftersalesWorkOrderVO getSurveyRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
+
+		AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO();
+		//查询用户角色信息
+		BladeUser user = AuthUtil.getUser();
+		String roleName = user.getRoleName();
+		String tenantId = user.getTenantId();
+		//查询客服岗位
+		List<DictBiz> warehouseType = DictBizCache.getList("after_sales_visits");
+		if (warehouseType.isEmpty()) {
+			throw new ServiceException("注意，注意！售后访问字典未配置！请配置！");
+		}else{
+			Optional<DictBiz> first = warehouseType.stream().filter(i -> {
+				if (i.getDictValue().equals(roleName)) {
+					return true;
+				}
+				return false;
+			}).findFirst();
+			if(first.isPresent()){
+				//存在
+				String dictValue = first.get().getDictKey();
+				switch (dictValue){
+					case "2": // 营业部客服
 						BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 						if(ObjectUtils.isNull(myCurrentWarehouse)){
-			throw  new ServiceException("请选择仓库信息！！");
+							throw new ServiceException("请选择仓库！");
 						}
 						//查询是否必须回复
 						AftersalesProcessorEntity one = aftersalesProcessorService.getOne(Wrappers.<AftersalesProcessorEntity>query().lambda().
@@ -1252,13 +1275,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							.eq(AftersalesProcessorEntity::getBusinessName, myCurrentWarehouse.getName())
 							.eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue())
 						);
-
-		//查询调查数据
-		List<AftersaleSurveyRecordEntity> list = aftersaleSurveyRecordService.list(Wrappers.<AftersaleSurveyRecordEntity>query().lambda()
-			.eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
-			.eq(AftersaleSurveyRecordEntity::getDifference, "1")
-		);
-		AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO();
 						List<AftersalesProcessorVO> list1 = new ArrayList<>();
 						if(ObjectUtils.isNotNull(one)){
 							AftersalesProcessorVO processorVO = new AftersalesProcessorVO();
@@ -1266,6 +1282,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							list1.add(processorVO);
 						}
 						aftersalesWorkOrderVO.setProcessorVOList(list1);
+						break;
+				}
+			}else{
+				//不存在
+				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+				if(ObjectUtils.isNull(myCurrentWarehouse)){
+					throw new ServiceException("请选择仓库！");
+				}
+			}
+		}
+		//查询调查数据
+		List<AftersaleSurveyRecordEntity> list = aftersaleSurveyRecordService.list(Wrappers.<AftersaleSurveyRecordEntity>query().lambda()
+			.eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
+			.eq(AftersaleSurveyRecordEntity::getDifference, "1")
+		);
 		aftersalesWorkOrderVO.setSurveyRecordEntities(list);
 		return aftersalesWorkOrderVO;
 	}
@@ -1278,7 +1309,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	@Override
 	public AftersalesWorkOrderVO getTrackRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
 		List<AftersaleSurveyRecordEntity> list = aftersaleSurveyRecordService.list(Wrappers.<AftersaleSurveyRecordEntity>query().lambda()
-			.eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
+			.eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId() )
+			.orderByDesc(AftersaleSurveyRecordEntity::getCreateTime)
 		);
 		AftersalesWorkOrderVO workOrderVO = new AftersalesWorkOrderVO();
 		workOrderVO.setSurveyRecordEntities(list);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -56,6 +56,7 @@
         <where>
         lddl.is_deleted = 0
             <if test="param.trainNumber != null and param.trainNumber != ''"> and lddl.train_number  like  concat('%', #{ param.trainNumber },'%')</if>
+            <if test="param.taskTime != null and param.taskTime != ''"> and   DATA(lddl.task_time) = #{param.taskTime }</if>
         </where>
 
     </select>

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

@@ -6592,6 +6592,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	 */
 	@Override
 	public IPage<DistributionDeliveryWordVO> getShippingInformation(IPage<Object> page, DistributionDeliveryListDTO distributionDeliveryInfoDTO) {
+		if(ObjectUtils.isNotNull(distributionDeliveryInfoDTO) && ObjectUtils.isNotNull( distributionDeliveryInfoDTO.getTaskTime())){
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		}
+
+
 		IPage<DistributionDeliveryWordVO> iPage= baseMapper.getShippingInformation(page,distributionDeliveryInfoDTO);
 		if(!iPage.getRecords().isEmpty()){
 			iPage.getRecords().forEach( i ->{