ci:持续修改

cjl

2023-09-28 81a82c8a3f32f80c4c51bdbbc2914615444685d9

ci:持续修改

 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml

@@ -49,7 +49,7 @@
                and t1.pollute_type = #{allocation.polluteType}
            </if>
            <if test="allocation.state != null and allocation.state != 0">
                and t1.state = #{allocation.state}
                and allocationextension.state = #{allocation.state}
            </if>
            <if test="allocation.investigationType != null and allocation.investigationType != 0">
                and t1.investigation_type = #{allocation.investigationType}

 screen-api/src/main/resources/mapper/AllocationMapper.xml

@@ -66,7 +66,7 @@
        left join allocation_extension t1 on t1.allocation_id = allocation.allocation_id and t1.is_del =0 and t1.is_invalid = 0 and t1.state = 30
        <where>
            1 = 1 and allocation.is_del = 0
            <if test="allocation.unitId != null and allocation.unitId != 0">
            <if test="allocation.unitId != null">
                and allocation.unit_id = #{allocation.unitId}
            </if>
            <if test="allocation.polluteType != null and allocation.polluteType != 0">
@@ -81,7 +81,7 @@
            <if test="allocation.changeType != null and allocation.changeType != 0">
                and allocation.change_type = #{allocation.changeType}
            </if>
            <if test="allocation.isInvalid != null and allocation.isInvalid != 0">
            <if test="allocation.isInvalid != null">
                and allocation.is_invalid = #{allocation.isInvalid}
            </if>
            <if test="allocation.startTime != null and allocation.startTime != '' ">