Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-09-28 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d

Merge remote-tracking branch 'origin/wb' into qa

 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;


 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;


 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=",">

 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=",">