From 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:12:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java | 3 +++
screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml | 3 +++
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java | 3 +++
screen-api/src/main/resources/mapper/AllocationMapper.xml | 3 +++
4 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java
index 8cc2b87..8d759b2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java
@@ -46,6 +46,9 @@
@ApiModelProperty(value = "������������")
private String startTime;
+ @ApiModelProperty(value = "������")
+ private String allocationNum;
+
@ApiModelProperty(value = "������������")
private String endTime;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java
index f40422d..fd4dada 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java
@@ -24,6 +24,9 @@
@ApiModel(value="AllocationExtension - ������������������", description="AllocationExtension - ������������������")
public class AllocationExtensionPageCond implements Serializable{
+ @ApiModelProperty(value = "������")
+ private String allocationNum;
+
@ApiModelProperty(value = "������������id")
private Integer unitId;
diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
index 02742de..52ab9ae 100644
--- a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -64,6 +64,9 @@
<if test="allocation.endTime != null and allocation.endTime !='' ">
and date(t1.escalation_time) <![CDATA[<=]]> #{allocation.endTime}
</if>
+ <if test="allocation.allocationNum != null and allocation.allocationNum !='' ">
+ and allocation.allocation_num LIKE CONCAT('%',#{allocation.allocationNum},'%')
+ </if>
<if test="allocation.unitList != null and allocation.unitList.size !=0">
and t1.unit_id in
<foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 446ee62..7562062 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -90,6 +90,9 @@
<if test="allocation.endTime != null and allocation.endTime !='' ">
and date(allocation.escalation_time) <![CDATA[<=]]> #{allocation.endTime}
</if>
+ <if test="allocation.allocationNum != null and allocation.allocationNum !='' ">
+ and allocation.allocation_num LIKE CONCAT('%',#{allocation.allocationNum},'%')
+ </if>
<if test="allocation.unitList != null and allocation.unitList.size !=0">
and allocation.unit_id in
<foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
--
Gitblit v1.8.0