Merge remote-tracking branch 'origin/zypms' into zypms

whycq

2022-09-12 c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f

 src/main/resources/mapper/ItemMapper.xml

@@ -54,7 +54,37 @@
        <result column="realFADate" property="realFADate" />
        <result column="planLADate" property="planLADate" />
        <result column="realLADate" property="realLADate" />
        <result column="planCarnumber" property="planCarnumber"/>
        <result column="Excess_amount" property="excessAmount"/>
        <result column="Excess_time" property="excessTime"/>
    </resultMap>


    <select id="chaoPrice" resultMap="BaseResultMap">
        select * from man_item where 1=1 and realdeAmt>plandeAmt
        <if test="uuid!=null  and uuid!=''">
          and uuid=#{uuid}
        </if>
    </select>
    <select id="chaoTime" resultMap="BaseResultMap">
         SELECT
        *
    FROM
        (
            SELECT
                *,
                DateDiff(DAY, planinDate,realinDate) AS time_diff
            FROM
                man_item
        ) t1
    WHERE
        t1.time_diff > 0
        <if test="uuid!=null  and uuid!=''">
            and uuid=#{uuid}
        </if>
    </select>
    <select id="inspected" resultMap="BaseResultMap">
        select * from man_item where real_end_time is not null
    </select>
    <select id="finished" resultMap="BaseResultMap">
        select * from man_item where realLADate is null and realinDate is not null
    </select>
</mapper>