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

whycq

2022-09-12 c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f

 src/main/resources/mapper/ItemMapper.xml

@@ -21,8 +21,70 @@
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />

        <result column="type" property="type" />
        <result column="real_start_time" property="realStartTime" />
        <result column="real_end_time" property="realEndTime" />
        <result column="real_month" property="realMonth" />
        <result column="duty_department" property="dutyDepartment" />
        <result column="duty_man" property="dutyMan" />
        <result column="origin_area" property="originArea" />
        <result column="project_status" property="projectStatus" />
        <result column="orderDesc" property="orderDesc" />
        <result column="salesman" property="salesman" />
        <result column="presaleAmt" property="presaleAmt" />
        <result column="predeDate" property="predeDate" />
        <result column="preinDate" property="preinDate" />
        <result column="weight" property="weight" />
        <result column="installMk" property="installMk" />
        <result column="deliveryMk" property="deliveryMk" />
        <result column="custMan" property="custMan" />
        <result column="custMobile" property="custMobile" />
        <result column="custAdress" property="custAdress" />
        <result column="progressRate" property="progressRate" />
        <result column="planCarInfo" property="planCarInfo" />
        <result column="plandeDate" property="plandeDate" />
        <result column="realdeDate" property="realdeDate" />
        <result column="planinDate" property="planinDate" />
        <result column="realinDate" property="realinDate" />
        <result column="plandeAmt" property="plandeAmt" />
        <result column="realdeAmt" property="realdeAmt" />
        <result column="planinAmt" property="planinAmt" />
        <result column="realinAmt" property="realinAmt" />
        <result column="planFADate" property="planFADate" />
        <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>