1.工单模糊查询优化

2.超时数据导出

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

@@ -161,7 +161,7 @@ public class AftersalesOvertimeFineController extends BladeController {
 
 	/**
 	 * 导出数据
-	 * http://localhost:8798/aftersalesOvertimeFine/export-aftersalesOvertimeFine
+	 * http://localhost:8799/aftersalesOvertimeFine/export-aftersalesOvertimeFine
 	 */
 	@GetMapping("/export-aftersalesOvertimeFine")
 	@ApiOperationSupport(order = 9)

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

@@ -619,7 +619,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	}
 
 	/**
-	 * 客服异常工单 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * 客服异常工单 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人   //财务理赔入账日期、操作人  拆分
 	 */
 	@PostMapping("/updateWorkList")
 	@ApiOperationSupport(order = 5)

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java

@@ -45,8 +45,8 @@ public class AftersalesOvertimeFineExcel implements Serializable {
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("异常工单ID")
-	private String workOrderId;
+	@ExcelProperty("异常工单号")
+	private String workOrderNumber;
 
 	@ColumnWidth(20)
 	@ExcelProperty("金额")
@@ -56,8 +56,6 @@ public class AftersalesOvertimeFineExcel implements Serializable {
 	@ExcelProperty("超时时间")
 	private String timeout;
 
-	@ExcelIgnore
-	private String workOrderNumber;
 	@ColumnWidth(20)
 	@ExcelProperty("工单异常类型")
 	private String workOrderType;
@@ -80,4 +78,8 @@ public class AftersalesOvertimeFineExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("超时时间")
 	private Date createTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String remarks;
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java

@@ -194,6 +194,12 @@ public class AftersalesWorkOrderExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("财务入账时间")
 	private Date entryTime;
+	/**
+	 * 操作人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("操作人")
+	private String operator;
 	/**
 	 * 备注
 	 */
@@ -227,11 +233,6 @@ public class AftersalesWorkOrderExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("钉钉流程号")
 	private String processNumber;
-	/**
-	 * 操作人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("操作人")
-	private String operator;
+
 
 }

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

@@ -50,13 +50,14 @@
         SELECT
         laof.id,
         lawo.work_order_number workOrderNumber,
-        lawo.work_order_type workOrderType,
+        lawo.work_order_type ,
         lawo.discovery_node discoveryNode,
         COUNT( laof.id ) AS timeoutRecordNumber,
         laof.create_time createTime,
         laof.timeout,
         laof.money,
         laof.business_name businessName,
+        laof.remarks,
         lawo.id workOrderId
         FROM
         logpm_aftersales_overtime_fine laof

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

@@ -229,8 +229,15 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         AND lacr.is_deleted = '0'
         <where>
         lawo.is_deleted = 0
-        <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.ids != null and param.ids != ''">
+                and lawo.id IN
+                <bind name="idList" value="param.ids.split(',')"/>
+                <foreach collection="idList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+            <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </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 like concat('%',#{param.workOrderNumber },'%')  </if>
@@ -329,7 +336,8 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         law.reviewed_by,
         law.audit_time,
         law.entry_time,
-        law.operator
+        law.operator,
+        law.brand_name
         FROM
         logpm_aftersales_processor lap
         LEFT JOIN logpm_aftersales_work_order law ON lap.work_order_id = law.id
@@ -360,6 +368,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.auditTime != null and param.auditTime != '' ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
             <if test="param.entryTime != null and param.entryTime != '' ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
             <if test="param.overTime != null and param.overTime != '' ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
+            <if test="param.brandName != null and param.brandName != '' ">and  law.brand_name like concat('%',#{param.brandName},'%') </if>
         </where>
 
     </select>

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

@@ -116,7 +116,7 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	AftersalesWorkOrderVO getProcessingResults(AftersalesWorkOrderDTO aftersalesWorkOrder);
 
 	/**
-	 * 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人         //财务理赔入账日期、操作人  拆分
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */