Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-03-01 a8dfd464f4a7edd0c55808c1271873268c6c5290

 north-glass-erp/target/classes/mapper/pp/BasicDataProduce.xml

@@ -3,6 +3,20 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.pp.BasicDateProduceMapper">
    <resultMap id="selectBasicDataProduce" type="com.example.erp.entity.pp.BasicDataProduce">
        <id column="id" property="id"/>
        <result column="basic_type" property="basicType"/>
        <result column="basic_name" property="basicName"/>
        <result column="basic_category" property="basicCategory"/>


        <result column="d_basic_type" property="basicData.basicType"/>
        <result column="d_basic_name" property="basicData.basicName"/>
        <result column="d_basic_category" property="basicData.basicCategory"/>



    </resultMap>
    <select id="SelectWorkBasicDeviceMp">
        select
            *
@@ -18,4 +32,12 @@
            basic_data_produce as a
        where a.basic_category=#{process} and a.basic_type='班组'
    </select>

    <select id="SelectWorkBasicTeams"  resultMap="selectBasicDataProduce">
        select bdp.basic_name ,bd.basic_name as d_basic_name
        from pp.basic_data_produce bdp
                 left join sd.basic_data bd on bdp.basic_category = bd.id
        where bd.basic_name = "切割"
          and bdp.basic_type = "teamsgroups"
    </select>
</mapper>