Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-11-23 a6f59f0908e5787d55c098c17f4eec365cf6477a

 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml

@@ -165,7 +165,46 @@
        <if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
            and p.project_no regexp #{optimizeProjectMange.projectNumber}
        </if>
        <if test="optimizeProjectMange.state!= null">
            and p.state = #{optimizeProjectMange.state}
        </if>
        order by `p`.`create_time` desc, `p`.`project_no`
    </select>
    <!--修改工程状态-->
    <update id="updateProjectStateMp">
        update pp.optimize_project as p
        set p.state = #{state}
        where p.project_no = #{projectNumber}
    </update>

    <select id="getProjectListMp">
        SELECT
            p.id,
            p.project_no,
            p.project_name,
            p.glass_type,
            p.glass_thickness,
            p.type,
            p.state,
            p.glass_total,
            p.glass_total_area,
            p.process_qty,
            p.process_cards,
            p.remark,
            a.name,
            p.create_time,
            p.update_time
        FROM
            (
                pp.optimize_project p
                    LEFT JOIN pp.optimize_admin a ON ((
                    p.creater = a.Id
                    )))
        WHERE
            ( p.state = 1 )
        ORDER BY
            p.create_time DESC,
            p.project_no
    </select>

</mapper>