Merge branch 'dev' into pre-production

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersaleSurveyRecordEntity.java

@@ -127,5 +127,9 @@ public class AftersaleSurveyRecordEntity extends TenantEntity {
 	 *   处理方ID
 	 */
     private Long processorId;
+	/**
+	 *   处理方名称
+	 */
+    private String processorName;
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java

@@ -32,4 +32,6 @@ import lombok.EqualsAndHashCode;
 public class AftersalesProcessorVO extends AftersalesProcessorEntity {
 	private static final long serialVersionUID = 1L;
 
+
+
 }

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

@@ -19,6 +19,7 @@ package com.logpm.aftersales.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.dto.AftersalesWorkOrderListExcelDTO;
 import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
 import com.logpm.aftersales.entity.AftersalesAppealEntity;
 import com.logpm.aftersales.entity.AftersalesSettlementEntity;
@@ -719,6 +720,15 @@ public class AftersalesWorkOrderController extends BladeController {
 		ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class);
 	}
 
+	@GetMapping("/exportAftersalesWorkOrderList")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder")
+	public void exportAftersalesWorkOrderList(HttpServletResponse response) {
+
+		AftersalesWorkOrderListExcelDTO aftersalesWorkOrderListExcelDTO = aftersalesWorkOrderService.exportAftersalesWorkOrderList();
+//		ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class);
+	}
+
 	/**
 	 * 导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
 	 */

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderListExcelDTO.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.dto;
+
+import com.logpm.aftersales.entity.*;
+import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 客服异常工单 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-11-17
+ */
+@Data
+public class AftersalesWorkOrderListExcelDTO  implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+
+
+	private List<AftersalesWorkOrderExcel> aftersalesWorkOrderExcels;
+
+
+}

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

@@ -101,4 +101,11 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 																							   @Param("workOrderType")int workOrderType, @Param("discoveryNode")int discoveryNode);
 
 	IPage<AftersalesSettlementEntity> getListSettlementNew(IPage<Object> page,@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity);
+
+
+	List<AftersalesWorkOrderExcel> selectAllAftersalesWorkOrderList(@Param("warehouseIds")List<Long> warehouseListIds);
+
+
+	List<AftersalesWorkOrderExcel> selectWaitAftersalesWorkOrderList(@Param("warehouseIds")List<Long> warehouseListIds);
+
 }

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

@@ -52,6 +52,9 @@
     </resultMap>
     <!--查询完整的异常工单信息-->
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesWorkOrderEntity">
+
+
+
         SELECT DISTINCT
         lawo.id,
         lawo.work_order_type,
@@ -492,6 +495,118 @@
         </where>
 
     </select>
+    <select id="selectAllAftersalesWorkOrderList"
+            resultType="com.logpm.aftersales.excel.AftersalesWorkOrderExcel">
+        SELECT DISTINCT
+        lawo.id,
+        lawo.work_order_type,
+        lawo.discovery_node,
+        lawo.work_order_number,
+        lawo.order_code,
+        lawo.train_number,
+        GROUP_CONCAT(DISTINCT laap.waybill_number separator ',') as waybillNumber,
+        GROUP_CONCAT(DISTINCT laap.`first` separator ',') as `first`,
+        GROUP_CONCAT(DISTINCT laap.secondary separator ',') as secondary,
+        group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
+        lawo.vehicle_route,
+        lawo.deliver_goods_time,
+        lawo.discovery_time,
+        lawo.warehousing_time,
+        lawo.waybill_mall,
+        lawo.remarks,
+        lawo.delivery_time,
+        lawo.delivery_driver,
+        lawo.work_order_status,
+        lawo.problem_description,
+        lawo.responsible_person,
+        lawo.processed_by,
+        lawo.create_time,
+        lawo.over_time,
+        lawo.reviewed_by,
+        lawo.audit_time,
+        lawo.entry_time,
+        lawo.operator,
+        lawo.person_responsible,
+        lawo.process_number,
+        lawo.customer_service_name customerServiceName,
+        lawo.warehouse_id warehouseId,
+        lawo.customer_service_id customerServiceId
+        FROM
+        logpm_aftersales_work_order lawo
+        LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id
+        AND lap.types_of = '2'
+        AND lap.conditions IN ( 1, 2 )
+        LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id
+        AND lacr.is_deleted = '0'
+        left join logpm_aftersales_abnormal_package laap on lawo.id = laap.work_order_id
+        <where>
+            <if test="warehouseIds != null">
+                lawo.warehouse_id in
+                <foreach collection="warehouseIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by lawo.id
+        ORDER BY lawo.create_time DESC
+    </select>
+    <select id="selectWaitAftersalesWorkOrderList"
+            resultType="com.logpm.aftersales.excel.AftersalesWorkOrderExcel">
+        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,
+        GROUP_CONCAT(DISTINCT laap.waybill_number separator ',') as waybillNumber,
+        GROUP_CONCAT(DISTINCT laap.`first` separator ',') as `first`,
+        GROUP_CONCAT(DISTINCT laap.secondary separator ',') as secondary,
+        group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
+        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,
+        law.brand_name
+        FROM
+        logpm_aftersales_processor lap
+        LEFT JOIN logpm_aftersales_work_order law ON lap.work_order_id = law.id
+        LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = law.id
+        AND lacr.is_deleted = '0'
+        left join logpm_aftersales_abnormal_package laap on law.id = laap.work_order_id
+        <where>
+            lap.conditions != '3' and lap.is_deleted = 0 and law.id is not null and lap.processing_status in ('1','3')  and lap.types_of = '2'
+            <if test="warehouseIds != null">
+             AND  law.warehouse_id in
+                <foreach collection="warehouseIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by lawo.id
+        ORDER BY lawo.create_time DESC
+    </select>
 
 
     <update id="updateFinanceTime">

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -18,6 +18,7 @@ package com.logpm.aftersales.service;
 
 import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.dto.AftersalesWorkOrderListExcelDTO;
 import com.logpm.aftersales.entity.AftersalesAppealEntity;
 import com.logpm.aftersales.entity.AftersalesSettlementEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
@@ -295,4 +296,8 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @param packageFinish
 	 */
 	void updateWorkOrderPackagFinish(Long warehouseId, String orderPackageCode, Integer packageFinish);
+
+	AftersalesWorkOrderListExcelDTO exportAftersalesWorkOrderList();
+
+
 }

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

@@ -56,6 +56,7 @@ import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.ISysClient;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -101,6 +102,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	private final AftersalesAppealMapper aftersalesAppealService;
 
 	private final ISysClient sysClient;
+	private final IUserClient userClient;
 
 	private final AftersalesCustomerMallMapper aftersalesCustomerMallMapper;
 	private final IUserSearchClient userSearchClient;
@@ -1539,9 +1541,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			one.ifPresent(aftersalesProcessorEntity -> surveyRecordEntity.setProcessorId(aftersalesProcessorEntity.getId()));
 			surveyRecordEntity.setAddDepartment(myCurrentWarehouse.getDepartmentName());
 			surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent());
+			surveyRecordEntity.setProcessorId(user.getUserId());
+			surveyRecordEntity.setProcessorName(user.getNickName());
 		} else {
 			log.info("客服回复！！！{}", user.getUserName());
 			surveyRecordEntity.setProcessorId(user.getUserId());
+			surveyRecordEntity.setProcessorName(user.getNickName());
 			R<String> deptName = sysClient.getDeptName(Long.valueOf(user.getDeptId()));
 			surveyRecordEntity.setAddDepartment(deptName.getData());
 			surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent());
@@ -2324,5 +2329,23 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 
 
+	}
+
+	@Override
+	public AftersalesWorkOrderListExcelDTO exportAftersalesWorkOrderList() {
+		List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+		List<Long> warehouseListIds = null;
+		if (!warehouseList.isEmpty()){
+			 warehouseListIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		}
+		AftersalesWorkOrderListExcelDTO aftersalesWorkOrderListExcelDTO = new AftersalesWorkOrderListExcelDTO();
+		List<AftersalesWorkOrderExcel> allAftersalesWorkOrderExcels = baseMapper.selectAllAftersalesWorkOrderList(warehouseListIds);
+		if (!allAftersalesWorkOrderExcels.isEmpty()) {
+			aftersalesWorkOrderListExcelDTO.setAftersalesWorkOrderExcels(allAftersalesWorkOrderExcels);
+		}
+		List<AftersalesWorkOrderExcel> waitAftersalesWorkOrderExcels = baseMapper.selectWaitAftersalesWorkOrderList(warehouseListIds);
+
+
+		return null;
 	}
 }