huangjiayang
2025-05-14 dadf503b15f3423980ad2bc17d23ea1a444aca10
【UPDATE】修改mapper适配mybatis-plus
已修改15个文件
124 ■■■■ 文件已修改
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessCapacityManagementMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupTempMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamTempMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessCapacityManagementMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessCapacityManagementMapper">
    
    <resultMap type="ApsProcessCapacityManagement" id="ApsProcessCapacityManagementResult">
    <resultMap type="com.aps.core.domain.ApsProcessCapacityManagement" id="ApsProcessCapacityManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="capacityType"    column="capacity_type"    />
@@ -25,7 +25,7 @@
        select id, item_number, capacity_type, process_number, process_name, process_route_id, work_time, effective_date, expiring_date, integration_date, create_by, create_time, update_by, update_time from aps_process_capacity_management
    </sql>
    <select id="selectApsProcessCapacityManagementList" parameterType="ApsProcessCapacityManagement" resultMap="ApsProcessCapacityManagementResult">
    <select id="selectApsProcessCapacityManagementList" parameterType="com.aps.core.domain.ApsProcessCapacityManagement" resultMap="ApsProcessCapacityManagementResult">
        <include refid="selectApsProcessCapacityManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -37,7 +37,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsProcessCapacityManagement" parameterType="ApsProcessCapacityManagement">
    <insert id="insertApsProcessCapacityManagement" parameterType="com.aps.core.domain.ApsProcessCapacityManagement">
        insert into aps_process_capacity_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -73,7 +73,7 @@
         </trim>
    </insert>
    <update id="updateApsProcessCapacityManagement" parameterType="ApsProcessCapacityManagement">
    <update id="updateApsProcessCapacityManagement" parameterType="com.aps.core.domain.ApsProcessCapacityManagement">
        update aps_process_capacity_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null and itemNumber != ''">item_number = #{itemNumber},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteMapper">
    <resultMap type="ApsProcessRoute" id="ApsProcessRouteResult">
    <resultMap type="com.aps.core.domain.ApsProcessRoute" id="ApsProcessRouteResult">
        <result property="id"    column="id"    />
        <result property="itemNo"    column="item_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
@@ -35,7 +35,7 @@
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order,work_center from aps_process_route
    </sql>
    <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
    <select id="selectApsProcessRouteList" parameterType="com.aps.core.domain.ApsProcessRoute" resultMap="ApsProcessRouteResult">
        <include refid="selectApsProcessRouteVo"/>
        <where>
            <if test="itemNo != null  and itemNo != ''"> and item_no like  '%' || #{itemNo} || '%' </if>
@@ -58,7 +58,7 @@
    <select id="selectApsProcessRouteById" parameterType="String" resultMap="ApsProcessRouteResult">
    </select>
    <insert id="insertApsProcessRoute" parameterType="ApsProcessRoute">
    <insert id="insertApsProcessRoute" parameterType="com.aps.core.domain.ApsProcessRoute">
        insert into aps_process_route
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -106,7 +106,7 @@
        </trim>
    </insert>
    <update id="updateApsProcessRoute" parameterType="ApsProcessRoute">
    <update id="updateApsProcessRoute" parameterType="com.aps.core.domain.ApsProcessRoute">
        update aps_process_route
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNo != null">item_no = #{itemNo},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteTempMapper">
    <resultMap type="ApsProcessRouteTemp" id="ApsProcessRouteTempResult">
    <resultMap type="com.aps.core.domain.ApsProcessRouteTemp" id="ApsProcessRouteTempResult">
        <result property="id"    column="id"    />
        <result property="itemNo"    column="item_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
@@ -31,7 +31,7 @@
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, batch_number, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order from aps_process_route_temp
    </sql>
    <select id="selectApsProcessRouteTempList" parameterType="ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
    <select id="selectApsProcessRouteTempList" parameterType="com.aps.core.domain.ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
        <include refid="selectApsProcessRouteTempVo"/>
        <where>
            <if test="itemNo != null  and itemNo != ''"> and item_no = #{itemNo}</if>
@@ -52,7 +52,7 @@
    <select id="selectApsProcessRouteTempById" parameterType="String" resultMap="ApsProcessRouteTempResult">
    </select>
    <insert id="insertApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
    <insert id="insertApsProcessRouteTemp" parameterType="com.aps.core.domain.ApsProcessRouteTemp">
        insert into aps_process_route_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -100,7 +100,7 @@
        </trim>
    </insert>
    <update id="updateApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
    <update id="updateApsProcessRouteTemp" parameterType="com.aps.core.domain.ApsProcessRouteTemp">
        update aps_process_route_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNo != null">item_no = #{itemNo},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProfessionalFixedCycleManagementMapper">
    
    <resultMap type="ApsProfessionalFixedCycleManagement" id="ApsProfessionalFixedCycleManagementResult">
    <resultMap type="com.aps.core.domain.ApsProfessionalFixedCycleManagement" id="ApsProfessionalFixedCycleManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="professionalDescription"    column="professional_description"    />
@@ -22,7 +22,7 @@
        select id, item_number, professional_description, professional, professional_fixed_cycle, integration_date, applicable_factories, create_by, create_time, update_by, update_time from aps_professional_fixed_cycle_management
    </sql>
    <select id="selectApsProfessionalFixedCycleManagementList" parameterType="ApsProfessionalFixedCycleManagement" resultMap="ApsProfessionalFixedCycleManagementResult">
    <select id="selectApsProfessionalFixedCycleManagementList" parameterType="com.aps.core.domain.ApsProfessionalFixedCycleManagement" resultMap="ApsProfessionalFixedCycleManagementResult">
        <include refid="selectApsProfessionalFixedCycleManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -34,7 +34,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
    <insert id="insertApsProfessionalFixedCycleManagement" parameterType="com.aps.core.domain.ApsProfessionalFixedCycleManagement">
        insert into aps_professional_fixed_cycle_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -64,7 +64,7 @@
         </trim>
    </insert>
    <update id="updateApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
    <update id="updateApsProfessionalFixedCycleManagement" parameterType="com.aps.core.domain.ApsProfessionalFixedCycleManagement">
        update aps_professional_fixed_cycle_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsResourceGroupMapper">
    
    <resultMap type="ApsResourceGroup" id="ApsResourceGroupResult">
    <resultMap type="com.aps.core.domain.ApsResourceGroup" id="ApsResourceGroupResult">
        <result property="id"    column="id"    />
        <result property="resourceGroupName"    column="resource_group_name"    />
        <result property="devicesQuantity"    column="devices_quantity"    />
@@ -24,7 +24,7 @@
        select id, resource_group_name, devices_quantity, theory_hours, rest_days, theory_capacity, request_date, del_flag, create_by, create_time, update_by, update_time, plant from aps_resource_group
    </sql>
    <select id="selectApsResourceGroupList" parameterType="ApsResourceGroup" resultMap="ApsResourceGroupResult">
    <select id="selectApsResourceGroupList" parameterType="com.aps.core.domain.ApsResourceGroup" resultMap="ApsResourceGroupResult">
        <include refid="selectApsResourceGroupVo"/>
        <where>  
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName}|| '%'</if>
@@ -44,7 +44,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsResourceGroup" parameterType="ApsResourceGroup">
    <insert id="insertApsResourceGroup" parameterType="com.aps.core.domain.ApsResourceGroup">
        insert into aps_resource_group
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -78,7 +78,7 @@
         </trim>
    </insert>
    <update id="updateApsResourceGroup" parameterType="ApsResourceGroup">
    <update id="updateApsResourceGroup" parameterType="com.aps.core.domain.ApsResourceGroup">
        update aps_resource_group
        <trim prefix="SET" suffixOverrides=",">
            <if test="resourceGroupName != null">resource_group_name = #{resourceGroupName},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupTempMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsResourceGroupTempMapper">
    
    <resultMap type="ApsResourceGroupTemp" id="ApsResourceGroupTempResult">
    <resultMap type="com.aps.core.domain.ApsResourceGroupTemp" id="ApsResourceGroupTempResult">
        <result property="id"    column="id"    />
        <result property="resourceGroupName"    column="resource_group_name"    />
        <result property="devicesQuantity"    column="devices_quantity"    />
@@ -25,7 +25,7 @@
        select id, resource_group_name, devices_quantity, theory_hours, rest_days, theory_capacity, request_date, del_flag, create_by, create_time, update_by, update_time, batch_number, plant from aps_resource_group_temp
    </sql>
    <select id="selectApsResourceGroupTempList" parameterType="ApsResourceGroupTemp" resultMap="ApsResourceGroupTempResult">
    <select id="selectApsResourceGroupTempList" parameterType="com.aps.core.domain.ApsResourceGroupTemp" resultMap="ApsResourceGroupTempResult">
        <include refid="selectApsResourceGroupTempVo"/>
        <where>  
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like concat('%', #{resourceGroupName}, '%')</if>
@@ -45,7 +45,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsResourceGroupTemp" parameterType="ApsResourceGroupTemp">
    <insert id="insertApsResourceGroupTemp" parameterType="com.aps.core.domain.ApsResourceGroupTemp">
        insert into aps_resource_group_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -81,7 +81,7 @@
         </trim>
    </insert>
    <update id="updateApsResourceGroupTemp" parameterType="ApsResourceGroupTemp">
    <update id="updateApsResourceGroupTemp" parameterType="com.aps.core.domain.ApsResourceGroupTemp">
        update aps_resource_group_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="resourceGroupName != null">resource_group_name = #{resourceGroupName},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsShopMapper">
    
    <resultMap type="ApsShop" id="ApsShopResult">
    <resultMap type="com.aps.core.domain.ApsShop" id="ApsShopResult">
        <result property="id"    column="id"    />
        <result property="shopName"    column="shop_name"    />
        <result property="shopCode"    column="shop_code"    />
@@ -20,7 +20,7 @@
        select id, shop_name, shop_code, plant_code, status, create_by, create_time, update_by, update_time from aps_shop
    </sql>
    <select id="selectApsShopList" parameterType="ApsShop" resultMap="ApsShopResult">
    <select id="selectApsShopList" parameterType="com.aps.core.domain.ApsShop" resultMap="ApsShopResult">
        <include refid="selectApsShopVo"/>
        <where>  
            <if test="shopName != null  and shopName != ''"> and shop_name = #{shopName}</if>
@@ -37,7 +37,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsShop" parameterType="ApsShop">
    <insert id="insertApsShop" parameterType="com.aps.core.domain.ApsShop">
        insert into aps_shop
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -63,7 +63,7 @@
         </trim>
    </insert>
    <update id="updateApsShop" parameterType="ApsShop">
    <update id="updateApsShop" parameterType="com.aps.core.domain.ApsShop">
        update aps_shop
        <trim prefix="SET" suffixOverrides=",">
            <if test="shopName != null">shop_name = #{shopName},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessMapper">
    
    <resultMap type="ApsStandardProcess" id="ApsStandardProcessResult">
    <resultMap type="com.aps.core.domain.ApsStandardProcess" id="ApsStandardProcessResult">
        <result property="id"    column="id"    />
        <result property="processNumber"    column="process_number"    />
        <result property="processName"    column="process_name"    />
@@ -30,7 +30,7 @@
        select id, process_number, process_name, resource_group_name, model, design_capacity, plant_id, plant, work_shop_id, work_shop, work_calender_id, del_flag, create_by, create_time, update_by, update_time, model_id, work_calender,major from aps_standard_process
    </sql>
    <select id="selectApsStandardProcessList" parameterType="ApsStandardProcess" resultMap="ApsStandardProcessResult">
    <select id="selectApsStandardProcessList" parameterType="com.aps.core.domain.ApsStandardProcess" resultMap="ApsStandardProcessResult">
        <include refid="selectApsStandardProcessVo"/>
        <where>  
            <if test="processNumber != null  and processNumber != ''"> and process_number = #{processNumber}</if>
@@ -54,7 +54,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsStandardProcess" parameterType="ApsStandardProcess">
    <insert id="insertApsStandardProcess" parameterType="com.aps.core.domain.ApsStandardProcess">
        insert into aps_standard_process
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="processNumber != null">process_number,</if>
@@ -98,7 +98,7 @@
         </trim>
    </insert>
    <update id="updateApsStandardProcess" parameterType="ApsStandardProcess">
    <update id="updateApsStandardProcess" parameterType="com.aps.core.domain.ApsStandardProcess">
        update aps_standard_process
        <trim prefix="SET" suffixOverrides=",">
            <if test="processNumber != null">process_number = #{processNumber},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper">
    
    <resultMap type="ApsStandardProcessRouteHeader" id="ApsStandardProcessRouteHeaderResult">
    <resultMap type="com.aps.core.domain.ApsStandardProcessRouteHeader" id="ApsStandardProcessRouteHeaderResult">
        <result property="id"    column="id"    />
        <result property="itemCode"    column="item_code"    />
        <result property="drawingNumber"    column="drawing_number"    />
@@ -27,7 +27,7 @@
        from aps_standard_process_route_header
    </sql>
    <select id="selectApsStandardProcessRouteHeaderList" parameterType="ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
    <select id="selectApsStandardProcessRouteHeaderList" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
        <include refid="selectApsStandardProcessRouteHeaderVo"/>
        <where>  
            <if test="routeId != null  and routeId != ''"> and route_id = #{routeId}</if>
@@ -47,7 +47,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsStandardProcessRouteHeader" parameterType="ApsStandardProcessRouteHeader">
    <insert id="insertApsStandardProcessRouteHeader" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader">
        insert into aps_standard_process_route_header
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -77,7 +77,7 @@
         </trim>
    </insert>
    <update id="updateApsStandardProcessRouteHeader" parameterType="ApsStandardProcessRouteHeader">
    <update id="updateApsStandardProcessRouteHeader" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader">
        update aps_standard_process_route_header
        <trim prefix="SET" suffixOverrides=",">
            <if test="routeId != null">route_id = #{routeId},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessRouteLineMapper">
    
    <resultMap type="ApsStandardProcessRouteLine" id="ApsStandardProcessRouteLineResult">
    <resultMap type="com.aps.core.domain.ApsStandardProcessRouteLine" id="ApsStandardProcessRouteLineResult">
        <result property="id"    column="id"    />
        <result property="routeId"    column="route_id"    />
        <result property="routeNum"    column="route_num"    />
@@ -31,7 +31,7 @@
        from aps_standard_process_route_line
    </sql>
    <select id="selectApsStandardProcessRouteLineList" parameterType="ApsStandardProcessRouteLine" resultMap="ApsStandardProcessRouteLineResult">
    <select id="selectApsStandardProcessRouteLineList" parameterType="com.aps.core.domain.ApsStandardProcessRouteLine" resultMap="ApsStandardProcessRouteLineResult">
        <include refid="selectApsStandardProcessRouteLineVo"/>
        <where>
            <if test="routeId != null  and routeId != ''"> and route_id = #{routeId}</if>
@@ -53,7 +53,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsStandardProcessRouteLine" parameterType="ApsStandardProcessRouteLine">
    <insert id="insertApsStandardProcessRouteLine" parameterType="com.aps.core.domain.ApsStandardProcessRouteLine">
        insert into aps_standard_process_route_line
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -91,7 +91,7 @@
         </trim>
    </insert>
    <update id="updateApsStandardProcessRouteLine" parameterType="ApsStandardProcessRouteLine">
    <update id="updateApsStandardProcessRouteLine" parameterType="com.aps.core.domain.ApsStandardProcessRouteLine">
        update aps_standard_process_route_line
        <trim prefix="SET" suffixOverrides=",">
            <if test="routeId != null">route_id = #{routeId},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamMapper">
    
    <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
    <resultMap type="com.aps.core.domain.ApsWeldSeam" id="ApsWeldSeamResult">
        <result property="id"    column="id"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="materialCode"    column="material_code"    />
@@ -32,7 +32,7 @@
        select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
    </sql>
    <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
    <select id="selectApsWeldSeamList" parameterType="com.aps.core.domain.ApsWeldSeam" resultMap="ApsWeldSeamResult">
        <include refid="selectApsWeldSeamVo"/>
        <where>  
            <if test="workOrderType != null  and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -66,7 +66,7 @@
        <include refid="selectApsWeldSeamVo"/>
        where work_order_no = #{workOrderNo}
    </select>
    <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
    <insert id="insertApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
        insert into aps_weld_seam
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -116,7 +116,7 @@
         </trim>
    </insert>
    <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
    <update id="updateApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
        update aps_weld_seam
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderType != null">work_order_type = #{workOrderType},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamStatisticsMapper">
    
    <resultMap type="ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
    <resultMap type="com.aps.core.domain.ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
        <result property="id"    column="id"    />
        <result property="year"    column="year"    />
        <result property="month"    column="month"    />
@@ -30,7 +30,7 @@
        select id, year, month, production_base, piping_order_requirement, gas_order_requirement, piping_prediction_requirement, gas_prediction_requirement, reserve_emergency_order_output, total, days, requirement_day_weld_seam, production_day_weld_seam, is_satisfy, del_flag, create_by, create_time, update_by, update_time from aps_weld_seam_statistics
    </sql>
    <select id="selectApsWeldSeamStatisticsList" parameterType="ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
    <select id="selectApsWeldSeamStatisticsList" parameterType="com.aps.core.domain.ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
        <include refid="selectApsWeldSeamStatisticsVo"/>
        <where>  
            <if test="params.beginYear != null and params.beginYear != '' and params.endYear != null and params.endYear != ''"> and year between #{params.beginYear} and #{params.endYear}</if>
@@ -46,7 +46,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
    <insert id="insertApsWeldSeamStatistics" parameterType="com.aps.core.domain.ApsWeldSeamStatistics">
        insert into aps_weld_seam_statistics
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -92,7 +92,7 @@
         </trim>
    </insert>
    <update id="updateApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
    <update id="updateApsWeldSeamStatistics" parameterType="com.aps.core.domain.ApsWeldSeamStatistics">
        update aps_weld_seam_statistics
        <trim prefix="SET" suffixOverrides=",">
            <if test="year != null">year = #{year},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamTempMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamTempMapper">
    
    <resultMap type="ApsWeldSeamTemp" id="ApsWeldSeamTempResult">
    <resultMap type="com.aps.core.domain.ApsWeldSeamTemp" id="ApsWeldSeamTempResult">
        <result property="id"    column="id"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="materialCode"    column="material_code"    />
@@ -33,7 +33,7 @@
        select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant, batch_number from aps_weld_seam_temp
    </sql>
    <select id="selectApsWeldSeamTempList" parameterType="ApsWeldSeamTemp" resultMap="ApsWeldSeamTempResult">
    <select id="selectApsWeldSeamTempList" parameterType="com.aps.core.domain.ApsWeldSeamTemp" resultMap="ApsWeldSeamTempResult">
        <include refid="selectApsWeldSeamTempVo"/>
        <where>  
            <if test="workOrderType != null  and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -65,7 +65,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
    <insert id="insertApsWeldSeamTemp" parameterType="com.aps.core.domain.ApsWeldSeamTemp">
        insert into aps_weld_seam_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -117,7 +117,7 @@
         </trim>
    </insert>
    <update id="updateApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
    <update id="updateApsWeldSeamTemp" parameterType="com.aps.core.domain.ApsWeldSeamTemp">
        update aps_weld_seam_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderType != null">work_order_type = #{workOrderType},</if>
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWorkCalendarMapper">
    <resultMap type="ApsWorkCalendar" id="ApsWorkCalendarResult">
    <resultMap type="com.aps.core.domain.ApsWorkCalendar" id="ApsWorkCalendarResult">
        <result property="id"    column="id"    />
        <result property="description"    column="description"    />
        <result property="type"    column="type"    />
@@ -27,7 +27,7 @@
        select id, description, type, effective_date, expiring_date, content, applicable_factory, applicable_workshop, applicable_process, create_by, create_time, update_by, update_time, holidays, applicable, applicable_translate from aps_work_calendar
    </sql>
    <select id="selectApsWorkCalendarList" parameterType="ApsWorkCalendar" resultMap="ApsWorkCalendarResult">
    <select id="selectApsWorkCalendarList" parameterType="com.aps.core.domain.ApsWorkCalendar" resultMap="ApsWorkCalendarResult">
        <include refid="selectApsWorkCalendarVo"/>
        <where>  
            <if test="description != null  and description != ''"> and description like '%' || #{description} || '%'</if>
@@ -51,7 +51,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsWorkCalendar" parameterType="ApsWorkCalendar">
    <insert id="insertApsWorkCalendar" parameterType="com.aps.core.domain.ApsWorkCalendar">
        insert into aps_work_calendar
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -91,7 +91,7 @@
         </trim>
    </insert>
    <update id="updateApsWorkCalendar" parameterType="ApsWorkCalendar">
    <update id="updateApsWorkCalendar" parameterType="com.aps.core.domain.ApsWorkCalendar">
        update aps_work_calendar
        <trim prefix="SET" suffixOverrides=",">
            <if test="description != null">description = #{description},</if>
@@ -117,14 +117,14 @@
        delete from aps_work_calendar where id = #{id}
    </delete>
    <delete id="deleteApsWorkCalendarByIds" parameterType="ApsWorkCalendar">
    <delete id="deleteApsWorkCalendarByIds" parameterType="com.aps.core.domain.ApsWorkCalendar">
        delete from aps_work_calendar where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
    <delete id="deleteApsWorkCalendar" parameterType="ApsWorkCalendar">
    <delete id="deleteApsWorkCalendar" parameterType="com.aps.core.domain.ApsWorkCalendar">
        delete from aps_work_calendar where effective_date=#{effectiveDate} and expiring_date=#{expiringDate} and applicable_factory=#{applicableFactory} and applicable_workshop=#{applicableWorkshop} and applicable_process=#{applicableProcess}
    </delete>
</mapper>
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWorkEventMapper">
    
    <resultMap type="ApsWorkEvent" id="ApsWorkEventResult">
    <resultMap type="com.aps.core.domain.ApsWorkEvent" id="ApsWorkEventResult">
        <result property="id"    column="id"    />
        <result property="description"    column="description"    />
        <result property="duration"    column="duration"    />
@@ -26,7 +26,7 @@
        select id, description, duration, start_date, end_date, start_time, end_time, applicable_factory, applicable_workshop, applicable_process, applicable_calendar, create_by, create_time, update_by, update_time from aps_work_event
    </sql>
    <select id="selectApsWorkEventList" parameterType="ApsWorkEvent" resultMap="ApsWorkEventResult">
    <select id="selectApsWorkEventList" parameterType="com.aps.core.domain.ApsWorkEvent" resultMap="ApsWorkEventResult">
        <include refid="selectApsWorkEventVo"/>
        <where>  
            <if test="description != null  and description != ''"> and description like '%' || #{description} || '%'</if>
@@ -47,7 +47,7 @@
        where id = #{id}
    </select>
    <insert id="insertApsWorkEvent" parameterType="ApsWorkEvent">
    <insert id="insertApsWorkEvent" parameterType="com.aps.core.domain.ApsWorkEvent">
        insert into aps_work_event
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -85,7 +85,7 @@
         </trim>
    </insert>
    <update id="updateApsWorkEvent" parameterType="ApsWorkEvent">
    <update id="updateApsWorkEvent" parameterType="com.aps.core.domain.ApsWorkEvent">
        update aps_work_event
        <trim prefix="SET" suffixOverrides=",">
            <if test="description != null and description != ''">description = #{description},</if>